Rename threads.{c,h} to virthread.{c,h}

daemon/libvirtd.c

@@ -50,7 +50,6 @@
 #include "virconf.h"
 #include "virnetlink.h"
 #include "virnetserver.h"
-#include "threads.h"
 #include "remote.h"
 #include "remote_driver.h"
 #include "virhook.h"

daemon/libvirtd.h

@@ -34,7 +34,7 @@
 # include "remote_protocol.h"
 # include "qemu_protocol.h"
 # include "virlog.h"
-# include "threads.h"
+# include "virthread.h"
 # if HAVE_SASL
 #  include "virnetsaslcontext.h"
 # endif

src/Makefile.am

@@ -53,9 +53,6 @@ augeastest_DATA =
 # These files are not related to driver APIs. Simply generic
 # helper APIs for various purposes
 UTIL_SOURCES =							\
-		util/threads.c util/threads.h			\
-		util/threads-pthread.h				\
-		util/threads-win32.h				\
 		util/uuid.c util/uuid.h				\
 		util/util.c util/util.h				\
 		util/viralloc.c util/viralloc.h			\
@@ -86,6 +83,9 @@ UTIL_SOURCES =							\
 		util/virstatslinux.c util/virstatslinux.h	\
 		util/virstoragefile.c util/virstoragefile.h	\
 		util/virsysinfo.c util/virsysinfo.h		\
+		util/virthread.c util/virthread.h		\
+		util/virthreadpthread.h				\
+		util/virthreadwin32.h				\
 		util/virthreadpool.c util/virthreadpool.h	\
 		util/virtypedparam.c util/virtypedparam.h	\
 		util/xml.c util/xml.h				\
@@ -126,7 +126,7 @@ $(srcdir)/util/virkeymaps.h: $(srcdir)/util/keymaps.csv	\
 		$(srcdir)/util/virkeycode-mapgen.py
 	$(AM_V_GEN)$(PYTHON) $(srcdir)/util/virkeycode-mapgen.py <$(srcdir)/util/keymaps.csv >$@
 
-EXTRA_DIST += util/threads-pthread.c util/threads-win32.c
+EXTRA_DIST += util/virthreadpthread.c util/virthreadwin32.c
 
 # Internal generic driver infrastructure
 NODE_INFO_SOURCES = nodeinfo.h nodeinfo.c

src/conf/device_conf.h

@@ -29,7 +29,7 @@
 
 # include "internal.h"
 # include "util.h"
-# include "threads.h"
+# include "virthread.h"
 # include "virbuffer.h"
 
 enum virDeviceAddressPciMulti {

src/conf/domain_conf.h

@@ -33,7 +33,7 @@
 # include "storage_encryption_conf.h"
 # include "cpu_conf.h"
 # include "util.h"
-# include "threads.h"
+# include "virthread.h"
 # include "virhash.h"
 # include "virsocketaddr.h"
 # include "nwfilter_params.h"

src/conf/interface_conf.h

@@ -30,7 +30,7 @@
 
 # include "internal.h"
 # include "util.h"
-# include "threads.h"
+# include "virthread.h"
 
 /* There is currently 3 types of interfaces */
 

src/conf/network_conf.h

@@ -31,7 +31,7 @@
 # include <libxml/xpath.h>
 
 # include "internal.h"
-# include "threads.h"
+# include "virthread.h"
 # include "virsocketaddr.h"
 # include "virnetdevbandwidth.h"
 # include "virnetdevvportprofile.h"

src/conf/node_device_conf.h

@@ -27,7 +27,7 @@
 
 # include "internal.h"
 # include "util.h"
-# include "threads.h"
+# include "virthread.h"
 
 # include <libxml/tree.h>
 

src/conf/storage_conf.h

@@ -27,7 +27,7 @@
 # include "internal.h"
 # include "util.h"
 # include "storage_encryption_conf.h"
-# include "threads.h"
+# include "virthread.h"
 
 # include <libxml/tree.h>
 

src/conf/virconsole.c

@@ -31,7 +31,7 @@
 #include "virhash.h"
 #include "fdstream.h"
 #include "internal.h"
-#include "threads.h"
+#include "virthread.h"
 #include "viralloc.h"
 #include "virpidfile.h"
 #include "virlog.h"

src/datatypes.h

@@ -25,7 +25,7 @@
 # include "internal.h"
 
 # include "driver.h"
-# include "threads.h"
+# include "virthread.h"
 # include "virobject.h"
 
 extern virClassPtr virConnectClass;

src/libvirt.c

@@ -59,7 +59,7 @@
 #include "vircommand.h"
 #include "virrandom.h"
 #include "viruri.h"
-#include "threads.h"
+#include "virthread.h"
 
 #ifdef WITH_TEST
 # include "test/test_driver.h"

src/locking/lock_daemon.h

@@ -24,7 +24,7 @@
 # define __VIR_LOCK_DAEMON_H__
 
 # include "virlockspace.h"
-# include "threads.h"
+# include "virthread.h"
 
 typedef struct _virLockDaemon virLockDaemon;
 typedef virLockDaemon *virLockDaemonPtr;

src/lxc/lxc_conf.h

@@ -31,7 +31,7 @@
 # include "domain_conf.h"
 # include "domain_event.h"
 # include "capabilities.h"
-# include "threads.h"
+# include "virthread.h"
 # include "vircgroup.h"
 # include "security/security_manager.h"
 # include "configmake.h"

src/lxc/lxc_monitor.c

@@ -29,7 +29,7 @@
 
 #include "virterror_internal.h"
 #include "virlog.h"
-#include "threads.h"
+#include "virthread.h"
 #include "rpc/virnetclient.h"
 
 #define VIR_FROM_THIS VIR_FROM_LXC

src/nwfilter/nwfilter_learnipaddr.c

@@ -47,7 +47,7 @@
 #include "datatypes.h"
 #include "virnetdev.h"
 #include "virterror_internal.h"
-#include "threads.h"
+#include "virthread.h"
 #include "conf/nwfilter_params.h"
 #include "conf/domain_conf.h"
 #include "nwfilter_gentech_driver.h"

src/openvz/openvz_conf.h

@@ -31,7 +31,7 @@
 
 # include "internal.h"
 # include "domain_conf.h"
-# include "threads.h"
+# include "virthread.h"
 
 
 /* OpenVZ commands - Replace with wrapper scripts later? */

src/parallels/parallels_utils.h

@@ -24,11 +24,11 @@
 # define PARALLELS_UTILS_H
 
 # include "driver.h"
-# include "util/threads.h"
 # include "conf/domain_conf.h"
 # include "conf/storage_conf.h"
 # include "conf/domain_event.h"
 # include "conf/network_conf.h"
+# include "virthread.h"
 # include "virjson.h"
 
 # define parallelsParseError()                                                 \

src/qemu/qemu_conf.h

@@ -32,7 +32,7 @@
 # include "network_conf.h"
 # include "domain_conf.h"
 # include "domain_event.h"
-# include "threads.h"
+# include "virthread.h"
 # include "security/security_manager.h"
 # include "vircgroup.h"
 # include "virpci.h"

src/qemu/qemu_domain.h

@@ -24,7 +24,7 @@
 #ifndef __QEMU_DOMAIN_H__
 # define __QEMU_DOMAIN_H__
 
-# include "threads.h"
+# include "virthread.h"
 # include "domain_conf.h"
 # include "snapshot_conf.h"
 # include "qemu_monitor.h"

src/rpc/virkeepalive.c

@@ -23,7 +23,7 @@
 #include <config.h>
 
 #include "viralloc.h"
-#include "threads.h"
+#include "virthread.h"
 #include "virfile.h"
 #include "virlog.h"
 #include "util.h"

src/rpc/virnetclient.c

@@ -31,7 +31,7 @@
 #include "virnetsocket.h"
 #include "virkeepalive.h"
 #include "viralloc.h"
-#include "threads.h"
+#include "virthread.h"
 #include "virfile.h"
 #include "virlog.h"
 #include "util.h"

src/rpc/virnetclientprogram.c

@@ -33,7 +33,7 @@
 #include "virlog.h"
 #include "util.h"
 #include "virfile.h"
-#include "threads.h"
+#include "virthread.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC
 

src/rpc/virnetclientstream.c

@@ -27,7 +27,7 @@
 #include "viralloc.h"
 #include "virterror_internal.h"
 #include "virlog.h"
-#include "threads.h"
+#include "virthread.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC
 

src/rpc/virnetsaslcontext.c

@@ -27,7 +27,7 @@
 
 #include "virterror_internal.h"
 #include "viralloc.h"
-#include "threads.h"
+#include "virthread.h"
 #include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC

src/rpc/virnetserver.c

@@ -31,7 +31,7 @@
 #include "virlog.h"
 #include "viralloc.h"
 #include "virterror_internal.h"
-#include "threads.h"
+#include "virthread.h"
 #include "virthreadpool.h"
 #include "util.h"
 #include "virfile.h"

src/rpc/virnetserverclient.c

@@ -32,7 +32,7 @@
 #include "virlog.h"
 #include "virterror_internal.h"
 #include "viralloc.h"
-#include "threads.h"
+#include "virthread.h"
 #include "virkeepalive.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC

src/rpc/virnetserverprogram.c

@@ -30,7 +30,7 @@
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "virfile.h"
-#include "threads.h"
+#include "virthread.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC
 

src/rpc/virnetserverservice.c

@@ -27,7 +27,7 @@
 
 #include "viralloc.h"
 #include "virterror_internal.h"
-#include "threads.h"
+#include "virthread.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC
 

src/rpc/virnetsocket.c

@@ -46,7 +46,7 @@
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "virfile.h"
-#include "threads.h"
+#include "virthread.h"
 #include "virprocess.h"
 
 #include "passfd.h"

src/rpc/virnetsshsession.c

@@ -30,7 +30,7 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "configmake.h"
-#include "threads.h"
+#include "virthread.h"
 #include "util.h"
 #include "virterror_internal.h"
 #include "virobject.h"

src/rpc/virnettlscontext.c

@@ -34,7 +34,7 @@
 #include "virterror_internal.h"
 #include "util.h"
 #include "virlog.h"
-#include "threads.h"
+#include "virthread.h"
 #include "configmake.h"
 
 #define DH_BITS 1024

src/secret/secret_driver.c

@@ -36,7 +36,7 @@
 #include "viralloc.h"
 #include "secret_conf.h"
 #include "secret_driver.h"
-#include "threads.h"
+#include "virthread.h"
 #include "util.h"
 #include "uuid.h"
 #include "virterror_internal.h"

src/test/test_driver.c

@@ -47,7 +47,7 @@
 #include "storage_conf.h"
 #include "node_device_conf.h"
 #include "xml.h"
-#include "threads.h"
+#include "virthread.h"
 #include "virlog.h"
 #include "virfile.h"
 #include "virtypedparam.h"

src/uml/uml_conf.h

@@ -30,7 +30,7 @@
 # include "domain_conf.h"
 # include "domain_event.h"
 # include "virterror_internal.h"
-# include "threads.h"
+# include "virthread.h"
 # include "vircommand.h"
 # include "virhash.h"
 

src/util/iohelper.c

@@ -34,7 +34,7 @@
 #include <stdlib.h>
 
 #include "util.h"
-#include "threads.h"
+#include "virthread.h"
 #include "virfile.h"
 #include "viralloc.h"
 #include "virterror_internal.h"

src/util/util.c

@@ -81,7 +81,7 @@
 #include "util.h"
 #include "virstoragefile.h"
 #include "viralloc.h"
-#include "threads.h"
+#include "virthread.h"
 #include "verify.h"
 #include "virfile.h"
 #include "vircommand.h"

src/util/virdbus.c

@@ -25,7 +25,7 @@
 #include "viralloc.h"
 #include "virterror_internal.h"
 #include "virlog.h"
-#include "threads.h"
+#include "virthread.h"
 
 #define VIR_FROM_THIS VIR_FROM_DBUS
 

src/util/virebtables.c

@@ -47,7 +47,7 @@
 #include "viralloc.h"
 #include "virterror_internal.h"
 #include "virlog.h"
-#include "threads.h"
+#include "virthread.h"
 
 #if HAVE_FIREWALLD
 static char *firewall_cmd_path = NULL;

src/util/vireventpoll.c

@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "threads.h"
+#include "virthread.h"
 #include "virlog.h"
 #include "vireventpoll.h"
 #include "viralloc.h"

src/util/viriptables.c

@@ -45,7 +45,7 @@
 #include "viralloc.h"
 #include "virterror_internal.h"
 #include "virlog.h"
-#include "threads.h"
+#include "virthread.h"
 
 #if HAVE_FIREWALLD
 static char *firewall_cmd_path = NULL;

src/util/virlockspace.c

@@ -28,7 +28,7 @@
 #include "util.h"
 #include "virfile.h"
 #include "virhash.h"
-#include "threads.h"
+#include "virthread.h"
 
 #include <fcntl.h>
 #include <unistd.h>

src/util/virlog.c

@@ -45,7 +45,7 @@
 #include "viralloc.h"
 #include "util.h"
 #include "virbuffer.h"
-#include "threads.h"
+#include "virthread.h"
 #include "virfile.h"
 #include "virtime.h"
 #include "intprops.h"

src/util/virnetlink.c

@@ -38,7 +38,7 @@
 #include "virnetlink.h"
 #include "virlog.h"
 #include "viralloc.h"
-#include "threads.h"
+#include "virthread.h"
 #include "virmacaddr.h"
 #include "virterror_internal.h"
 

src/util/virnodesuspend.c

@@ -23,7 +23,7 @@
 #include "virnodesuspend.h"
 
 #include "vircommand.h"
-#include "threads.h"
+#include "virthread.h"
 #include "datatypes.h"
 
 #include "viralloc.h"

src/util/virobject.c

@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include "virobject.h"
-#include "threads.h"
+#include "virthread.h"
 #include "viralloc.h"
 #include "viratomic.h"
 #include "virterror_internal.h"

src/util/virrandom.c

@@ -27,7 +27,7 @@
 #include <strings.h>
 
 #include "virrandom.h"
-#include "threads.h"
+#include "virthread.h"
 #include "count-one-bits.h"
 #include "util.h"
 #include "virterror_internal.h"

src/util/virterror.c

@@ -31,7 +31,7 @@
 #include "datatypes.h"
 #include "virlog.h"
 #include "viralloc.h"
-#include "threads.h"
+#include "virthread.h"
 #include "util.h"
 
 virThreadLocal virLastErr;

src/util/virthread.c

@@ -1,5 +1,5 @@
 /*
- * threads.c: basic thread synchronization primitives
+ * virthread.c: basic thread synchronization primitives
  *
  * Copyright (C) 2009-2010 Red Hat, Inc.
  *
@@ -21,14 +21,14 @@
 
 #include <config.h>
 
-#include "threads.h"
+#include "virthread.h"
 
 /* On mingw, we prefer native threading over the sometimes-broken
  * pthreads-win32 library wrapper.  */
 #ifdef WIN32
-# include "threads-win32.c"
+# include "virthreadwin32.c"
 #elif defined HAVE_PTHREAD_MUTEXATTR_INIT
-# include "threads-pthread.c"
+# include "virthreadpthread.c"
 #else
 # error "Either pthreads or Win32 threads are required"
 #endif

src/util/virthread.h

@@ -1,5 +1,5 @@
 /*
- * threads.h: basic thread synchronization primitives
+ * virthread.h: basic thread synchronization primitives
  *
  * Copyright (C) 2009-2011 Red Hat, Inc.
  *
@@ -107,9 +107,9 @@ void *virThreadLocalGet(virThreadLocalPtr l);
 int virThreadLocalSet(virThreadLocalPtr l, void*) ATTRIBUTE_RETURN_CHECK;
 
 # ifdef WIN32
-#  include "threads-win32.h"
+#  include "virthreadwin32.h"
 # elif defined HAVE_PTHREAD_MUTEXATTR_INIT
-#  include "threads-pthread.h"
+#  include "virthreadpthread.h"
 # else
 #  error "Either pthreads or Win32 threads are required"
 # endif

src/util/virthreadpool.c

@@ -27,7 +27,7 @@
 
 #include "virthreadpool.h"
 #include "viralloc.h"
-#include "threads.h"
+#include "virthread.h"
 #include "virterror_internal.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

src/util/virthreadpthread.c

@@ -1,5 +1,5 @@
 /*
- * threads-pthread.c: basic thread synchronization primitives
+ * virthreadpthread.c: basic thread synchronization primitives
  *
  * Copyright (C) 2009-2011 Red Hat, Inc.
  *

src/util/virthreadpthread.h

@@ -1,5 +1,5 @@
 /*
- * threads.c: basic thread synchronization primitives
+ * virthreadpthread.c: basic thread synchronization primitives
  *
  * Copyright (C) 2009, 2011 Red Hat, Inc.
  *

src/util/virthreadwin32.c

@@ -1,5 +1,5 @@
 /*
- * threads-win32.c: basic thread synchronization primitives
+ * virthreadwin32.c: basic thread synchronization primitives
  *
  * Copyright (C) 2009-2011 Red Hat, Inc.
  *

src/util/virthreadwin32.h

@@ -1,5 +1,5 @@
 /*
- * threads-win32.h basic thread synchronization primitives
+ * virthreadwin32.h basic thread synchronization primitives
  *
  * Copyright (C) 2009, 2011-2012 Red Hat, Inc.
  *

src/vmware/vmware_conf.h

@@ -25,7 +25,7 @@
 
 # include "internal.h"
 # include "domain_conf.h"
-# include "threads.h"
+# include "virthread.h"
 
 # define VIR_FROM_THIS VIR_FROM_VMWARE
 # define PROGRAM_SENTINAL ((char *)0x1)

src/xen/xen_hypervisor.c

@@ -76,7 +76,7 @@
 #include "virbuffer.h"
 #include "capabilities.h"
 #include "viralloc.h"
-#include "threads.h"
+#include "virthread.h"
 #include "virfile.h"
 #include "virnodesuspend.h"
 #include "virtypedparam.h"

tests/eventtest.c

@@ -28,7 +28,7 @@
 
 #include "testutils.h"
 #include "internal.h"
-#include "threads.h"
+#include "virthread.h"
 #include "virlog.h"
 #include "util.h"
 #include "vireventpoll.h"

tests/nwfilterxml2xmltest.c

@@ -11,7 +11,7 @@
 #include "internal.h"
 #include "testutils.h"
 #include "xml.h"
-#include "threads.h"
+#include "virthread.h"
 #include "nwfilter_params.h"
 #include "nwfilter_conf.h"
 #include "testutilsqemu.h"

tests/qemumonitorjsontest.c

@@ -22,7 +22,7 @@
 #include "testutils.h"
 #include "testutilsqemu.h"
 #include "qemumonitortestutils.h"
-#include "threads.h"
+#include "virthread.h"
 #include "virterror_internal.h"
 
 

tests/qemumonitortestutils.c

@@ -26,7 +26,7 @@
 
 #include "qemumonitortestutils.h"
 
-#include "threads.h"
+#include "virthread.h"
 #include "qemu/qemu_monitor.h"
 #include "rpc/virnetsocket.h"
 #include "viralloc.h"

tests/testutils.c

@@ -41,7 +41,7 @@
 #include "internal.h"
 #include "viralloc.h"
 #include "util.h"
-#include "threads.h"
+#include "virthread.h"
 #include "virterror_internal.h"
 #include "virbuffer.h"
 #include "virlog.h"

tests/viratomictest.c

@@ -26,7 +26,7 @@
 
 #include "viratomic.h"
 #include "virrandom.h"
-#include "threads.h"
+#include "virthread.h"
 
 static int
 testTypes(const void *data ATTRIBUTE_UNUSED)

tools/console.c

@@ -42,7 +42,7 @@
 # include "util.h"
 # include "virfile.h"
 # include "viralloc.h"
-# include "threads.h"
+# include "virthread.h"
 # include "virterror_internal.h"
 
 /*

tools/virsh.c

@@ -64,7 +64,7 @@
 #include "libvirt/libvirt-qemu.h"
 #include "virfile.h"
 #include "configmake.h"
-#include "threads.h"
+#include "virthread.h"
 #include "vircommand.h"
 #include "virkeycode.h"
 #include "virnetdevbandwidth.h"

tools/virsh.h

@@ -35,7 +35,7 @@
 
 # include "internal.h"
 # include "virterror_internal.h"
-# include "threads.h"
+# include "virthread.h"
 # include "virnetdevbandwidth.h"
 
 # define VSH_MAX_XML_FILE (10*1024*1024)