[topic-libqb] re-worked patch series without the hdb & list changes

[Angus Salkeld]

Hi

I have re worked these patches so that there is not an unneccessaryly large
amount of namespace changes (these can be done at any time later). this
should also help in cherry picking patches between branches. The hdb
patch was very extensive!

This series makes corosync have only one pthread - the logsys thread.

Regards
Angus

[PATCH 1/7] libqb: coropoll -> qb_loop

[Angus Salkeld]

Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com&gt;
---
 configure.ac                       |    3 +-
 corosync.spec.in                   |    1 -
 cts/agents/Makefile.am             |    8 +-
 cts/agents/common_test_agent.c     |   30 ++-
 cts/agents/common_test_agent.h     |    3 +-
 cts/agents/confdb_test_agent.c     |    1 +
 cts/agents/cpg_test_agent.c        |   36 ++-
 cts/agents/sam_test_agent.c        |    1 +
 cts/agents/votequorum_test_agent.c |   14 +-
 exec/Makefile.am                   |    4 +-
 exec/coroipcs.c                    |    4 +-
 exec/coropoll.c                    |  555 ------------------------------------
 exec/main.c                        |   29 +-
 exec/main.h                        |    4 +-
 exec/timer.c                       |    2 +-
 exec/totemconfig.h                 |    2 +-
 exec/totemiba.c                    |   66 +++--
 exec/totemiba.h                    |    3 +-
 exec/totemmrp.c                    |    4 +-
 exec/totemmrp.h                    |    2 +-
 exec/totemnet.c                    |    7 +-
 exec/totemnet.h                    |    2 +-
 exec/totempg.c                     |    5 +-
 exec/totemrrp.c                    |   34 ++-
 exec/totemrrp.h                    |    4 +-
 exec/totemsrp.c                    |   79 +++---
 exec/totemsrp.h                    |    4 +-
 exec/totemudp.c                    |   42 ++--
 exec/totemudp.h                    |    3 +-
 include/Makefile.am                |    2 +-
 include/corosync/coroipcs.h        |    4 +-
 include/corosync/engine/coroapi.h  |    8 +-
 include/corosync/totem/coropoll.h  |  103 -------
 include/corosync/totem/totempg.h   |    4 +-
 test/Makefile.am                   |   36 ++--
 tools/Makefile.am                  |   10 +-
 36 files changed, 258 insertions(+), 861 deletions(-)
 delete mode 100644 exec/coropoll.c
 delete mode 100644 include/corosync/totem/coropoll.h

diff --git a/configure.ac b/configure.ac
index ad4b6c1..2ffe547 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.61])
 AC_INIT([corosync], [1.2.8], [openais(a)lists.osdl.org])
 AM_INIT_AUTOMAKE([-Wno-portability])
 
-AC_CONFIG_SRCDIR([lib/coroipcc.c])
+AC_CONFIG_SRCDIR([lib/cpg.c])
 AC_CONFIG_HEADER([include/corosync/config.h include/corosync/cs_config.h])
 
 AC_CANONICAL_HOST
@@ -72,6 +72,7 @@ AC_CHECK_LIB([pthread], [pthread_create])
 AC_CHECK_LIB([socket], [socket])
 AC_CHECK_LIB([nsl], [t_open])
 AC_CHECK_LIB([rt], [sched_getscheduler])
+PKG_CHECK_MODULES([LIBQB], [libqb])
 
 # Checks for header files.
 AC_FUNC_ALLOCA
diff --git a/corosync.spec.in b/corosync.spec.in
index ed531c3..d4ed212 100644
--- a/corosync.spec.in
+++ b/corosync.spec.in
@@ -232,7 +232,6 @@ The Corosync Cluster Engine APIs.
 %{_includedir}/corosync/quorum.h
 %{_includedir}/corosync/votequorum.h
 %dir %{_includedir}/corosync/totem/
-%{_includedir}/corosync/totem/coropoll.h
 %{_includedir}/corosync/totem/totem.h
 %{_includedir}/corosync/totem/totemip.h
 %{_includedir}/corosync/totem/totempg.h
diff --git a/cts/agents/Makefile.am b/cts/agents/Makefile.am
index 1d73a9b..4a74a3e 100644
--- a/cts/agents/Makefile.am
+++ b/cts/agents/Makefile.am
@@ -58,19 +58,19 @@ endif
 noinst_HEADERS          = common_test_agent.h
 
 cpg_test_agent_SOURCES = cpg_test_agent.c common_test_agent.c
-cpg_test_agent_LDADD =  -lcpg -lcfg -lcoroipcc ../../exec/coropoll.o ../../exec/crypto.o
+cpg_test_agent_LDADD =  -lcpg -lcfg -lcoroipcc ../../exec/crypto.o $(LIBQB_LIBS)
 cpg_test_agent_LDFLAGS =  -L../../lib -L.
 
 confdb_test_agent_SOURCES = confdb_test_agent.c common_test_agent.c
-confdb_test_agent_LDADD =  -lconfdb -lcoroipcc ../../exec/coropoll.o
+confdb_test_agent_LDADD =  -lconfdb -lcoroipcc $(LIBQB_LIBS)
 confdb_test_agent_LDFLAGS =  -L../../lib 
 
 sam_test_agent_SOURCES = sam_test_agent.c common_test_agent.c
-sam_test_agent_LDADD =  -lsam -lquorum -lcoroipcc  -lconfdb ../../exec/coropoll.o
+sam_test_agent_LDADD =  -lsam -lquorum -lcoroipcc  -lconfdb $(LIBQB_LIBS)
 sam_test_agent_LDFLAGS =  -L../../lib 
 
 votequorum_test_agent_SOURCES = votequorum_test_agent.c common_test_agent.c
-votequorum_test_agent_LDADD =  -lvotequorum -lquorum -lcoroipcc ../../exec/coropoll.o
+votequorum_test_agent_LDADD =  -lvotequorum -lquorum -lcoroipcc $(LIBQB_LIBS)
 votequorum_test_agent_LDFLAGS =  -L../../lib 
 
 if BUILD_DARWIN
diff --git a/cts/agents/common_test_agent.c b/cts/agents/common_test_agent.c
index 2f1c675..b3f4e04 100644
--- a/cts/agents/common_test_agent.c
+++ b/cts/agents/common_test_agent.c
@@ -47,17 +47,17 @@
 #include <poll.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <corosync/totem/coropoll.h>
+#include <qb/qbloop.h>
 #include "common_test_agent.h"
 
 
 int32_t parse_debug = 0;
 static char big_and_buf_rx[HOW_BIG_AND_BUF];
 ta_do_command_fn do_command;
-static hdb_handle_t poll_handle;
+static qb_loop_t *poll_handle;
 
 
-hdb_handle_t ta_poll_handle_get(void)
+qb_loop_t *ta_poll_handle_get(void)
 {
 	return poll_handle;
 }
@@ -102,7 +102,7 @@ static void ta_handle_command (int sock, char* msg)
 	free (str);
 }
 
-static int server_process_data_fn (hdb_handle_t handle,
+static int server_process_data_fn (
 	int fd,
 	int revents,
 	void *data)
@@ -121,7 +121,7 @@ static int server_process_data_fn (hdb_handle_t handle,
 			syslog (LOG_ERR,"recv() failed: %s", strerror(errno));
 		}
 		close (fd);
-		poll_stop (handle);
+		qb_loop_stop (ta_poll_handle_get());
 	} else {
 		big_and_buf_rx[nbytes] = '\0';
 
@@ -138,7 +138,7 @@ static int server_process_data_fn (hdb_handle_t handle,
 	return 0;
 }
 
-static int server_accept_fn (hdb_handle_t handle,
+static int server_accept_fn (
 	int fd, int revents, void *data)
 {
 	socklen_t addrlen;
@@ -169,7 +169,12 @@ retry_accept:
 		return (0); /* This is an error, but -1 would indicate disconnect from poll loop */
 	}
 
-	poll_dispatch_add (poll_handle, new_fd, POLLIN|POLLNVAL, NULL, server_process_data_fn);
+	qb_loop_poll_add (poll_handle,
+			QB_LOOP_MED,
+			new_fd,
+			POLLIN|POLLNVAL,
+			NULL,
+			server_process_data_fn);
 	return 0;
 }
 
@@ -236,11 +241,16 @@ int test_agent_run(int server_port, ta_do_command_fn func)
 	int listener;
 
 	do_command = func;
-	poll_handle = poll_create ();
+	poll_handle = qb_loop_create ();
 
 	listener = create_server_sockect (server_port);
-	poll_dispatch_add (poll_handle, listener, POLLIN|POLLNVAL, NULL, server_accept_fn);
+	qb_loop_poll_add (poll_handle,
+			  QB_LOOP_MED,
+			  listener,
+			  POLLIN|POLLNVAL,
+			  NULL, server_accept_fn);
 
-	return poll_run (poll_handle);
+	qb_loop_run (poll_handle);
+	return 0;
 }
 
diff --git a/cts/agents/common_test_agent.h b/cts/agents/common_test_agent.h
index ca510f1..37e8e65 100644
--- a/cts/agents/common_test_agent.h
+++ b/cts/agents/common_test_agent.h
@@ -36,6 +36,7 @@
 #define CORO_COMMON_TEST_AGNET_H_DEFINED
 
 #include <corosync/hdb.h>
+#include <qb/qbloop.h>
 
 #define OK_STR "OK"
 #define FAIL_STR "FAIL"
@@ -48,7 +49,7 @@ typedef void (*ta_do_command_fn) (int sock, char* func, char*args[], int
num_arg
 
 int test_agent_run(int server_port, ta_do_command_fn func);
 
-hdb_handle_t ta_poll_handle_get(void);
+qb_loop_t *ta_poll_handle_get(void);
 
 #endif /* CORO_COMMON_TEST_AGNET_H_DEFINED */
 
diff --git a/cts/agents/confdb_test_agent.c b/cts/agents/confdb_test_agent.c
index 289384d..87165d3 100644
--- a/cts/agents/confdb_test_agent.c
+++ b/cts/agents/confdb_test_agent.c
@@ -36,6 +36,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <assert.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/cts/agents/cpg_test_agent.c b/cts/agents/cpg_test_agent.c
index e94cb6b..453f74b 100644
--- a/cts/agents/cpg_test_agent.c
+++ b/cts/agents/cpg_test_agent.c
@@ -47,8 +47,9 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include <corosync/totem/coropoll.h>
 #include <corosync/list.h>
+#include <qb/qbdefs.h>
+#include <qb/qbloop.h>
 #include <corosync/cpg.h>
 #include <corosync/cfg.h>
 #include "../../exec/crypto.h"
@@ -318,10 +319,11 @@ static void read_messages (int sock, char* atmost_str)
 
 static void send_some_more_messages_later (void)
 {
-	poll_timer_handle timer_handle;
+	qb_loop_timer_handle timer_handle;
 	cpg_dispatch (cpg_handle, CS_DISPATCH_ALL);
-	poll_timer_add (
+	qb_loop_timer_add (
 		ta_poll_handle_get(),
+		QB_LOOP_MED,
 		300, NULL,
 		send_some_more_messages,
 		&timer_handle);
@@ -550,7 +552,7 @@ static void msg_blaster_zcb (int sock, char* num_to_send_str)
 
 static corosync_cfg_state_notification_t notification_buffer;
 
-static int cfg_dispatch_wrapper_fn (hdb_handle_t handle,
+static int cfg_dispatch_wrapper_fn (
 	int fd,
 	int revents,
 	void *data)
@@ -558,7 +560,7 @@ static int cfg_dispatch_wrapper_fn (hdb_handle_t handle,
 	cs_error_t error;
 	if (revents & POLLHUP || revents & POLLERR) {
 		syslog (LOG_ERR, "%s() got POLLHUP disconnecting from CFG", __func__);
-		poll_dispatch_delete (ta_poll_handle_get(), cfg_fd);
+		qb_loop_poll_del (ta_poll_handle_get(), cfg_fd);
 		close (cfg_fd);
 		cfg_fd = -1;
 		return -1;
@@ -566,7 +568,7 @@ static int cfg_dispatch_wrapper_fn (hdb_handle_t handle,
 	error = corosync_cfg_dispatch (cfg_handle, CS_DISPATCH_ALL);
 	if (error == CS_ERR_LIBRARY) {
 		syslog (LOG_ERR, "%s() got LIB error disconnecting from CFG.", __func__);
-		poll_dispatch_delete (ta_poll_handle_get(), cfg_fd);
+		qb_loop_poll_del (ta_poll_handle_get(), cfg_fd);
 		close (cfg_fd);
 		cfg_fd = -1;
 		return -1;
@@ -574,7 +576,7 @@ static int cfg_dispatch_wrapper_fn (hdb_handle_t handle,
 	return 0;
 }
 
-static int cpg_dispatch_wrapper_fn (hdb_handle_t handle,
+static int cpg_dispatch_wrapper_fn (
 	int fd,
 	int revents,
 	void *data)
@@ -582,7 +584,7 @@ static int cpg_dispatch_wrapper_fn (hdb_handle_t handle,
 	cs_error_t error;
 	if (revents & POLLHUP || revents & POLLERR) {
 		syslog (LOG_ERR, "%s() got POLLHUP disconnecting from CPG", __func__);
-		poll_dispatch_delete (ta_poll_handle_get(), cpg_fd);
+		qb_loop_poll_del (ta_poll_handle_get(), cpg_fd);
 		close (cpg_fd);
 		cpg_fd = -1;
 		return -1;
@@ -590,7 +592,7 @@ static int cpg_dispatch_wrapper_fn (hdb_handle_t handle,
 	error = cpg_dispatch (cpg_handle, CS_DISPATCH_ALL);
 	if (error == CS_ERR_LIBRARY) {
 		syslog (LOG_ERR, "%s() got LIB error disconnecting from CPG", __func__);
-		poll_dispatch_delete (ta_poll_handle_get(), cpg_fd);
+		qb_loop_poll_del (ta_poll_handle_get(), cpg_fd);
 		close (cpg_fd);
 		cpg_fd = -1;
 		return -1;
@@ -660,7 +662,12 @@ static void do_command (int sock, char* func, char*args[], int
num_args)
 		}
 
 		cpg_fd_get (cpg_handle, &cpg_fd);
-		poll_dispatch_add (ta_poll_handle_get(), cpg_fd, POLLIN|POLLNVAL, NULL,
cpg_dispatch_wrapper_fn);
+		qb_loop_poll_add (ta_poll_handle_get(),
+				QB_LOOP_MED,
+				cpg_fd,
+				POLLIN|POLLNVAL,
+				NULL,
+				cpg_dispatch_wrapper_fn);
 
 	} else if (strcmp ("cpg_local_get", func) == 0) {
 		unsigned int local_nodeid;
@@ -671,7 +678,7 @@ static void do_command (int sock, char* func, char*args[], int
num_args)
 	} else if (strcmp ("cpg_finalize", func) == 0) {
 
 		cpg_finalize (cpg_handle);
-		poll_dispatch_delete (ta_poll_handle_get(), cpg_fd);
+		qb_loop_poll_del (ta_poll_handle_get(), cpg_fd);
 		cpg_fd = -1;
 
 	} else if (strcmp ("record_config_events", func) == 0) {
@@ -719,7 +726,12 @@ static void do_command (int sock, char* func, char*args[], int
num_args)
 
 		corosync_cfg_state_track (cfg_handle, 0, &notification_buffer);
 
-		poll_dispatch_add (ta_poll_handle_get(), cfg_fd, POLLIN|POLLNVAL, NULL,
cfg_dispatch_wrapper_fn);
+		qb_loop_poll_add (ta_poll_handle_get(),
+				  QB_LOOP_MED,
+				  cfg_fd,
+				  POLLIN|POLLNVAL,
+				  NULL,
+				  cfg_dispatch_wrapper_fn);
 	} else {
 		syslog (LOG_ERR,"%s RPC:%s not supported!", __func__, func);
 	}
diff --git a/cts/agents/sam_test_agent.c b/cts/agents/sam_test_agent.c
index 17a91e2..430a907 100644
--- a/cts/agents/sam_test_agent.c
+++ b/cts/agents/sam_test_agent.c
@@ -42,6 +42,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <pthread.h>
 #include <limits.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/cts/agents/votequorum_test_agent.c b/cts/agents/votequorum_test_agent.c
index 7ebd12f..1acab8e 100644
--- a/cts/agents/votequorum_test_agent.c
+++ b/cts/agents/votequorum_test_agent.c
@@ -48,7 +48,7 @@
 #include <syslog.h>
 #include <poll.h>
 
-#include <corosync/totem/coropoll.h>
+#include <qb/qbloop.h>
 #include <corosync/corotypes.h>
 #include <corosync/votequorum.h>
 #include <corosync/quorum.h>
@@ -78,7 +78,7 @@ static void quorum_notification_fn(
 }
 
 
-static int vq_dispatch_wrapper_fn (hdb_handle_t handle,
+static int vq_dispatch_wrapper_fn (
 	int fd,
 	int revents,
 	void *data)
@@ -86,13 +86,13 @@ static int vq_dispatch_wrapper_fn (hdb_handle_t handle,
 	cs_error_t error = votequorum_dispatch (vq_handle, CS_DISPATCH_ALL);
 	if (error == CS_ERR_LIBRARY) {
 		syslog (LOG_ERR, "%s() got LIB error disconnecting from corosync.",
__func__);
-		poll_dispatch_delete (ta_poll_handle_get(), fd);
+		qb_loop_poll_del (ta_poll_handle_get(), fd);
 		close (fd);
 	}
 	return 0;
 }
 
-static int q_dispatch_wrapper_fn (hdb_handle_t handle,
+static int q_dispatch_wrapper_fn (
 	int fd,
 	int revents,
 	void *data)
@@ -100,7 +100,7 @@ static int q_dispatch_wrapper_fn (hdb_handle_t handle,
 	cs_error_t error = quorum_dispatch (q_handle, CS_DISPATCH_ALL);
 	if (error == CS_ERR_LIBRARY) {
 		syslog (LOG_ERR, "%s() got LIB error disconnecting from corosync.",
__func__);
-		poll_dispatch_delete (ta_poll_handle_get(), fd);
+		qb_loop_poll_del (ta_poll_handle_get(), fd);
 		close (fd);
 	}
 	return 0;
@@ -137,7 +137,7 @@ static int q_lib_init(void)
 			}
 
 			votequorum_fd_get (vq_handle, &fd);
-			poll_dispatch_add (ta_poll_handle_get(), fd,
+			qb_loop_poll_add (ta_poll_handle_get(), QB_LOOP_MED, fd,
 				POLLIN|POLLNVAL, NULL, vq_dispatch_wrapper_fn);
 		}
 	}
@@ -155,7 +155,7 @@ static int q_lib_init(void)
 				syslog (LOG_ERR, "quorum_trackstart FAILED: %d\n", ret);
 			}
 			quorum_fd_get (q_handle, &fd);
-			poll_dispatch_add (ta_poll_handle_get(), fd,
+			qb_loop_poll_add (ta_poll_handle_get(), QB_LOOP_MED, fd,
 				POLLIN|POLLNVAL, NULL, q_dispatch_wrapper_fn);
 		}
 	}
diff --git a/exec/Makefile.am b/exec/Makefile.am
index 938237c..00fd9e8 100644
--- a/exec/Makefile.am
+++ b/exec/Makefile.am
@@ -35,7 +35,7 @@ AM_CFLAGS		= -fPIC
 
 INCLUDES		= -I$(top_builddir)/include -I$(top_srcdir)/include $(nss_CFLAGS)
$(rdmacm_CFLAGS) $(ibverbs_CFLAGS)
 
-TOTEM_SRC		= coropoll.c totemip.c totemnet.c totemudp.c \
+TOTEM_SRC		= totemip.c totemnet.c totemudp.c \
 			  totemrrp.c totemsrp.c totemmrp.c totempg.c \
 			  crypto.c wthread.c tsafe.c
 if BUILD_RDMA
@@ -59,7 +59,7 @@ libcoroipcs_a_SOURCES	= $(COROIPCS_SRC)
 corosync_SOURCES 	= main.c util.c sync.c apidef.c service.c \
 			  timer.c totemconfig.c mainconfig.c quorum.c schedwrk.c \
 			  ../lcr/lcr_ifact.c evil.c syncv2.c
-corosync_LDADD	  	= -ltotem_pg -llogsys -lcoroipcs $(statgrab_LIBS)
+corosync_LDADD	  	= -ltotem_pg -llogsys -lcoroipcs $(statgrab_LIBS) $(LIBQB_LIBS)
 corosync_DEPENDENCIES	= libtotem_pg.so.$(SONAME) liblogsys.so.$(SONAME)
libcoroipcs.so.$(SONAME)
 corosync_LDFLAGS	= $(OS_DYFLAGS) -L./
 
diff --git a/exec/coroipcs.c b/exec/coroipcs.c
index 0ca22d3..9c1bfdb 100644
--- a/exec/coroipcs.c
+++ b/exec/coroipcs.c
@@ -1262,7 +1262,7 @@ static void msg_send (void *conn, const struct iovec *iov, unsigned
int iov_len,
 		if (conn_info->poll_state == POLL_STATE_IN) {
 			conn_info->poll_state = POLL_STATE_INOUT;
 			api->poll_dispatch_modify (conn_info->fd,
-				POLLIN|POLLOUT|POLLNVAL);
+				POLLIN|POLLOUT|POLLNVAL, conn_info);
 		}
 	}
 
@@ -1731,7 +1731,7 @@ int coroipcs_handler_dispatch (
 		}
 		if (conn_info->poll_state == POLL_STATE_INOUT) {
 			conn_info->poll_state = POLL_STATE_IN;
-			api->poll_dispatch_modify (conn_info->fd, POLLIN|POLLNVAL);
+			api->poll_dispatch_modify (conn_info->fd, POLLIN|POLLNVAL, conn_info);
 		}
 	}
 
diff --git a/exec/coropoll.c b/exec/coropoll.c
deleted file mode 100644
index 95978df..0000000
--- a/exec/coropoll.c
+++ /dev/null
@@ -1,555 +0,0 @@
-/*
- * Copyright (c) 2003-2004 MontaVista Software, Inc.
- * Copyright (c) 2006-2009 Red Hat, Inc.
- *
- * All rights reserved.
- *
- * Author: Steven Dake (sdake(a)redhat.com)
- *
- * This software licensed under BSD license, the text of which follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * - Neither the name of the MontaVista Software, Inc. nor the names of its
- *   contributors may be used to endorse or promote products derived from this
- *   software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <config.h>
-
-#include <errno.h>
-#include <pthread.h>
-#include <sys/poll.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include <corosync/hdb.h>
-#include <corosync/totem/coropoll.h>
-#include <corosync/list.h>
-#include "tlist.h"
-
-typedef int (*dispatch_fn_t) (hdb_handle_t hdb_handle, int fd, int revents, void *data);
-
-struct poll_entry {
-	struct pollfd ufd;
-	dispatch_fn_t dispatch_fn;
-	void *data;
-};
-
-struct poll_instance {
-	struct poll_entry *poll_entries;
-	struct pollfd *ufds;
-	int poll_entry_count;
-	struct timerlist timerlist;
-	int stop_requested;
-	int pipefds[2];
-	poll_low_fds_event_fn low_fds_event_fn;
-	int32_t not_enough_fds;
-};
-
-DECLARE_HDB_DATABASE (poll_instance_database,NULL);
-
-static int dummy_dispatch_fn (hdb_handle_t handle, int fd, int revents, void *data) {
-	return (0);
-}
-
-hdb_handle_t poll_create (void)
-{
-	hdb_handle_t handle;
-	struct poll_instance *poll_instance;
-	unsigned int res;
-
-	res = hdb_handle_create (&poll_instance_database,
-		sizeof (struct poll_instance), &handle);
-	if (res != 0) {
-		goto error_exit;
-	}
-	res = hdb_handle_get (&poll_instance_database, handle,
-		(void *)&poll_instance);
-	if (res != 0) {
-		goto error_destroy;
-	}
-
-	poll_instance->poll_entries = 0;
-	poll_instance->ufds = 0;
-	poll_instance->poll_entry_count = 0;
-	poll_instance->stop_requested = 0;
-	poll_instance->not_enough_fds = 0;
-	timerlist_init (&poll_instance->timerlist);
-
-	res = pipe (poll_instance->pipefds);
-	if (res != 0) {
-		goto error_destroy;
-	}
-
-	/*
-	 * Allow changes in modify to propogate into new poll instance
-	 */
-	res = poll_dispatch_add (
-		handle,
-		poll_instance->pipefds[0],
-		POLLIN,
-		NULL,
-		dummy_dispatch_fn);
-	if (res != 0) {
-		goto error_destroy;
-	}
-		
-	return (handle);
-
-error_destroy:
-	hdb_handle_destroy (&poll_instance_database, handle);
-
-error_exit:
-	return (-1);
-}
-
-int poll_destroy (hdb_handle_t handle)
-{
-	struct poll_instance *poll_instance;
-	int res = 0;
-
-	res = hdb_handle_get (&poll_instance_database, handle,
-		(void *)&poll_instance);
-	if (res != 0) {
-		res = -ENOENT;
-		goto error_exit;
-	}
-
-	free (poll_instance->poll_entries);
-	free (poll_instance->ufds);
-
-	hdb_handle_destroy (&poll_instance_database, handle);
-
-	hdb_handle_put (&poll_instance_database, handle);
-
-error_exit:
-	return (res);
-}
-
-int poll_dispatch_add (
-	hdb_handle_t handle,
-	int fd,
-	int events,
-	void *data,
-	int (*dispatch_fn) (
-		hdb_handle_t hdb_handle_t,
-		int fd,
-		int revents,
-		void *data))
-{
-	struct poll_instance *poll_instance;
-	struct poll_entry *poll_entries;
-	struct pollfd *ufds;
-	int found = 0;
-	int install_pos;
-	int res = 0;
-
-	res = hdb_handle_get (&poll_instance_database, handle,
-		(void *)&poll_instance);
-	if (res != 0) {
-		res = -ENOENT;
-		goto error_exit;
-	}
-
-	for (found = 0, install_pos = 0; install_pos < poll_instance->poll_entry_count;
install_pos++) {
-		if (poll_instance->poll_entries[install_pos].ufd.fd == -1) {
-			found = 1;
-			break;
-		}
-	}
-
-	if (found == 0) {
-		/*
-		 * Grow pollfd list
-		 */
-		poll_entries = (struct poll_entry *)realloc (poll_instance->poll_entries,
-			(poll_instance->poll_entry_count + 1) *
-			sizeof (struct poll_entry));
-		if (poll_entries == NULL) {
-			res = -ENOMEM;
-			goto error_put;
-		}
-		poll_instance->poll_entries = poll_entries;
-
-		ufds = (struct pollfd *)realloc (poll_instance->ufds,
-			(poll_instance->poll_entry_count + 1) *
-			sizeof (struct pollfd));
-		if (ufds == NULL) {
-			res = -ENOMEM;
-			goto error_put;
-		}
-		poll_instance->ufds = ufds;
-
-		poll_instance->poll_entry_count += 1;
-		install_pos = poll_instance->poll_entry_count - 1;
-	}
-
-	/*
-	 * Install new dispatch handler
-	 */
-	poll_instance->poll_entries[install_pos].ufd.fd = fd;
-	poll_instance->poll_entries[install_pos].ufd.events = events;
-	poll_instance->poll_entries[install_pos].ufd.revents = 0;
-	poll_instance->poll_entries[install_pos].dispatch_fn = dispatch_fn;
-	poll_instance->poll_entries[install_pos].data = data;
-
-error_put:
-	hdb_handle_put (&poll_instance_database, handle);
-
-error_exit:
-	return (res);
-}
-
-int poll_dispatch_modify (
-	hdb_handle_t handle,
-	int fd,
-	int events,
-	int (*dispatch_fn) (
-		hdb_handle_t hdb_handle_t,
-		int fd,
-		int revents,
-		void *data))
-{
-	struct poll_instance *poll_instance;
-	int i;
-	int res = 0;
-
-	res = hdb_handle_get (&poll_instance_database, handle,
-		(void *)&poll_instance);
-	if (res != 0) {
-		res = -ENOENT;
-		goto error_exit;
-	}
-
-	/*
-	 * Find file descriptor to modify events and dispatch function
-	 */
-	for (i = 0; i < poll_instance->poll_entry_count; i++) {
-		if (poll_instance->poll_entries[i].ufd.fd == fd) {
-			int change_notify = 0;
-
-			if (poll_instance->poll_entries[i].ufd.events != events) {
-				change_notify = 1;
-			}
-			poll_instance->poll_entries[i].ufd.events = events;
-			poll_instance->poll_entries[i].dispatch_fn = dispatch_fn;
-			if (change_notify) {
-				char buf = 1;
-				write (poll_instance->pipefds[1], &buf, 1);
-			}
-
-			goto error_put;
-		}
-	}
-
-	res = -EBADF;
-
-error_put:
-	hdb_handle_put (&poll_instance_database, handle);
-
-error_exit:
-	return (res);
-}
-
-int poll_dispatch_delete (
-	hdb_handle_t handle,
-	int fd)
-{
-	struct poll_instance *poll_instance;
-	int i;
-	int res = 0;
-
-	res = hdb_handle_get (&poll_instance_database, handle,
-		(void *)&poll_instance);
-	if (res != 0) {
-		res = -ENOENT;
-		goto error_exit;
-	}
-
-	/*
-	 * Find dispatch fd to delete
-	 */
-	res = -EBADF;
-	for (i = 0; i < poll_instance->poll_entry_count; i++) {
-		if (poll_instance->poll_entries[i].ufd.fd == fd) {
-			poll_instance->ufds[i].fd = -1;
-			poll_instance->poll_entries[i].ufd.fd = -1;
-			poll_instance->poll_entries[i].ufd.revents = 0;
-
-			res = 0;
-			break;
-		}
-	}
-
-
-	hdb_handle_put (&poll_instance_database, handle);
-
-error_exit:
-	return (res);
-}
-
-int poll_timer_add (
-	hdb_handle_t handle,
-	int msec_duration, void *data,
-	void (*timer_fn) (void *data),
-	poll_timer_handle *timer_handle_out)
-{
-	struct poll_instance *poll_instance;
-	int res = 0;
-
-	if (timer_handle_out == NULL) {
-		res = -ENOENT;
-		goto error_exit;
-	}
-
-	res = hdb_handle_get (&poll_instance_database, handle,
-		(void *)&poll_instance);
-	if (res != 0) {
-		res = -ENOENT;
-		goto error_exit;
-	}
-
-	timerlist_add_duration (&poll_instance->timerlist,
-		timer_fn, data, ((unsigned long long)msec_duration) * 1000000ULL, timer_handle_out);
-
-	hdb_handle_put (&poll_instance_database, handle);
-error_exit:
-	return (res);
-}
-
-int poll_timer_delete (
-	hdb_handle_t handle,
-	poll_timer_handle th)
-{
-	struct poll_instance *poll_instance;
-	int res = 0;
-
-	if (th == 0) {
-		return (0);
-	}
-	res = hdb_handle_get (&poll_instance_database, handle,
-		(void *)&poll_instance);
-	if (res != 0) {
-		res = -ENOENT;
-		goto error_exit;
-	}
-
-	timerlist_del (&poll_instance->timerlist, (void *)th);
-
-	hdb_handle_put (&poll_instance_database, handle);
-
-error_exit:
-	return (res);
-}
-
-int poll_stop (
-	hdb_handle_t handle)
-{
-	struct poll_instance *poll_instance;
-	unsigned int res;
-
-	res = hdb_handle_get (&poll_instance_database, handle,
-		(void *)&poll_instance);
-	if (res != 0) {
-		res = -ENOENT;
-		goto error_exit;
-	}
-
-	poll_instance->stop_requested = 1;
-
-	hdb_handle_put (&poll_instance_database, handle);
-error_exit:
-	return (res);
-}
-
-int poll_low_fds_event_set(
-	hdb_handle_t handle,
-	poll_low_fds_event_fn fn)
-{
-	struct poll_instance *poll_instance;
-
-	if (hdb_handle_get (&poll_instance_database, handle,
-		(void *)&poll_instance) != 0) {
-		return -ENOENT;
-	}
-
-	poll_instance->low_fds_event_fn = fn;
-
-	hdb_handle_put (&poll_instance_database, handle);
-	return 0;
-}
-
-/* logs, std(in|out|err), pipe */
-#define POLL_FDS_USED_MISC 50
-
-static void poll_fds_usage_check(struct poll_instance *poll_instance)
-{
-	struct rlimit lim;
-	static int32_t socks_limit = 0;
-	int32_t send_event = 0;
-	int32_t socks_used = 0;
-	int32_t socks_avail = 0;
-	int32_t i;
-
-	if (socks_limit == 0) {
-		if (getrlimit(RLIMIT_NOFILE, &lim) == -1) {
-			char error_str[100];
-			strerror_r(errno, error_str, 100);
-			printf("getrlimit: %s\n", error_str);
-			return;
-		}
-		socks_limit = lim.rlim_cur;
-		socks_limit -= POLL_FDS_USED_MISC;
-		if (socks_limit < 0) {
-			socks_limit = 0;
-		}
-	}
-
-	for (i = 0; i < poll_instance->poll_entry_count; i++) {
-		if (poll_instance->poll_entries[i].ufd.fd != -1) {
-			socks_used++;
-		}
-	}
-	socks_avail = socks_limit - socks_used;
-	if (socks_avail < 0) {
-		socks_avail = 0;
-	}
-	send_event = 0;
-	if (poll_instance->not_enough_fds) {
-		if (socks_avail > 2) {
-			poll_instance->not_enough_fds = 0;
-			send_event = 1;
-		}
-	} else {
-		if (socks_avail <= 1) {
-			poll_instance->not_enough_fds = 1;
-			send_event = 1;
-		}
-	}
-	if (send_event) {
-		poll_instance->low_fds_event_fn(poll_instance->not_enough_fds,
-			socks_avail);
-	}
-}
-
-int poll_run (
-	hdb_handle_t handle)
-{
-	struct poll_instance *poll_instance;
-	int i;
-	unsigned long long expire_timeout_msec = -1;
-	int res;
-	int poll_entry_count;
-
-	res = hdb_handle_get (&poll_instance_database, handle,
-		(void *)&poll_instance);
-	if (res != 0) {
-		goto error_exit;
-	}
-
-	for (;;) {
-rebuild_poll:
-		for (i = 0; i < poll_instance->poll_entry_count; i++) {
-			memcpy (&poll_instance->ufds[i],
-				&poll_instance->poll_entries[i].ufd,
-				sizeof (struct pollfd));
-		}
-		poll_fds_usage_check(poll_instance);
-		expire_timeout_msec = timerlist_msec_duration_to_expire
(&poll_instance->timerlist);
-
-		if (expire_timeout_msec != -1 && expire_timeout_msec > 0xFFFFFFFF) {
-			expire_timeout_msec = 0xFFFFFFFE;
-		}
-
-retry_poll:
-		res = poll (poll_instance->ufds,
-			poll_instance->poll_entry_count, expire_timeout_msec);
-		if (poll_instance->stop_requested) {
-			return (0);
-		}
-		if (errno == EINTR && res == -1) {
-			goto retry_poll;
-		} else
-		if (res == -1) {
-			goto error_exit;
-		}
-
-		if (poll_instance->ufds[0].revents) {
-			char buf;
-			read (poll_instance->ufds[0].fd, &buf, 1);
-			goto rebuild_poll;
-		}
-		poll_entry_count = poll_instance->poll_entry_count;
-		for (i = 0; i < poll_entry_count; i++) {
-			if (poll_instance->ufds[i].fd != -1 &&
-				poll_instance->ufds[i].revents) {
-
-				res = poll_instance->poll_entries[i].dispatch_fn (handle,
-					poll_instance->ufds[i].fd,
-					poll_instance->ufds[i].revents,
-					poll_instance->poll_entries[i].data);
-
-				/*
-				 * Remove dispatch functions that return -1
-				 */
-				if (res == -1) {
-					poll_instance->poll_entries[i].ufd.fd = -1; /* empty entry */
-				}
-			}
-		}
-		timerlist_expire (&poll_instance->timerlist);
-	} /* for (;;) */
-
-	hdb_handle_put (&poll_instance_database, handle);
-error_exit:
-	return (-1);
-}
-
-#ifdef COMPILE_OUT
-void poll_print_state (
-	hdb_handle_t handle,
-	int fd)
-{
-	struct poll_instance *poll_instance;
-	int i;
-	int res = 0;
-	res = hdb_handle_get (&poll_instance_database, handle,
-		(void *)&poll_instance);
-	if (res != 0) {
-		res = -ENOENT;
-		exit (1);
-	}
-
-	for (i = 0; i < poll_instance->poll_entry_count; i++) {
-		if (poll_instance->poll_entries[i].ufd.fd == fd) {
-		printf ("fd %d\n", poll_instance->poll_entries[i].ufd.fd);
-		printf ("events %d\n", poll_instance->poll_entries[i].ufd.events);
-		printf ("dispatch_fn %p\n", poll_instance->poll_entries[i].dispatch_fn);
-		}
-	}
-}
-
-#endif
diff --git a/exec/main.c b/exec/main.c
index b994648..40f7974 100644
--- a/exec/main.c
+++ b/exec/main.c
@@ -59,13 +59,15 @@
 #include <time.h>
 #include <semaphore.h>
 
+#include <qb/qbdefs.h>
+#include <qb/qbloop.h>
+
 #include <corosync/swab.h>
 #include <corosync/corotypes.h>
 #include <corosync/coroipc_types.h>
 #include <corosync/corodefs.h>
 #include <corosync/list.h>
 #include <corosync/lcr/lcr_ifact.h>
-#include <corosync/totem/coropoll.h>
 #include <corosync/totem/totempg.h>
 #include <corosync/engine/objdb.h>
 #include <corosync/engine/config.h>
@@ -126,7 +128,7 @@ static enum cs_sync_mode minimum_sync_mode;
 
 static int sync_in_process = 1;
 
-static hdb_handle_t corosync_poll_handle;
+static qb_loop_t *corosync_poll_handle;
 
 struct sched_param global_sched_param;
 
@@ -146,7 +148,7 @@ static int32_t corosync_not_enough_fds_left = 0;
 
 static void serialize_unlock (void);
 
-hdb_handle_t corosync_poll_handle_get (void)
+qb_loop_t *corosync_poll_handle_get (void)
 {
 	return (corosync_poll_handle);
 }
@@ -172,7 +174,7 @@ static void unlink_all_completed (void)
 	 */
 	serialize_unlock ();
 	api->timer_delete (corosync_stats_timer_handle);
-	poll_stop (corosync_poll_handle);
+	qb_loop_stop (corosync_poll_handle);
 	totempg_finalize ();
 
 	/*
@@ -1024,7 +1026,6 @@ static void ipc_fatal_error(const char *error_msg) {
 }
 
 static int corosync_poll_handler_accept (
-	hdb_handle_t handle,
 	int fd,
 	int revent,
 	void *context)
@@ -1033,7 +1034,6 @@ static int corosync_poll_handler_accept (
 }
 
 static int corosync_poll_handler_dispatch (
-	hdb_handle_t handle,
 	int fd,
 	int revent,
 	void *context)
@@ -1045,7 +1045,7 @@ static int corosync_poll_handler_dispatch (
 static void corosync_poll_accept_add (
 	int fd)
 {
-	poll_dispatch_add (corosync_poll_handle, fd, POLLIN|POLLNVAL, 0,
+	qb_loop_poll_add (corosync_poll_handle, QB_LOOP_MED, fd, POLLIN|POLLNVAL, 0,
 		corosync_poll_handler_accept);
 }
 
@@ -1053,15 +1053,16 @@ static void corosync_poll_dispatch_add (
 	int fd,
 	void *context)
 {
-	poll_dispatch_add (corosync_poll_handle, fd, POLLIN|POLLNVAL, context,
+	qb_loop_poll_add (corosync_poll_handle, QB_LOOP_MED, fd, POLLIN|POLLNVAL, context,
 		corosync_poll_handler_dispatch);
 }
 
 static void corosync_poll_dispatch_modify (
 	int fd,
-	int events)
+	int events,
+	void *context)
 {
-	poll_dispatch_modify (corosync_poll_handle, fd, events,
+	qb_loop_poll_mod (corosync_poll_handle, QB_LOOP_MED, fd, events, context,
 		corosync_poll_handler_dispatch);
 }
 
@@ -1069,7 +1070,7 @@ static void corosync_poll_dispatch_destroy (
     int fd,
     void *context)
 {
-	poll_dispatch_delete (corosync_poll_handle, fd);
+	qb_loop_poll_del (corosync_poll_handle, fd);
 }
 
 static hdb_handle_t corosync_stats_create_connection (const char* name,
@@ -1734,8 +1735,8 @@ int main (int argc, char **argv, char **envp)
 		serialize_unlock,
 		sched_priority);
 
-	corosync_poll_handle = poll_create ();
-	poll_low_fds_event_set(corosync_poll_handle, main_low_fds_event);
+	corosync_poll_handle = qb_loop_create ();
+	qb_loop_poll_low_fds_event_set(corosync_poll_handle, main_low_fds_event);
 
 	/*
 	 * Sleep for a while to let other nodes in the cluster
@@ -1814,7 +1815,7 @@ int main (int argc, char **argv, char **envp)
 	/*
 	 * Start main processing loop
 	 */
-	poll_run (corosync_poll_handle);
+	qb_loop_run (corosync_poll_handle);
 
 	return EXIT_SUCCESS;
 }
diff --git a/exec/main.h b/exec/main.h
index ac2e31e..9a3004a 100644
--- a/exec/main.h
+++ b/exec/main.h
@@ -39,7 +39,7 @@
 #define FALSE 0
 #include <corosync/corotypes.h>
 #include <corosync/hdb.h>
-#include <corosync/totem/coropoll.h>
+#include <qb/qbloop.h>
 #include <corosync/totem/totempg.h>
 #include <corosync/engine/objdb.h>
 #include <corosync/engine/config.h>
@@ -65,6 +65,6 @@ extern void corosync_shutdown_request (void);
 
 extern void corosync_state_dump (void);
 
-extern hdb_handle_t corosync_poll_handle_get (void);
+extern qb_loop_t *corosync_poll_handle_get (void);
 
 #endif /* MAIN_H_DEFINED */
diff --git a/exec/timer.c b/exec/timer.c
index 69f9a95..207d99f 100644
--- a/exec/timer.c
+++ b/exec/timer.c
@@ -62,7 +62,7 @@
 #include <corosync/coroipc_types.h>
 #include <corosync/list.h>
 #include <corosync/lcr/lcr_ifact.h>
-#include <corosync/totem/coropoll.h>
+#include <qb/qbloop.h>
 #include <corosync/totem/totempg.h>
 #include <corosync/engine/objdb.h>
 #include <corosync/engine/config.h>
diff --git a/exec/totemconfig.h b/exec/totemconfig.h
index 7169c07..9901b8c 100644
--- a/exec/totemconfig.h
+++ b/exec/totemconfig.h
@@ -38,7 +38,7 @@
 #include <netinet/in.h>
 #include <corosync/corotypes.h>
 #include <corosync/list.h>
-#include <corosync/totem/coropoll.h>
+#include <qb/qbloop.h>
 #include <corosync/totem/totempg.h>
 #include <corosync/engine/objdb.h>
 
diff --git a/exec/totemiba.c b/exec/totemiba.c
index a0379ff..58c4582 100644
--- a/exec/totemiba.c
+++ b/exec/totemiba.c
@@ -70,7 +70,7 @@
 #include <corosync/list.h>
 #include <corosync/hdb.h>
 #include <corosync/swab.h>
-#include <corosync/totem/coropoll.h>
+#include <qb/qbloop.h>
 #define LOGSYS_UTILS_ONLY 1
 #include <corosync/engine/logsys.h>
 #include "totemiba.h"
@@ -111,9 +111,9 @@ struct totemiba_instance {
 
 	void *rrp_context;
 
-	poll_timer_handle timer_netif_check_timeout;
+	qb_loop_timer_handle timer_netif_check_timeout;
 
-	hdb_handle_t totemiba_poll_handle;
+	qb_loop_t *totemiba_poll_handle;
 
 	struct totem_ip_address my_id;
 
@@ -465,7 +465,7 @@ static inline void iba_deliver_fn (struct totemiba_instance *instance,
uint64_t
 	instance->totemiba_deliver_fn (instance->rrp_context, addr, bytes);
 }
 
-static int mcast_cq_send_event_fn (hdb_handle_t poll_handle,  int events,  int suck, 
void *context)
+static int mcast_cq_send_event_fn (int events,  int suck,  void *context)
 {
 	struct totemiba_instance *instance = (struct totemiba_instance *)context;
 	struct ibv_wc wc[32];
@@ -488,7 +488,7 @@ static int mcast_cq_send_event_fn (hdb_handle_t poll_handle,  int
events,  int s
 	return (0);
 }
 
-static int mcast_cq_recv_event_fn (hdb_handle_t poll_handle,  int events,  int suck, 
void *context)
+static int mcast_cq_recv_event_fn (int events,  int suck,  void *context)
 {
 	struct totemiba_instance *instance = (struct totemiba_instance *)context;
 	struct ibv_wc wc[64];
@@ -512,7 +512,7 @@ static int mcast_cq_recv_event_fn (hdb_handle_t poll_handle,  int
events,  int s
 	return (0);
 }
 
-static int mcast_rdma_event_fn (hdb_handle_t poll_handle,  int events,  int suck,  void
*context)
+static int mcast_rdma_event_fn (int events,  int suck,  void *context)
 {
 	struct totemiba_instance *instance = (struct totemiba_instance *)context;
 	struct rdma_cm_event *event;
@@ -581,7 +581,7 @@ static int recv_token_cq_send_event_fn (hdb_handle_t poll_handle,  int
events,
 	return (0);
 }
 
-static int recv_token_cq_recv_event_fn (hdb_handle_t poll_handle,  int events,  int suck,
 void *context)
+static int recv_token_cq_recv_event_fn (int events,  int suck,  void *context)
 {
 	struct totemiba_instance *instance = (struct totemiba_instance *)context;
 	struct ibv_wc wc[32];
@@ -627,11 +627,11 @@ static int recv_token_accept_destroy (struct totemiba_instance
*instance)
 
 	rdma_destroy_id (instance->recv_token_cma_id);
 
-	poll_dispatch_delete (
+	qb_loop_poll_del (
 		instance->totemiba_poll_handle,
 		instance->recv_token_recv_completion_channel->fd);
 
-	poll_dispatch_delete (
+	qb_loop_poll_del (
 		instance->totemiba_poll_handle,
 		instance->recv_token_send_completion_channel->fd);
 
@@ -716,13 +716,15 @@ static int recv_token_accept_setup (struct totemiba_instance
*instance)
 	
 	recv_token_recv_buf_post_initial (instance);
 
-	poll_dispatch_add (
+	qb_loop_poll_add (
 		instance->totemiba_poll_handle,
+		QB_LOOP_MED,
 		instance->recv_token_recv_completion_channel->fd,
 		POLLIN, instance, recv_token_cq_recv_event_fn);
 
-	poll_dispatch_add (
+	qb_loop_poll_add (
 		instance->totemiba_poll_handle,
+		QB_LOOP_MED,
 		instance->recv_token_send_completion_channel->fd,
 		POLLIN, instance, recv_token_cq_send_event_fn);
 
@@ -731,7 +733,7 @@ static int recv_token_accept_setup (struct totemiba_instance
*instance)
 	return (res);
 };
 
-static int recv_token_rdma_event_fn (hdb_handle_t poll_handle,  int events,  int suck, 
void *context)
+static int recv_token_rdma_event_fn (int events,  int suck,  void *context)
 {
 	struct totemiba_instance *instance = (struct totemiba_instance *)context;
 	struct rdma_cm_event *event;
@@ -763,7 +765,7 @@ static int recv_token_rdma_event_fn (hdb_handle_t poll_handle,  int
events,  int
 	return (0);
 }
 
-static int send_token_cq_send_event_fn (hdb_handle_t poll_handle,  int events,  int suck,
 void *context)
+static int send_token_cq_send_event_fn (int events,  int suck,  void *context)
 {
 	struct totemiba_instance *instance = (struct totemiba_instance *)context;
 	struct ibv_wc wc[32];
@@ -786,7 +788,7 @@ static int send_token_cq_send_event_fn (hdb_handle_t poll_handle,  int
events,
 	return (0);
 }
 
-static int send_token_cq_recv_event_fn (hdb_handle_t poll_handle,  int events,  int suck,
 void *context)
+static int send_token_cq_recv_event_fn (int events,  int suck,  void *context)
 {
 	struct totemiba_instance *instance = (struct totemiba_instance *)context;
 	struct ibv_wc wc[32];
@@ -809,7 +811,7 @@ static int send_token_cq_recv_event_fn (hdb_handle_t poll_handle,  int
events,
 	return (0);
 }
 
-static int send_token_rdma_event_fn (hdb_handle_t poll_handle,  int events,  int suck, 
void *context)
+static int send_token_rdma_event_fn (int events,  int suck,  void *context)
 {
 	struct totemiba_instance *instance = (struct totemiba_instance *)context;
 	struct rdma_cm_event *event;
@@ -980,18 +982,21 @@ static int send_token_bind (struct totemiba_instance *instance)
 		return (-1);
 	}
 	
-	poll_dispatch_add (
+	qb_loop_poll_add (
 		instance->totemiba_poll_handle,
+		QB_LOOP_MED,
 		instance->send_token_recv_completion_channel->fd,
 		POLLIN, instance, send_token_cq_recv_event_fn);
 
-	poll_dispatch_add (
+	qb_loop_poll_add (
 		instance->totemiba_poll_handle,
+		QB_LOOP_MED,
 		instance->send_token_send_completion_channel->fd,
 		POLLIN, instance, send_token_cq_send_event_fn);
 
-	poll_dispatch_add (
+	qb_loop_poll_add (
 		instance->totemiba_poll_handle,
+		QB_LOOP_MED,
 		instance->send_token_channel->fd,
 		POLLIN, instance, send_token_rdma_event_fn);
 
@@ -1005,13 +1010,13 @@ static int send_token_unbind (struct totemiba_instance *instance)
 		return (0);
 	}
 
-	poll_dispatch_delete (
+	qb_loop_poll_del (
 		instance->totemiba_poll_handle,
 		instance->send_token_recv_completion_channel->fd);
-	poll_dispatch_delete (
+	qb_loop_poll_del (
 		instance->totemiba_poll_handle,
 		instance->send_token_send_completion_channel->fd);
-	poll_dispatch_delete (
+	qb_loop_poll_del (
 		instance->totemiba_poll_handle,
 		instance->send_token_channel->fd);
 
@@ -1060,8 +1065,9 @@ static int recv_token_bind (struct totemiba_instance *instance)
 		return (-1);
 	}
 
-	poll_dispatch_add (
+	qb_loop_poll_add (
 		instance->totemiba_poll_handle,
+		QB_LOOP_MED,
 		instance->listen_recv_token_channel->fd,
 		POLLIN, instance, recv_token_rdma_event_fn);
 
@@ -1174,18 +1180,21 @@ static int mcast_bind (struct totemiba_instance *instance)
 	
 	mcast_recv_buf_post_initial (instance);
 
-	poll_dispatch_add (
+	qb_loop_poll_add (
 		instance->totemiba_poll_handle,
+		QB_LOOP_MED,
 		instance->mcast_recv_completion_channel->fd,
 		POLLIN, instance, mcast_cq_recv_event_fn);
 
-	poll_dispatch_add (
+	qb_loop_poll_add (
 		instance->totemiba_poll_handle,
+		QB_LOOP_MED,
 		instance->mcast_send_completion_channel->fd,
 		POLLIN, instance, mcast_cq_send_event_fn);
 
-	poll_dispatch_add (
+	qb_loop_poll_add (
 		instance->totemiba_poll_handle,
+		QB_LOOP_MED,
 		instance->mcast_channel->fd,
 		POLLIN, instance, mcast_rdma_event_fn);
 
@@ -1262,7 +1271,7 @@ int totemiba_finalize (
  * Create an instance
  */
 int totemiba_initialize (
-	hdb_handle_t poll_handle,
+	qb_loop_t *qb_poll_handle,
 	void **iba_context,
 	struct totem_config *totem_config,
 	int interface_no,
@@ -1292,7 +1301,7 @@ int totemiba_initialize (
 
 	instance->totem_interface = &totem_config->interfaces[interface_no];
 
-	instance->totemiba_poll_handle = poll_handle;
+	instance->totemiba_poll_handle = qb_poll_handle;
 
 	instance->totemiba_deliver_fn = deliver_fn;
 
@@ -1304,7 +1313,8 @@ int totemiba_initialize (
 
 	instance->rrp_context = context;
 
-	poll_timer_add (instance->totemiba_poll_handle,
+	qb_loop_timer_add (instance->totemiba_poll_handle,
+		QB_LOOP_MED,
 		100,
 		(void *)instance,
 		timer_function_netif_check_timeout,
diff --git a/exec/totemiba.h b/exec/totemiba.h
index 4b2fbbf..eb31bc6 100644
--- a/exec/totemiba.h
+++ b/exec/totemiba.h
@@ -37,6 +37,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <corosync/hdb.h>
+#include <qb/qbloop.h>
 
 #include <corosync/totem/totem.h>
 
@@ -44,7 +45,7 @@
  * Create an instance
  */
 extern int totemiba_initialize (
-	hdb_handle_t poll_handle,
+	qb_loop_t* qb_poll_handle,
 	void **iba_handle,
 	struct totem_config *totem_config,
 	int interface_no,
diff --git a/exec/totemmrp.c b/exec/totemmrp.c
index dceb44a..5802fa3 100644
--- a/exec/totemmrp.c
+++ b/exec/totemmrp.c
@@ -56,7 +56,7 @@
 #include <sys/poll.h>
 
 #include <corosync/totem/totem.h>
-#include <corosync/totem/coropoll.h>
+#include <qb/qbloop.h>
 
 #include "totemmrp.h"
 #include "totemsrp.h"
@@ -116,7 +116,7 @@ void totemmrp_confchg_fn (
  * Initialize the totem multiple ring protocol
  */
 int totemmrp_initialize (
-	hdb_handle_t poll_handle,
+	qb_loop_t *poll_handle,
 	struct totem_config *totem_config,
 	totempg_stats_t *stats,
 
diff --git a/exec/totemmrp.h b/exec/totemmrp.h
index f9b1911..10bb63d 100644
--- a/exec/totemmrp.h
+++ b/exec/totemmrp.h
@@ -56,7 +56,7 @@ extern void totemmrp_log_printf_init (
  * Initialize the group messaging interface
  */
 extern int totemmrp_initialize (
-	hdb_handle_t poll_handle,
+	qb_loop_t *poll_handle,
 	struct totem_config *totem_config,
 	totempg_stats_t *stats,
 
diff --git a/exec/totemnet.c b/exec/totemnet.c
index 5853e66..09183e4 100644
--- a/exec/totemnet.c
+++ b/exec/totemnet.c
@@ -40,6 +40,7 @@
 #endif
 #include <totemudp.h>
 #include <totemnet.h>
+#include <qb/qbloop.h>
 
 #define LOGSYS_UTILS_ONLY 1
 #include <corosync/engine/logsys.h>
@@ -48,7 +49,7 @@ struct transport {
 	const char *name;
 	
 	int (*initialize) (
-		hdb_handle_t poll_handle,
+		qb_loop_t *loop_pt,
 		void **transport_instance,
 		struct totem_config *totem_config,
 		int interface_no,
@@ -230,7 +231,7 @@ int totemnet_finalize (
 }
 
 int totemnet_initialize (
-	hdb_handle_t poll_handle,
+	qb_loop_t *loop_pt,
 	void **net_context,
 	struct totem_config *totem_config,
 	int interface_no,
@@ -257,7 +258,7 @@ int totemnet_initialize (
 	}
 	totemnet_instance_initialize (instance, totem_config);
 
-	res = instance->transport->initialize (poll_handle,
+	res = instance->transport->initialize (loop_pt,
 		&instance->transport_context, totem_config,
 		interface_no, context, deliver_fn, iface_change_fn, target_set_completed);
 
diff --git a/exec/totemnet.h b/exec/totemnet.h
index 96f063d..91753d6 100644
--- a/exec/totemnet.h
+++ b/exec/totemnet.h
@@ -51,7 +51,7 @@
  * Create an instance
  */
 extern int totemnet_initialize (
-	hdb_handle_t poll_handle,
+	qb_loop_t *poll_handle,
 	void **net_context,
 	struct totem_config *totem_config,
 	int interface_no,
diff --git a/exec/totempg.c b/exec/totempg.c
index 10effc8..5025f24 100644
--- a/exec/totempg.c
+++ b/exec/totempg.c
@@ -100,7 +100,8 @@
 #include <corosync/swab.h>
 #include <corosync/hdb.h>
 #include <corosync/list.h>
-#include <corosync/totem/coropoll.h>
+#include <qb/qbloop.h>
+#include <qb/qbipcs.h>
 #include <corosync/totem/totempg.h>
 #define LOGSYS_UTILS_ONLY 1
 #include <corosync/engine/logsys.h>
@@ -704,7 +705,7 @@ int callback_token_received_fn (enum totem_callback_token_type type,
  * Initialize the totem process group abstraction
  */
 int totempg_initialize (
-	hdb_handle_t poll_handle,
+	qb_loop_t *poll_handle,
 	struct totem_config *totem_config)
 {
 	int res;
diff --git a/exec/totemrrp.c b/exec/totemrrp.c
index 0b80351..38c2865 100644
--- a/exec/totemrrp.c
+++ b/exec/totemrrp.c
@@ -62,7 +62,7 @@
 #include <corosync/list.h>
 #include <corosync/hdb.h>
 #include <corosync/swab.h>
-#include <corosync/totem/coropoll.h>
+#include <qb/qbloop.h>
 #define LOGSYS_UTILS_ONLY 1
 #include <corosync/engine/logsys.h>
 
@@ -86,8 +86,8 @@ struct passive_instance {
 	unsigned int *mcast_recv_count;
 	unsigned char token[15000];
 	unsigned int token_len;
-        poll_timer_handle timer_expired_token;
-        poll_timer_handle timer_problem_decrementer;
+        qb_loop_timer_handle timer_expired_token;
+        qb_loop_timer_handle timer_problem_decrementer;
 	void *totemrrp_context;
 	unsigned int token_xmit_iface;
 	unsigned int msg_xmit_iface;
@@ -101,8 +101,8 @@ struct active_instance {
 	unsigned char token[15000];
 	unsigned int token_len;
 	unsigned int last_token_seq;
-        poll_timer_handle timer_expired_token;
-        poll_timer_handle timer_problem_decrementer;
+        qb_loop_timer_handle timer_expired_token;
+        qb_loop_timer_handle timer_problem_decrementer;
 	void *totemrrp_context;
 };
 
@@ -169,7 +169,7 @@ struct rrp_algo {
 };
 
 struct totemrrp_instance {
-	hdb_handle_t poll_handle;
+	qb_loop_t *poll_handle;
 
 	struct totem_interface *interfaces;
 
@@ -668,8 +668,9 @@ static void timer_function_passive_problem_decrementer (void
*context)
 static void passive_timer_expired_token_start (
 	struct passive_instance *passive_instance)
 {
-        poll_timer_add (
+        qb_loop_timer_add (
 		passive_instance->rrp_instance->poll_handle,
+		QB_LOOP_MED,
 		passive_instance->rrp_instance->totem_config->rrp_token_expired_timeout,
 		(void *)passive_instance,
 		timer_function_passive_token_expired,
@@ -679,7 +680,7 @@ static void passive_timer_expired_token_start (
 static void passive_timer_expired_token_cancel (
 	struct passive_instance *passive_instance)
 {
-        poll_timer_delete (
+        qb_loop_timer_del (
 		passive_instance->rrp_instance->poll_handle,
 		passive_instance->timer_expired_token);
 }
@@ -688,7 +689,8 @@ static void passive_timer_expired_token_cancel (
 static void passive_timer_problem_decrementer_start (
 	struct passive_instance *passive_instance)
 {
-        poll_timer_add (
+        qb_loop_timer_add (
+		QB_LOOP_MED,
 		passive_instance->rrp_instance->poll_handle,
 		passive_instance->rrp_instance->totem_config->rrp_problem_count_timeout,
 		(void *)passive_instance,
@@ -699,7 +701,7 @@ static void passive_timer_problem_decrementer_start (
 static void passive_timer_problem_decrementer_cancel (
 	struct passive_instance *passive_instance)
 {
-        poll_timer_delete (
+        qb_loop_timer_del (
 		passive_instance->rrp_instance->poll_handle,
 		passive_instance->timer_problem_decrementer);
 }
@@ -1096,8 +1098,9 @@ static void timer_function_active_token_expired (void *context)
 static void active_timer_expired_token_start (
 	struct active_instance *active_instance)
 {
-        poll_timer_add (
+        qb_loop_timer_add (
 		active_instance->rrp_instance->poll_handle,
+		QB_LOOP_MED,
 		active_instance->rrp_instance->totem_config->rrp_token_expired_timeout,
 		(void *)active_instance,
 		timer_function_active_token_expired,
@@ -1107,7 +1110,7 @@ static void active_timer_expired_token_start (
 static void active_timer_expired_token_cancel (
 	struct active_instance *active_instance)
 {
-        poll_timer_delete (
+        qb_loop_timer_del (
 		active_instance->rrp_instance->poll_handle,
 		active_instance->timer_expired_token);
 }
@@ -1115,8 +1118,9 @@ static void active_timer_expired_token_cancel (
 static void active_timer_problem_decrementer_start (
 	struct active_instance *active_instance)
 {
-        poll_timer_add (
+        qb_loop_timer_add (
 		active_instance->rrp_instance->poll_handle,
+		QB_LOOP_MED,
 		active_instance->rrp_instance->totem_config->rrp_problem_count_timeout,
 		(void *)active_instance,
 		timer_function_active_problem_decrementer,
@@ -1126,7 +1130,7 @@ static void active_timer_problem_decrementer_start (
 static void active_timer_problem_decrementer_cancel (
 	struct active_instance *active_instance)
 {
-        poll_timer_delete (
+        qb_loop_timer_del (
 		active_instance->rrp_instance->poll_handle,
 		active_instance->timer_problem_decrementer);
 }
@@ -1451,7 +1455,7 @@ static void rrp_target_set_completed (void *context)
  * Create an instance
  */
 int totemrrp_initialize (
-	hdb_handle_t poll_handle,
+	qb_loop_t *poll_handle,
 	void **rrp_context,
 	struct totem_config *totem_config,
 	void *context,
diff --git a/exec/totemrrp.h b/exec/totemrrp.h
index 5fa0a0f..02c366a 100644
--- a/exec/totemrrp.h
+++ b/exec/totemrrp.h
@@ -37,7 +37,7 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-
+#include <qb/qbloop.h>
 #include <corosync/totem/totem.h>
 
 #define TOTEMRRP_NOFLUSH	0
@@ -52,7 +52,7 @@
  * Create an instance
  */
 extern int totemrrp_initialize (
-	hdb_handle_t poll_handle,
+	qb_loop_t *poll_handle,
 	void **rrp_context,
 	struct totem_config *totem_config,
 	void *context,
diff --git a/exec/totemsrp.c b/exec/totemsrp.c
index 9d15ade..917d3ed 100644
--- a/exec/totemsrp.c
+++ b/exec/totemsrp.c
@@ -79,7 +79,7 @@
 #include <corosync/sq.h>
 #include <corosync/list.h>
 #include <corosync/hdb.h>
-#include <corosync/totem/coropoll.h>
+#include <qb/qbloop.h>
 #define LOGSYS_UTILS_ONLY 1
 #include <corosync/engine/logsys.h>
 
@@ -402,23 +402,23 @@ struct totemsrp_instance {
 	/*
 	 * Timers
 	 */
-	poll_timer_handle timer_pause_timeout;
+	qb_loop_timer_handle timer_pause_timeout;
 
-	poll_timer_handle timer_orf_token_timeout;
+	qb_loop_timer_handle timer_orf_token_timeout;
 
-	poll_timer_handle timer_orf_token_retransmit_timeout;
+	qb_loop_timer_handle timer_orf_token_retransmit_timeout;
 
-	poll_timer_handle timer_orf_token_hold_retransmit_timeout;
+	qb_loop_timer_handle timer_orf_token_hold_retransmit_timeout;
 
-	poll_timer_handle timer_merge_detect_timeout;
+	qb_loop_timer_handle timer_merge_detect_timeout;
 
-	poll_timer_handle memb_timer_state_gather_join_timeout;
+	qb_loop_timer_handle memb_timer_state_gather_join_timeout;
 
-	poll_timer_handle memb_timer_state_gather_consensus_timeout;
+	qb_loop_timer_handle memb_timer_state_gather_consensus_timeout;
 
-	poll_timer_handle memb_timer_state_commit_timeout;
+	qb_loop_timer_handle memb_timer_state_commit_timeout;
 
-	poll_timer_handle timer_heartbeat_timeout;
+	qb_loop_timer_handle timer_heartbeat_timeout;
 
 	/*
 	 * Function and data used to log messages
@@ -446,7 +446,7 @@ struct totemsrp_instance {
 
 //TODO	struct srp_addr next_memb;
 
-	hdb_handle_t totemsrp_poll_handle;
+	qb_loop_t *totemsrp_poll_handle;
 
 	struct totem_ip_address mcast_address;
 
@@ -749,7 +749,7 @@ static int token_event_stats_collector (enum totem_callback_token_type
type, con
  * Exported interfaces
  */
 int totemsrp_initialize (
-	hdb_handle_t poll_handle,
+	qb_loop_t *poll_handle,
 	void **srp_context,
 	struct totem_config *totem_config,
 	totemmrp_stats_t *stats,
@@ -1355,9 +1355,10 @@ static void memb_set_print (
 
 static void reset_token_retransmit_timeout (struct totemsrp_instance *instance)
 {
-	poll_timer_delete (instance->totemsrp_poll_handle,
+	qb_loop_timer_del (instance->totemsrp_poll_handle,
 		instance->timer_orf_token_retransmit_timeout);
-	poll_timer_add (instance->totemsrp_poll_handle,
+	qb_loop_timer_add (instance->totemsrp_poll_handle,
+		QB_LOOP_MED,
 		instance->totem_config->token_retransmit_timeout,
 		(void *)instance,
 		timer_function_token_retransmit_timeout,
@@ -1368,7 +1369,8 @@ static void reset_token_retransmit_timeout (struct totemsrp_instance
*instance)
 static void start_merge_detect_timeout (struct totemsrp_instance *instance)
 {
 	if (instance->my_merge_detect_timeout_outstanding == 0) {
-		poll_timer_add (instance->totemsrp_poll_handle,
+		qb_loop_timer_add (instance->totemsrp_poll_handle,
+			QB_LOOP_MED,
 			instance->totem_config->merge_timeout,
 			(void *)instance,
 			timer_function_merge_detect_timeout,
@@ -1380,7 +1382,7 @@ static void start_merge_detect_timeout (struct totemsrp_instance
*instance)
 
 static void cancel_merge_detect_timeout (struct totemsrp_instance *instance)
 {
-	poll_timer_delete (instance->totemsrp_poll_handle,
instance->timer_merge_detect_timeout);
+	qb_loop_timer_del (instance->totemsrp_poll_handle,
instance->timer_merge_detect_timeout);
 	instance->my_merge_detect_timeout_outstanding = 0;
 }
 
@@ -1425,8 +1427,9 @@ static void old_ring_state_reset (struct totemsrp_instance
*instance)
 
 static void reset_pause_timeout (struct totemsrp_instance *instance)
 {
-	poll_timer_delete (instance->totemsrp_poll_handle,
instance->timer_pause_timeout);
-	poll_timer_add (instance->totemsrp_poll_handle,
+	qb_loop_timer_del (instance->totemsrp_poll_handle,
instance->timer_pause_timeout);
+	qb_loop_timer_add (instance->totemsrp_poll_handle,
+		QB_LOOP_MED,
 		instance->totem_config->token_timeout / 5,
 		(void *)instance,
 		timer_function_pause_timeout,
@@ -1434,8 +1437,9 @@ static void reset_pause_timeout (struct totemsrp_instance
*instance)
 }
 
 static void reset_token_timeout (struct totemsrp_instance *instance) {
-	poll_timer_delete (instance->totemsrp_poll_handle,
instance->timer_orf_token_timeout);
-	poll_timer_add (instance->totemsrp_poll_handle,
+	qb_loop_timer_del (instance->totemsrp_poll_handle,
instance->timer_orf_token_timeout);
+	qb_loop_timer_add (instance->totemsrp_poll_handle,
+		QB_LOOP_MED,
 		instance->totem_config->token_timeout,
 		(void *)instance,
 		timer_function_orf_token_timeout,
@@ -1443,8 +1447,9 @@ static void reset_token_timeout (struct totemsrp_instance *instance)
{
 }
 
 static void reset_heartbeat_timeout (struct totemsrp_instance *instance) {
-        poll_timer_delete (instance->totemsrp_poll_handle,
instance->timer_heartbeat_timeout);
-        poll_timer_add (instance->totemsrp_poll_handle,
+        qb_loop_timer_del (instance->totemsrp_poll_handle,
instance->timer_heartbeat_timeout);
+        qb_loop_timer_add (instance->totemsrp_poll_handle,
+		QB_LOOP_MED,
                 instance->heartbeat_timeout,
                 (void *)instance,
                 timer_function_heartbeat_timeout,
@@ -1453,21 +1458,22 @@ static void reset_heartbeat_timeout (struct totemsrp_instance
*instance) {
 
 
 static void cancel_token_timeout (struct totemsrp_instance *instance) {
-	poll_timer_delete (instance->totemsrp_poll_handle,
instance->timer_orf_token_timeout);
+	qb_loop_timer_del (instance->totemsrp_poll_handle,
instance->timer_orf_token_timeout);
 }
 
 static void cancel_heartbeat_timeout (struct totemsrp_instance *instance) {
-	poll_timer_delete (instance->totemsrp_poll_handle,
instance->timer_heartbeat_timeout);
+	qb_loop_timer_del (instance->totemsrp_poll_handle,
instance->timer_heartbeat_timeout);
 }
 
 static void cancel_token_retransmit_timeout (struct totemsrp_instance *instance)
 {
-	poll_timer_delete (instance->totemsrp_poll_handle,
instance->timer_orf_token_retransmit_timeout);
+	qb_loop_timer_del (instance->totemsrp_poll_handle,
instance->timer_orf_token_retransmit_timeout);
 }
 
 static void start_token_hold_retransmit_timeout (struct totemsrp_instance *instance)
 {
-	poll_timer_add (instance->totemsrp_poll_handle,
+	qb_loop_timer_add (instance->totemsrp_poll_handle,
+		QB_LOOP_MED,
 		instance->totem_config->token_hold_timeout,
 		(void *)instance,
 		timer_function_token_hold_retransmit_timeout,
@@ -1476,7 +1482,7 @@ static void start_token_hold_retransmit_timeout (struct
totemsrp_instance *insta
 
 static void cancel_token_hold_retransmit_timeout (struct totemsrp_instance *instance)
 {
-	poll_timer_delete (instance->totemsrp_poll_handle,
+	qb_loop_timer_del (instance->totemsrp_poll_handle,
 		instance->timer_orf_token_hold_retransmit_timeout);
 }
 
@@ -1586,9 +1592,10 @@ static void memb_timer_function_state_gather (void *data)
 		/*
 		 * Restart the join timeout
 		`*/
-		poll_timer_delete (instance->totemsrp_poll_handle,
instance->memb_timer_state_gather_join_timeout);
+		qb_loop_timer_del (instance->totemsrp_poll_handle,
instance->memb_timer_state_gather_join_timeout);
 
-		poll_timer_add (instance->totemsrp_poll_handle,
+		qb_loop_timer_add (instance->totemsrp_poll_handle,
+			QB_LOOP_MED,
 			instance->totem_config->join_timeout,
 			(void *)instance,
 			memb_timer_function_state_gather,
@@ -1817,9 +1824,10 @@ static void memb_state_gather_enter (
 	/*
 	 * Restart the join timeout
 	 */
-	poll_timer_delete (instance->totemsrp_poll_handle,
instance->memb_timer_state_gather_join_timeout);
+	qb_loop_timer_del (instance->totemsrp_poll_handle,
instance->memb_timer_state_gather_join_timeout);
 
-	poll_timer_add (instance->totemsrp_poll_handle,
+	qb_loop_timer_add (instance->totemsrp_poll_handle,
+		QB_LOOP_MED,
 		instance->totem_config->join_timeout,
 		(void *)instance,
 		memb_timer_function_state_gather,
@@ -1828,10 +1836,11 @@ static void memb_state_gather_enter (
 	/*
 	 * Restart the consensus timeout
 	 */
-	poll_timer_delete (instance->totemsrp_poll_handle,
+	qb_loop_timer_del (instance->totemsrp_poll_handle,
 		instance->memb_timer_state_gather_consensus_timeout);
 
-	poll_timer_add (instance->totemsrp_poll_handle,
+	qb_loop_timer_add (instance->totemsrp_poll_handle,
+		QB_LOOP_MED,
 		instance->totem_config->consensus_timeout,
 		(void *)instance,
 		memb_timer_function_gather_consensus_timeout,
@@ -1877,11 +1886,11 @@ static void memb_state_commit_enter (
 
 	memb_state_commit_token_target_set (instance);
 
-	poll_timer_delete (instance->totemsrp_poll_handle,
instance->memb_timer_state_gather_join_timeout);
+	qb_loop_timer_del (instance->totemsrp_poll_handle,
instance->memb_timer_state_gather_join_timeout);
 
 	instance->memb_timer_state_gather_join_timeout = 0;
 
-	poll_timer_delete (instance->totemsrp_poll_handle,
instance->memb_timer_state_gather_consensus_timeout);
+	qb_loop_timer_del (instance->totemsrp_poll_handle,
instance->memb_timer_state_gather_consensus_timeout);
 
 	instance->memb_timer_state_gather_consensus_timeout = 0;
 
diff --git a/exec/totemsrp.h b/exec/totemsrp.h
index 37ef588..ae8ed71 100644
--- a/exec/totemsrp.h
+++ b/exec/totemsrp.h
@@ -36,7 +36,7 @@
 #define TOTEMSRP_H_DEFINED
 
 #include <corosync/totem/totem.h>
-#include <corosync/totem/coropoll.h>
+#include <qb/qbloop.h>
 
 /*
  * Totem Single Ring Protocol
@@ -47,7 +47,7 @@
  * Create a protocol instance
  */
 int totemsrp_initialize (
-	hdb_handle_t poll_handle,
+	qb_loop_t *poll_handle,
 	void **srp_context,
 	struct totem_config *totem_config,
 	totemmrp_stats_t *stats,
diff --git a/exec/totemudp.c b/exec/totemudp.c
index 23d7efb..fc1886f 100644
--- a/exec/totemudp.c
+++ b/exec/totemudp.c
@@ -62,7 +62,7 @@
 #include <corosync/list.h>
 #include <corosync/hdb.h>
 #include <corosync/swab.h>
-#include <corosync/totem/coropoll.h>
+#include <qb/qbloop.h>
 #define LOGSYS_UTILS_ONLY 1
 #include <corosync/engine/logsys.h>
 #include "totemudp.h"
@@ -121,7 +121,7 @@ struct totemudp_instance {
 
 	unsigned int totemudp_private_key_len;
 
-	hdb_handle_t totemudp_poll_handle;
+	qb_loop_t *totemudp_poll_handle;
 
 	struct totem_interface *totem_interface;
 
@@ -197,7 +197,7 @@ struct totemudp_instance {
 
 	int firstrun;
 
-	poll_timer_handle timer_netif_check_timeout;
+	qb_loop_timer_handle timer_netif_check_timeout;
 
 	unsigned int my_memb_entries;
 
@@ -1143,7 +1143,7 @@ int totemudp_finalize (
 
 	if (instance->totemudp_sockets.mcast_recv > 0) {
 		close (instance->totemudp_sockets.mcast_recv);
-	 	poll_dispatch_delete (instance->totemudp_poll_handle,
+	 	qb_loop_poll_del (instance->totemudp_poll_handle,
 			instance->totemudp_sockets.mcast_recv);
 	}
 	if (instance->totemudp_sockets.mcast_send > 0) {
@@ -1151,7 +1151,7 @@ int totemudp_finalize (
 	}
 	if (instance->totemudp_sockets.token > 0) {
 		close (instance->totemudp_sockets.token);
-		poll_dispatch_delete (instance->totemudp_poll_handle,
+		qb_loop_poll_del (instance->totemudp_poll_handle,
 			instance->totemudp_sockets.token);
 	}
 
@@ -1163,7 +1163,6 @@ int totemudp_finalize (
  */
 
 static int net_deliver_fn (
-	hdb_handle_t handle,
 	int fd,
 	int revents,
 	void *data)
@@ -1299,7 +1298,8 @@ static void timer_function_netif_check_timeout (
 		instance->netif_bind_state == BIND_STATE_REGULAR &&
 		interface_up == 1)) {
 
-		poll_timer_add (instance->totemudp_poll_handle,
+		qb_loop_timer_add (instance->totemudp_poll_handle,
+			QB_LOOP_MED,
 			instance->totem_config->downcheck_timeout,
 			(void *)instance,
 			timer_function_netif_check_timeout,
@@ -1313,7 +1313,7 @@ static void timer_function_netif_check_timeout (
 
 	if (instance->totemudp_sockets.mcast_recv > 0) {
 		close (instance->totemudp_sockets.mcast_recv);
-	 	poll_dispatch_delete (instance->totemudp_poll_handle,
+	 	qb_loop_poll_del (instance->totemudp_poll_handle,
 			instance->totemudp_sockets.mcast_recv);
 	}
 	if (instance->totemudp_sockets.mcast_send > 0) {
@@ -1321,7 +1321,7 @@ static void timer_function_netif_check_timeout (
 	}
 	if (instance->totemudp_sockets.token > 0) {
 		close (instance->totemudp_sockets.token);
-		poll_dispatch_delete (instance->totemudp_poll_handle,
+		qb_loop_poll_del (instance->totemudp_poll_handle,
 			instance->totemudp_sockets.token);
 	}
 
@@ -1335,7 +1335,8 @@ static void timer_function_netif_check_timeout (
 		/*
 		 * Add a timer to retry building interfaces and request memb_gather_enter
 		 */
-		poll_timer_add (instance->totemudp_poll_handle,
+		qb_loop_timer_add (instance->totemudp_poll_handle,
+			QB_LOOP_MED,
 			instance->totem_config->downcheck_timeout,
 			(void *)instance,
 			timer_function_netif_check_timeout,
@@ -1356,13 +1357,15 @@ static void timer_function_netif_check_timeout (
 		&instance->totemudp_sockets,
 		&instance->totem_interface->boundto);
 
-	poll_dispatch_add (
+	qb_loop_poll_add (
 		instance->totemudp_poll_handle,
+		QB_LOOP_MED,
 		instance->totemudp_sockets.mcast_recv,
 		POLLIN, instance, net_deliver_fn);
 
-	poll_dispatch_add (
+	qb_loop_poll_add (
 		instance->totemudp_poll_handle,
+		QB_LOOP_MED,
 		instance->totemudp_sockets.token,
 		POLLIN, instance, net_deliver_fn);
 
@@ -1383,7 +1386,8 @@ static void timer_function_netif_check_timeout (
 		 * Add a timer to check for interface going down in single membership
 		 */
 		if (instance->my_memb_entries == 1) {
-			poll_timer_add (instance->totemudp_poll_handle,
+			qb_loop_timer_add (instance->totemudp_poll_handle,
+				QB_LOOP_MED,
 				instance->totem_config->downcheck_timeout,
 				(void *)instance,
 				timer_function_netif_check_timeout,
@@ -1730,7 +1734,7 @@ static int totemudp_build_sockets (
  * Create an instance
  */
 int totemudp_initialize (
-	hdb_handle_t poll_handle,
+	qb_loop_t *poll_handle,
 	void **udp_context,
 	struct totem_config *totem_config,
 	int interface_no,
@@ -1817,7 +1821,8 @@ int totemudp_initialize (
 	 * RRP layer isn't ready to receive message because it hasn't
 	 * initialized yet.  Add short timer to check the interfaces.
 	 */
-	poll_timer_add (instance->totemudp_poll_handle,
+	qb_loop_timer_add (instance->totemudp_poll_handle,
+		QB_LOOP_MED,
 		100,
 		(void *)instance,
 		timer_function_netif_check_timeout,
@@ -1835,10 +1840,11 @@ int totemudp_processor_count_set (
 	int res = 0;
 
 	instance->my_memb_entries = processor_count;
-	poll_timer_delete (instance->totemudp_poll_handle,
+	qb_loop_timer_del (instance->totemudp_poll_handle,
 		instance->timer_netif_check_timeout);
 	if (processor_count == 1) {
-		poll_timer_add (instance->totemudp_poll_handle,
+		qb_loop_timer_add (instance->totemudp_poll_handle,
+			QB_LOOP_MED,
 			instance->totem_config->downcheck_timeout,
 			(void *)instance,
 			timer_function_netif_check_timeout,
@@ -1862,7 +1868,7 @@ int totemudp_recv_flush (void *udp_context)
 		ufd.events = POLLIN;
 		nfds = poll (&ufd, 1, 0);
 		if (nfds == 1 && ufd.revents & POLLIN) {
-		net_deliver_fn (0, instance->totemudp_sockets.mcast_recv,
+		net_deliver_fn (instance->totemudp_sockets.mcast_recv,
 			ufd.revents, instance);
 		}
 	} while (nfds == 1);
diff --git a/exec/totemudp.h b/exec/totemudp.h
index 6218794..99a8490 100644
--- a/exec/totemudp.h
+++ b/exec/totemudp.h
@@ -38,6 +38,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <corosync/hdb.h>
+#include <qb/qbloop.h>
 
 #include <corosync/totem/totem.h>
 
@@ -45,7 +46,7 @@
  * Create an instance
  */
 extern int totemudp_initialize (
-	hdb_handle_t poll_handle,
+	qb_loop_t* poll_handle,
 	void **udp_context,
 	struct totem_config *totem_config,
 	int interface_no,
diff --git a/include/Makefile.am b/include/Makefile.am
index 3f15cf5..732c3da 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -42,7 +42,7 @@ LCR_H			= lcr_ckpt.h lcr_comp.h	lcr_ifact.h
 
 ENGINE_H		= config.h coroapi.h logsys.h objdb.h quorum.h
 
-TOTEM_H			= coropoll.h totem.h totemip.h totempg.h
+TOTEM_H			= totem.h totemip.h totempg.h
 
 EXTRA_DIST 		= $(noinst_HEADERS)
 
diff --git a/include/corosync/coroipcs.h b/include/corosync/coroipcs.h
index 9f0dc1d..57645af 100644
--- a/include/corosync/coroipcs.h
+++ b/include/corosync/coroipcs.h
@@ -67,7 +67,7 @@ struct coroipcs_init_state {
 	void (*sending_allowed_release)(void *sending_allowed_private_data);
 	void (*poll_accept_add)(int fd);
 	void (*poll_dispatch_add)(int fd, void *context);
-	void (*poll_dispatch_modify)(int fd, int events);
+	void (*poll_dispatch_modify)(int fd, int events, void *context);
 	void (*poll_dispatch_destroy)(int fd, void *context);
 	void (*fatal_error)(const char *error_msg) __attribute__ ((noreturn));
 	coroipcs_init_fn_lvalue (*init_fn_get)(unsigned int service);
@@ -94,7 +94,7 @@ struct coroipcs_init_state_v2 {
 	void (*sending_allowed_release)(void *sending_allowed_private_data);
 	void (*poll_accept_add)(int fd);
 	void (*poll_dispatch_add)(int fd, void *context);
-	void (*poll_dispatch_modify)(int fd, int events);
+	void (*poll_dispatch_modify)(int fd, int events, void *context);
 	void (*poll_dispatch_destroy)(int fd, void *context);
 	void (*fatal_error)(const char *error_msg) __attribute__ ((noreturn));
 	coroipcs_init_fn_lvalue (*init_fn_get)(unsigned int service);
diff --git a/include/corosync/engine/coroapi.h b/include/corosync/engine/coroapi.h
index e6eae24..47962de 100644
--- a/include/corosync/engine/coroapi.h
+++ b/include/corosync/engine/coroapi.h
@@ -39,6 +39,7 @@
 #include <sys/uio.h>
 #endif
 #include <corosync/hdb.h>
+#include <qb/qbloop.h>
 #include <corosync/swab.h>
 
 typedef struct {
@@ -602,12 +603,7 @@ struct corosync_api_v1 {
 
 	void (*state_dump) (void);
 
-	/*
-	 * The use of this interface is highly discouraged.
-	 * Please avoid using any of coropoll apis in your service engines.
-	 */
-	hdb_handle_t (*poll_handle_get) (void);
-
+	qb_loop_t *(*poll_handle_get) (void);
 
 	int (*object_key_create_typed) (
 		hdb_handle_t object_handle,
diff --git a/include/corosync/totem/coropoll.h b/include/corosync/totem/coropoll.h
deleted file mode 100644
index 238160b..0000000
--- a/include/corosync/totem/coropoll.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2003-2004 MontaVista Software, Inc.
- *
- * All rights reserved.
- *
- * Author: Steven Dake (sdake(a)redhat.com)
- *
- * This software licensed under BSD license, the text of which follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * - Neither the name of the MontaVista Software, Inc. nor the names of its
- *   contributors may be used to endorse or promote products derived from this
- *   software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef POLL_H_DEFINED
-#define POLL_H_DEFINED
-
-#include <corosync/hdb.h>
-#include <pthread.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void (*poll_low_fds_event_fn) (int32_t not_enough, int32_t fds_available);
-
-typedef void * poll_timer_handle;
-
-hdb_handle_t poll_create (void);
-
-int poll_destroy (hdb_handle_t hdb_handle);
-
-int poll_dispatch_add (
-	hdb_handle_t handle,
-	int fd,
-	int events,
-	void *data,
-
-	int (*dispatch_fn) (hdb_handle_t handle,
-		int fd,
-		int revents,
-		void *data));
-
-int poll_dispatch_modify (
-	hdb_handle_t handle,
-	int fd,
-	int events,
-
-	int (*dispatch_fn) (hdb_handle_t hdb_handle_t,
-		int fd,
-		int revents,
-		void *data));
-
-
-int poll_dispatch_delete (
-	hdb_handle_t handle,
-	int fd);
-
-int poll_low_fds_event_set(
-	hdb_handle_t handle,
-	poll_low_fds_event_fn fn);
-
-int poll_timer_add (
-	hdb_handle_t handle,
-	int msec_in_future, void *data,
-	void (*timer_fn) (void *data),
-	poll_timer_handle *timer_handle_out);
-
-int poll_timer_delete (
-	hdb_handle_t handle,
-	poll_timer_handle timer_handle);
-
-int poll_run (
-	hdb_handle_t handle);
-
-int poll_stop (
-	hdb_handle_t handle);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* POLL_H_DEFINED */
diff --git a/include/corosync/totem/totempg.h b/include/corosync/totem/totempg.h
index fbf71fb..dab123e 100644
--- a/include/corosync/totem/totempg.h
+++ b/include/corosync/totem/totempg.h
@@ -42,8 +42,8 @@ extern "C" {
 
 #include <netinet/in.h>
 #include "totem.h"
-#include "coropoll.h"
 #include <corosync/hdb.h>
+#include <qb/qbloop.h>
 
 struct totempg_group {
 	const void *group;
@@ -62,7 +62,7 @@ struct totempg_group {
  * Initialize the totem process groups abstraction
  */
 extern int totempg_initialize (
-	hdb_handle_t poll_handle,
+	qb_loop_t* poll_handle,
 	struct totem_config *totem_config
 );
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 4f32dd9..b3462d6 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -38,41 +38,41 @@ noinst_PROGRAMS		= testevs evsbench evsverify cpgverify testcpg
testcpg2 cpgbenc
 			logsys_s logsys_t1 logsys_t2 testcpgzc cpgbenchzc testzcgc \
 			stress_cpgzc stress_cpgfdget stress_cpgcontext cpgbound testsam
 
-testevs_LDADD		= -levs -lcoroipcc
+testevs_LDADD		= -levs -lcoroipcc $(LIBQB_LIBS)
 testevs_LDFLAGS		= -L../lib
-testcpg_LDADD		= -lcpg -lcoroipcc
+testcpg_LDADD		= -lcpg -lcoroipcc $(LIBQB_LIBS)
 testcpg_LDFLAGS		= -L../lib
-testcpg2_LDADD		= -lcpg -lcoroipcc
+testcpg2_LDADD		= -lcpg -lcoroipcc $(LIBQB_LIBS)
 testcpg2_LDFLAGS	= -L../lib
-testcpgzc_LDADD		= -lcpg -lcoroipcc
+testcpgzc_LDADD		= -lcpg -lcoroipcc $(LIBQB_LIBS)
 testcpgzc_LDFLAGS	= -L../lib
-testzcgc_LDADD		= -lcpg -lcoroipcc
+testzcgc_LDADD		= -lcpg -lcoroipcc $(LIBQB_LIBS)
 testzcgc_LDFLAGS	= -L../lib
-stress_cpgzc_LDADD	= -lcpg -lcoroipcc
+stress_cpgzc_LDADD	= -lcpg -lcoroipcc $(LIBQB_LIBS)
 stress_cpgzc_LDFLAGS	= -L../lib
-stress_cpgfdget_LDADD	= -lcpg -lcoroipcc
+stress_cpgfdget_LDADD	= -lcpg -lcoroipcc $(LIBQB_LIBS)
 stress_cpgfdget_LDFLAGS	= -L../lib
-stress_cpgcontext_LDADD	= -lcpg -lcoroipcc
+stress_cpgcontext_LDADD	= -lcpg -lcoroipcc $(LIBQB_LIBS)
 stress_cpgcontext_LDFLAGS	= -L../lib
-testconfdb_LDADD	= -lconfdb ../lcr/liblcr.a -lcoroipcc
+testconfdb_LDADD	= -lconfdb ../lcr/liblcr.a -lcoroipcc $(LIBQB_LIBS)
 testconfdb_LDFLAGS	= -L../lib
-testquorum_LDADD	= -lquorum -lcoroipcc
+testquorum_LDADD	= -lquorum -lcoroipcc $(LIBQB_LIBS)
 testquorum_LDFLAGS	= -L../lib
-testvotequorum1_LDADD	= -lvotequorum -lcoroipcc
+testvotequorum1_LDADD	= -lvotequorum -lcoroipcc $(LIBQB_LIBS)
 testvotequorum1_LDFLAGS	= -L../lib
-testvotequorum2_LDADD	= -lvotequorum -lcoroipcc
+testvotequorum2_LDADD	= -lvotequorum -lcoroipcc $(LIBQB_LIBS)
 testvotequorum2_LDFLAGS	= -L../lib
-evsverify_LDADD		= -levs -ltotem_pg -lcoroipcc
+evsverify_LDADD		= -levs -ltotem_pg -lcoroipcc $(LIBQB_LIBS)
 evsverify_LDFLAGS	= -L../lib -L../exec
-cpgverify_LDADD		= -lcpg -ltotem_pg -lcoroipcc
+cpgverify_LDADD		= -lcpg -ltotem_pg -lcoroipcc $(LIBQB_LIBS)
 cpgverify_LDFLAGS	= -L../lib -L../exec
-cpgbound_LDADD		= -lcpg -lcoroipcc
+cpgbound_LDADD		= -lcpg -lcoroipcc $(LIBQB_LIBS)
 cpgbound_LDFLAGS	= -L../lib
-evsbench_LDADD		= -levs -lcoroipcc
+evsbench_LDADD		= -levs -lcoroipcc $(LIBQB_LIBS)
 evsbench_LDFLAGS	= -L../lib
-cpgbench_LDADD		= -lcpg -lcoroipcc
+cpgbench_LDADD		= -lcpg -lcoroipcc $(LIBQB_LIBS)
 cpgbench_LDFLAGS	= -L../lib
-cpgbenchzc_LDADD	= -lcpg -lcoroipcc
+cpgbenchzc_LDADD	= -lcpg -lcoroipcc $(LIBQB_LIBS)
 cpgbenchzc_LDFLAGS	= -L../lib
 logsysbench_LDADD	= -llogsys
 logsysbench_LDFLAGS	= -L../exec
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 3a52f4a..249be00 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -40,16 +40,16 @@ bin_SCRIPTS		= corosync-blackbox
 
 EXTRA_DIST		= $(bin_SCRIPTS)
 
-corosync_pload_LDADD	= -lpload -lcoroipcc
+corosync_pload_LDADD	= -lpload -lcoroipcc $(LIBQB_LIBS)
 corosync_pload_LDFLAGS	= -L../lib
-corosync_objctl_LDADD	= -lconfdb ../lcr/liblcr.a -lcoroipcc
+corosync_objctl_LDADD	= -lconfdb ../lcr/liblcr.a -lcoroipcc $(LIBQB_LIBS)
 corosync_objctl_LDFLAGS	= -L../lib
-corosync_cfgtool_LDADD	= -lcfg -lcoroipcc
+corosync_cfgtool_LDADD	= -lcfg -lcoroipcc $(LIBQB_LIBS)
 corosync_cfgtool_LDFLAGS= -L../lib
-corosync_cpgtool_LDADD	= -lcfg -lcpg -lcoroipcc
+corosync_cpgtool_LDADD	= -lcfg -lcpg -lcoroipcc $(LIBQB_LIBS)
 corosync_cpgtool_LDFLAGS= -L../lib
 corosync_quorumtool_LDADD = -lconfdb -lcfg -lquorum \
-			    -lvotequorum -lcoroipcc ../lcr/liblcr.a
+			    -lvotequorum -lcoroipcc ../lcr/liblcr.a $(LIBQB_LIBS)
 corosync_quorumtool_LDFLAGS = -L../lib
 
 lint:
-- 
1.7.3.1

[PATCH 3/7] libqb: make timer api a wrapper around qb_loop timers.

[Angus Salkeld]

Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com&gt;
---
 README.devmap         |    5 +-
 exec/Makefile.am      |    2 +-
 exec/apidef.c         |    7 +-
 exec/main.c           |    5 -
 exec/timer.c          |  266 +++++------------------------------------
 exec/timer.h          |   19 +--
 exec/tlist.h          |  318 -------------------------------------------------
 exec/totemconfig.c    |    2 +-
 exec/totemsrp.c       |   21 ++--
 lib/votequorum.c      |    1 +
 services/pload.c      |    7 +-
 services/votequorum.c |   14 +-
 12 files changed, 64 insertions(+), 603 deletions(-)
 delete mode 100644 exec/tlist.h

diff --git a/README.devmap b/README.devmap
index 2300c38..89e4caf 100644
--- a/README.devmap
+++ b/README.devmap
@@ -289,10 +289,7 @@ exec/sync.{c|h}
 	The synchronization service implementation.
 
 exec/timer.{c|h}
-	Threaded based timer service.
-
-exec/tlist.h
-	Timer list used to expire timers.
+	Threaded based timer service (deprecated - use qb_loop_timer).
 
 exec/totemconfig.{c.h}
 	The totem configuration configurator from data parsed with aisparser
diff --git a/exec/Makefile.am b/exec/Makefile.am
index f877551..d5f71cc 100644
--- a/exec/Makefile.am
+++ b/exec/Makefile.am
@@ -68,7 +68,7 @@ SHARED_LIBS_SO		= $(SHARED_LIBS:%.so.$(SONAME)=%.so)
 SHARED_LIBS_SO_TWO	= $(SHARED_LIBS:%.so.$(SONAME)=%.so.$(SOMAJOR))
 
 noinst_HEADERS		= apidef.h crypto.h mainconfig.h main.h tsafe.h \
-			  quorum.h service.h sync.h timer.h tlist.h totemconfig.h \
+			  quorum.h service.h sync.h timer.h totemconfig.h \
 			  totemmrp.h totemnet.h totemudp.h totemiba.h totemrrp.h \
 			  totemsrp.h util.h vsf.h wthread.h schedwrk.h \
 			  evil.h syncv2.h fsm.h
diff --git a/exec/apidef.c b/exec/apidef.c
index e477f2c..c101d4c 100644
--- a/exec/apidef.c
+++ b/exec/apidef.c
@@ -37,13 +37,16 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <qb/qbutil.h>
+#include <qb/qbloop.h>
+#include <qb/qbipcs.h>
+
 #include <corosync/corotypes.h>
 #include <corosync/lcr/lcr_ifact.h>
 #include <corosync/totem/totempg.h>
 #include <corosync/totem/totemip.h>
 #include <corosync/totem/totem.h>
 #include <corosync/engine/logsys.h>
-#include <qb/qbipcs.h>
 #include "util.h"
 #include "timer.h"
 #include "sync.h"
@@ -96,7 +99,7 @@ static struct corosync_api_v1 apidef_corosync_api_v1 = {
 	.timer_add_duration = corosync_timer_add_duration,
 	.timer_add_absolute = corosync_timer_add_absolute,
 	.timer_delete = corosync_timer_delete,
-	.timer_time_get = corosync_timer_time_get,
+	.timer_time_get = qb_util_nano_from_epoch_get,
 	.timer_expire_time_get = corosync_timer_expire_time_get,
 	.ipc_source_set = message_source_set,
 	.ipc_source_is_local = message_source_is_local,
diff --git a/exec/main.c b/exec/main.c
index 00ac197..30d8d0f 100644
--- a/exec/main.c
+++ b/exec/main.c
@@ -1433,11 +1433,6 @@ int main (int argc, char **argv, char **envp)
 	/* callthis after our fork() */
 	tsafe_init (envp);
 
-	corosync_timer_init (
-		serialize_lock,
-		serialize_unlock,
-		sched_priority);
-
 	corosync_poll_handle = qb_loop_create ();
 
 	/*
diff --git a/exec/timer.c b/exec/timer.c
index 1d71f14..92a2241 100644
--- a/exec/timer.c
+++ b/exec/timer.c
@@ -35,267 +35,57 @@
 
 #include <config.h>
 
-#include <pthread.h>
-#include <pwd.h>
-#include <grp.h>
-#include <sys/types.h>
-#include <sys/poll.h>
-#include <sys/uio.h>
-#include <sys/mman.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <signal.h>
-#include <sched.h>
-#include <time.h>
-
-#include <corosync/swab.h>
-#include <corosync/corotypes.h>
-#include <corosync/list.h>
-#include <corosync/lcr/lcr_ifact.h>
-#include <qb/qbloop.h>
-#include <corosync/totem/totempg.h>
-#include <corosync/engine/objdb.h>
-#include <corosync/engine/config.h>
-#define LOG_SERVICE LOG_SERVICE_IPC
-#include <corosync/engine/logsys.h>
-
-#include "poll.h"
-#include "totemsrp.h"
-#include "mainconfig.h"
-#include "totemconfig.h"
-#include "main.h"
-#include "sync.h"
-#include "tlist.h"
-#include "util.h"
 #include "timer.h"
-
-#define SERVER_BACKLOG 5
-
-static pthread_mutex_t timer_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-static pthread_t expiry_thread;
-
-static pthread_attr_t thread_attr;
-
-static struct timerlist timers_timerlist;
-
-static int sched_priority = 0;
-
-static void (*timer_serialize_lock_fn) (void);
-
-static void (*timer_serialize_unlock_fn) (void);
-
-static void *prioritized_timer_thread (void *data);
-
-extern void pthread_exit(void *) __attribute__((noreturn));
-
-/*
- * This thread runs at the highest priority to run system wide timers
- */
-static void *prioritized_timer_thread (void *data)
-{
-	int fds;
-	unsigned long long timeout;
-
-#if defined(HAVE_PTHREAD_SETSCHEDPARAM) && defined(HAVE_SCHED_GET_PRIORITY_MAX)
-	if (sched_priority != 0) {
-		struct sched_param sched_param;
-
-		sched_param.sched_priority = sched_priority;
-		pthread_setschedparam (expiry_thread, SCHED_RR, &sched_param);
-	}
-#endif
-
-	pthread_mutex_unlock (&timer_mutex);
-	for (;;) {
-		timer_serialize_lock_fn ();
-		timeout = timerlist_msec_duration_to_expire (&timers_timerlist);
-		if (timeout != -1 && timeout > 0xFFFFFFFF) {
-			timeout = 0xFFFFFFFE;
-		}
-		timer_serialize_unlock_fn ();
-		fds = poll (NULL, 0, timeout);
-		if (fds < 0 && errno == EINTR) {
-			continue;
-		}
-		if (fds < 0) {
-			return NULL;
-		}
-		pthread_mutex_lock (&timer_mutex);
-		timer_serialize_lock_fn ();
-
-		timerlist_expire (&timers_timerlist);
-
-		timer_serialize_unlock_fn ();
-		pthread_mutex_unlock (&timer_mutex);
-	}
-}
-
-static void sigusr1_handler (int num) {
-#ifdef COROSYNC_SOLARIS
-	/* Rearm the signal facility */
-        signal (num, sigusr1_handler);
-#endif
-}
-
-int corosync_timer_init (
-        void (*serialize_lock_fn) (void),
-        void (*serialize_unlock_fn) (void),
-	int sched_priority_in)
-{
-	int res;
-
-	timer_serialize_lock_fn = serialize_lock_fn;
-	timer_serialize_unlock_fn = serialize_unlock_fn;
-	sched_priority = sched_priority_in;
-
-	timerlist_init (&timers_timerlist);
-
-	signal (SIGUSR1, sigusr1_handler);
-
-	pthread_mutex_lock (&timer_mutex);
-	pthread_attr_init (&thread_attr);
-	pthread_attr_setstacksize (&thread_attr, 100000);
-	pthread_attr_setdetachstate (&thread_attr, PTHREAD_CREATE_DETACHED);
-	res = pthread_create (&expiry_thread, &thread_attr,
-		prioritized_timer_thread, NULL);
-
-	return (res);
-}
+#include "main.h"
+#include <qb/qbdefs.h>
+#include <qb/qbutil.h>
 
 int corosync_timer_add_absolute (
-	unsigned long long nanosec_from_epoch,
-	void *data,
-	void (*timer_fn) (void *data),
-	timer_handle *handle)
+		unsigned long long nanosec_from_epoch,
+		void *data,
+		void (*timer_fn) (void *data),
+		corosync_timer_handle *handle)
 {
-	int res;
-	int unlock;
-
-	if (pthread_equal (pthread_self(), expiry_thread) != 0) {
-		unlock = 0;
-	} else {
-		unlock = 1;
-		pthread_mutex_lock (&timer_mutex);
-	}
-
-	res = timerlist_add_absolute (
-		&timers_timerlist,
-		timer_fn,
-		data,
-		nanosec_from_epoch,
-		handle);
-
-	if (unlock) {
-		pthread_mutex_unlock (&timer_mutex);
-	}
-
-	pthread_kill (expiry_thread, SIGUSR1);
-
-	return (res);
+	uint64_t expire_time = nanosec_from_epoch - qb_util_nano_current_get();
+	return qb_loop_timer_add(corosync_poll_handle_get(),
+				QB_LOOP_MED,
+				 expire_time / QB_TIME_NS_IN_MSEC,
+				 data,
+				 timer_fn,
+				 handle);
 }
 
 int corosync_timer_add_duration (
 	unsigned long long nanosec_duration,
 	void *data,
 	void (*timer_fn) (void *data),
-	timer_handle *handle)
+	corosync_timer_handle *handle)
 {
-	int res;
-	int unlock;
-
-	if (pthread_equal (pthread_self(), expiry_thread) != 0) {
-		unlock = 0;
-	} else {
-		unlock = 1;
-		pthread_mutex_lock (&timer_mutex);
-	}
-
-	res = timerlist_add_duration (
-		&timers_timerlist,
-		timer_fn,
-		data,
-		nanosec_duration,
-		handle);
-
-	if (unlock) {
-		pthread_mutex_unlock (&timer_mutex);
-	}
-
-	pthread_kill (expiry_thread, SIGUSR1);
-
-	return (res);
+	return qb_loop_timer_add(corosync_poll_handle_get(),
+				QB_LOOP_MED,
+				 nanosec_duration / QB_TIME_NS_IN_MSEC,
+				 data,
+				 timer_fn,
+				 handle);
 }
 
 void corosync_timer_delete (
-	timer_handle th)
+	corosync_timer_handle th)
 {
-	int unlock;
-
-	if (th == 0) {
-		return;
-	}
-
-	if (pthread_equal (pthread_self(), expiry_thread) != 0) {
-		unlock = 0;
-	} else {
-		unlock = 1;
-		pthread_mutex_lock (&timer_mutex);
-	}
-
-	timerlist_del (&timers_timerlist, th);
-
-	if (unlock) {
-		pthread_mutex_unlock (&timer_mutex);
-	}
-}
-
-void corosync_timer_lock (void)
-{
-	pthread_mutex_lock (&timer_mutex);
-}
-
-void corosync_timer_unlock (void)
-{
-	pthread_mutex_unlock (&timer_mutex);
+	qb_loop_timer_del(corosync_poll_handle_get(), th);
 }
 
-unsigned long long corosync_timer_time_get (void)
+uint64_t corosync_timer_expire_time_get (
+	corosync_timer_handle th)
 {
-	return (timerlist_nano_from_epoch());
-}
-
-unsigned long long corosync_timer_expire_time_get (
-	timer_handle th)
-{
-	int unlock;
-	unsigned long long expire;
+	uint64_t expire;
 
 	if (th == 0) {
 		return (0);
 	}
 
-	if (pthread_equal (pthread_self(), expiry_thread) != 0) {
-		unlock = 0;
-	} else {
-		unlock = 1;
-		pthread_mutex_lock (&timer_mutex);
-	}
-
-	expire = timerlist_expire_time (&timers_timerlist, th);
-
-	if (unlock) {
-		pthread_mutex_unlock (&timer_mutex);
-	}
+	expire = qb_loop_timer_expire_time_get(corosync_poll_handle_get(), th);
 
 	return (expire);
 }
+
diff --git a/exec/timer.h b/exec/timer.h
index 7d6826a..5f0e849 100644
--- a/exec/timer.h
+++ b/exec/timer.h
@@ -35,12 +35,11 @@
 #ifndef TIMER_H_DEFINED
 #define TIMER_H_DEFINED
 
-typedef void * corosync_timer_handle;
+#include <stdint.h>
+#include <time.h>
+#include <qb/qbloop.h>
 
-extern int corosync_timer_init (
-        void (*serialize_lock) (void),
-        void (*serialize_unlock) (void),
-	int sched_priority);
+typedef qb_loop_timer_handle corosync_timer_handle;
 
 extern int corosync_timer_add_duration (
 	unsigned long long nanosec_duration,
@@ -56,14 +55,6 @@ extern int corosync_timer_add_absolute (
 
 extern void corosync_timer_delete (corosync_timer_handle handle);
 
-extern void corosync_timer_delete_data (corosync_timer_handle handle);
-
-extern void corosync_timer_lock (void);
-
-extern void corosync_timer_unlock (void);
-
-extern unsigned long long corosync_timer_time_get (void);
-
-extern unsigned long long corosync_timer_expire_time_get (corosync_timer_handle handle);
+extern uint64_t corosync_timer_expire_time_get (corosync_timer_handle handle);
 
 #endif /* TIMER_H_DEFINED */
diff --git a/exec/tlist.h b/exec/tlist.h
deleted file mode 100644
index 7b568ee..0000000
--- a/exec/tlist.h
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright (c) 2003-2004 MontaVista Software, Inc.
- * Copyright (c) 2006-2007, 2009 Red Hat, Inc.
- *
- * All rights reserved.
- *
- * Author: Steven Dake (sdake(a)redhat.com)
- *
- * This software licensed under BSD license, the text of which follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * - Neither the name of the MontaVista Software, Inc. nor the names of its
- *   contributors may be used to endorse or promote products derived from this
- *   software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef TLIST_H_DEFINED
-#define TLIST_H_DEFINED
-
-#include <sys/time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/param.h>
-#include <unistd.h>
-
-#include <corosync/list.h>
-
-#ifndef HZ
-	#define HZ 100  /* 10ms */
-#endif
-
-#ifndef TIMER_HANDLE
-typedef void * timer_handle;
-#define TIMER_HANDLE
-#endif
-
-#define TIMERLIST_MS_IN_SEC   1000ULL
-#define TIMERLIST_US_IN_SEC   1000000ULL
-#define TIMERLIST_NS_IN_SEC   1000000000ULL
-#define TIMERLIST_US_IN_MSEC  1000ULL
-#define TIMERLIST_NS_IN_MSEC  1000000ULL
-#define TIMERLIST_NS_IN_USEC  1000ULL
-
-struct timerlist {
-	struct list_head timer_head;
-	struct list_head *timer_iter;
-};
-
-struct timerlist_timer {
-	struct list_head list;
-	unsigned long long expire_time;
-	int is_absolute_timer;
-	void (*timer_fn)(void *data);
-	void *data;
-	timer_handle handle_addr;
-};
-
-static inline void timerlist_init (struct timerlist *timerlist)
-{
-	list_init (&timerlist->timer_head);
-}
-
-static inline unsigned long long timerlist_nano_from_epoch (void)
-{
-	unsigned long long nano_from_epoch;
-	struct timeval time_from_epoch;
-	gettimeofday (&time_from_epoch, 0);
-
-	nano_from_epoch = ((time_from_epoch.tv_sec * TIMERLIST_NS_IN_SEC) +
-		(time_from_epoch.tv_usec * TIMERLIST_NS_IN_USEC));
-
-	return (nano_from_epoch);
-}
-
-#if defined _POSIX_MONOTONIC_CLOCK && _POSIX_MONOTONIC_CLOCK >= 0
-static inline unsigned long long timerlist_nano_current_get (void)
-{
-	unsigned long long nano_monotonic;
-	struct timespec ts;
-
-	clock_gettime (CLOCK_MONOTONIC, &ts);
-
-	nano_monotonic = (ts.tv_sec * TIMERLIST_NS_IN_SEC) + (unsigned long long )ts.tv_nsec;
-	return (nano_monotonic);
-}
-
-static inline unsigned long long timerlist_nano_monotonic_hz (void) {
-	unsigned long long nano_monotonic_hz;
-	struct timespec ts;
-
-	clock_getres (CLOCK_MONOTONIC, &ts);
-
-	nano_monotonic_hz = TIMERLIST_NS_IN_SEC / ((ts.tv_sec * TIMERLIST_NS_IN_SEC) +
ts.tv_nsec);
-
-	return (nano_monotonic_hz);
-}
-#else
-#warning "Your system doesn't support monotonic timer. gettimeofday will be
used"
-static inline unsigned long long timerlist_nano_current_get (void)
-{
-	return (timerlist_nano_from_epoch ());
-}
-
-static inline unsigned long long timerlist_nano_monotonic_hz (void) {
-	return HZ;
-}
-#endif
-
-static inline void timerlist_add (struct timerlist *timerlist, struct timerlist_timer
*timer)
-{
-	struct list_head *timer_list = 0;
-	struct timerlist_timer *timer_from_list;
-	int found;
-
-	for (found = 0, timer_list = timerlist->timer_head.next;
-		timer_list != &timerlist->timer_head;
-		timer_list = timer_list->next) {
-
-		timer_from_list = list_entry (timer_list,
-			struct timerlist_timer, list);
-
-		if (timer_from_list->expire_time > timer->expire_time) {
-			list_add (&timer->list, timer_list->prev);
-			found = 1;
-			break; /* for timer iteration */
-		}
-	}
-	if (found == 0) {
-		list_add (&timer->list, timerlist->timer_head.prev);
-	}
-}
-
-static inline int timerlist_add_absolute (struct timerlist *timerlist,
-	void (*timer_fn) (void *data),
-	void *data,
-	unsigned long long nano_from_epoch,
-	timer_handle *handle)
-{
-	struct timerlist_timer *timer;
-
-	timer = (struct timerlist_timer *)malloc (sizeof (struct timerlist_timer));
-	if (timer == 0) {
-		errno = ENOMEM;
-		return (-1);
-	}
-
-	timer->expire_time = nano_from_epoch;
-	timer->is_absolute_timer = 1;
-	timer->data = data;
-	timer->timer_fn = timer_fn;
-	timer->handle_addr = handle;
-	timerlist_add (timerlist, timer);
-
-	*handle = timer;
-	return (0);
-}
-
-static inline int timerlist_add_duration (struct timerlist *timerlist,
-	void (*timer_fn) (void *data),
-	void *data,
-	unsigned long long nano_duration,
-	timer_handle *handle)
-{
-	struct timerlist_timer *timer;
-
-	timer = (struct timerlist_timer *)malloc (sizeof (struct timerlist_timer));
-	if (timer == 0) {
-		errno = ENOMEM;
-		return (-1);
-	}
-
-	timer->expire_time = timerlist_nano_current_get () + nano_duration;
-	timer->is_absolute_timer = 0;
-	timer->data = data;
-	timer->timer_fn = timer_fn;
-	timer->handle_addr = handle;
-	timerlist_add (timerlist, timer);
-
-	*handle = timer;
-	return (0);
-}
-
-static inline void timerlist_del (struct timerlist *timerlist,
-				  timer_handle _timer_handle)
-{
-	struct timerlist_timer *timer = (struct timerlist_timer *)_timer_handle;
-
-	memset (timer->handle_addr, 0, sizeof (struct timerlist_timer *));
-	/*
-	 * If the next timer after the currently expiring timer because
-	 * timerlist_del is called from a timer handler, get to the next
-	 * timer
-	 */
-	if (timerlist->timer_iter == &timer->list) {
-		timerlist->timer_iter = timerlist->timer_iter->next;
-	}
-	list_del (&timer->list);
-	list_init (&timer->list);
-	free (timer);
-}
-
-static inline unsigned long long timerlist_expire_time (struct timerlist *timerlist,
timer_handle _timer_handle)
-{
-	struct timerlist_timer *timer = (struct timerlist_timer *)_timer_handle;
-
-	return (timer->expire_time);
-}
-
-static inline void timerlist_pre_dispatch (struct timerlist *timerlist, timer_handle
_timer_handle)
-{
-	struct timerlist_timer *timer = (struct timerlist_timer *)_timer_handle;
-
-	memset (timer->handle_addr, 0, sizeof (struct timerlist_timer *));
-	list_del (&timer->list);
-	list_init (&timer->list);
-}
-
-static inline void timerlist_post_dispatch (struct timerlist *timerlist, timer_handle
_timer_handle)
-{
-	struct timerlist_timer *timer = (struct timerlist_timer *)_timer_handle;
-
-	free (timer);
-}
-
-/*
- * returns the number of msec until the next timer will expire for use with poll
- */
-static inline unsigned long long timerlist_msec_duration_to_expire (struct timerlist
*timerlist)
-{
-	struct timerlist_timer *timer_from_list;
-	volatile unsigned long long current_time;
-	volatile unsigned long long msec_duration_to_expire;
-
-	/*
-	 * empty list, no expire
-	 */
-	if (timerlist->timer_head.next == &timerlist->timer_head) {
-		return (-1);
-	}
-
-	timer_from_list = list_entry (timerlist->timer_head.next,
-		struct timerlist_timer, list);
-
-	if (timer_from_list->is_absolute_timer) {
-		current_time = timerlist_nano_from_epoch ();
-	} else {
-		current_time = timerlist_nano_current_get ();
-	}
-
-	/*
-	 * timer at head of list is expired, zero msecs required
-	 */
-	if (timer_from_list->expire_time < current_time) {
-		return (0);
-	}
-
-	msec_duration_to_expire = ((timer_from_list->expire_time - current_time) /
TIMERLIST_NS_IN_MSEC) +
-		(1000 / HZ);
-	return (msec_duration_to_expire);
-}
-
-/*
- * Expires any timers that should be expired
- */
-static inline void timerlist_expire (struct timerlist *timerlist)
-{
-	struct timerlist_timer *timer_from_list;
-	unsigned long long current_time_from_epoch;
-	unsigned long long current_monotonic_time;
-	unsigned long long current_time;
-
-	current_monotonic_time = timerlist_nano_current_get ();
-	current_time_from_epoch = current_time = timerlist_nano_from_epoch ();
-
-	for (timerlist->timer_iter = timerlist->timer_head.next;
-		timerlist->timer_iter != &timerlist->timer_head;) {
-
-		timer_from_list = list_entry (timerlist->timer_iter,
-			struct timerlist_timer, list);
-
-		current_time = (timer_from_list->is_absolute_timer ? current_time_from_epoch :
current_monotonic_time);
-
-		if (timer_from_list->expire_time < current_time) {
-			timerlist->timer_iter = timerlist->timer_iter->next;
-
-			timerlist_pre_dispatch (timerlist, timer_from_list);
-
-			timer_from_list->timer_fn (timer_from_list->data);
-
-			timerlist_post_dispatch (timerlist, timer_from_list);
-		} else {
-			break; /* for timer iteration */
-		}
-	}
-	timerlist->timer_iter = 0;
-}
-#endif /* TLIST_H_DEFINED */
diff --git a/exec/totemconfig.c b/exec/totemconfig.c
index ad1b116..e9eda46 100644
--- a/exec/totemconfig.c
+++ b/exec/totemconfig.c
@@ -50,6 +50,7 @@
 
 #include <corosync/swab.h>
 #include <corosync/list.h>
+#include <qb/qbdefs.h>
 #include <corosync/totem/totem.h>
 #include <corosync/engine/objdb.h>
 #include <corosync/engine/config.h>
@@ -64,7 +65,6 @@
 
 #include "util.h"
 #include "totemconfig.h"
-#include "tlist.h" /* for HZ */
 
 #define TOKEN_RETRANSMITS_BEFORE_LOSS_CONST	4
 #define TOKEN_TIMEOUT				1000
diff --git a/exec/totemsrp.c b/exec/totemsrp.c
index 917d3ed..808ed7e 100644
--- a/exec/totemsrp.c
+++ b/exec/totemsrp.c
@@ -74,12 +74,16 @@
 #include <sys/poll.h>
 #include <limits.h>
 
+#include <qb/qbdefs.h>
+#include <qb/qbutil.h>
+#include <qb/qbloop.h>
+
 #include <corosync/swab.h>
 #include <corosync/cs_queue.h>
 #include <corosync/sq.h>
 #include <corosync/list.h>
 #include <corosync/hdb.h>
-#include <qb/qbloop.h>
+
 #define LOGSYS_UTILS_ONLY 1
 #include <corosync/engine/logsys.h>
 
@@ -89,7 +93,6 @@
 #include "wthread.h"
 
 #include "crypto.h"
-#include "tlist.h"
 
 #define LOCALHOST_IP				inet_addr("127.0.0.1")
 #define QUEUE_RTR_ITEMS_SIZE_MAX		16384 /* allow 16384 retransmit items */
@@ -694,8 +697,8 @@ static int pause_flush (struct totemsrp_instance *instance)
 	uint64_t timestamp_msec;
 	int res = 0;
 
-        now_msec = (timerlist_nano_current_get () / TIMERLIST_NS_IN_MSEC);
-        timestamp_msec = instance->pause_timestamp / TIMERLIST_NS_IN_MSEC;
+        now_msec = (qb_util_nano_current_get () / QB_TIME_NS_IN_MSEC);
+        timestamp_msec = instance->pause_timestamp / QB_TIME_NS_IN_MSEC;
 
 	if ((now_msec - timestamp_msec) > (instance->totem_config->token_timeout / 2))
{
 		log_printf (instance->totemsrp_log_level_notice,
@@ -714,9 +717,9 @@ static int token_event_stats_collector (enum totem_callback_token_type
type, con
 {
 	struct totemsrp_instance *instance = (struct totemsrp_instance *)void_instance;
 	uint32_t time_now;
-	unsigned long long nano_secs = timerlist_nano_current_get ();
+	unsigned long long nano_secs = qb_util_nano_current_get ();
 
-	time_now = (nano_secs / TIMERLIST_NS_IN_MSEC);
+	time_now = (nano_secs / QB_TIME_NS_IN_MSEC);
 
 	if (type == TOTEM_CALLBACK_TOKEN_RECEIVED) {
 		/* incr latest token the index */
@@ -1524,7 +1527,7 @@ static void timer_function_pause_timeout (void *data)
 {
 	struct totemsrp_instance *instance = data;
 
-	instance->pause_timestamp = timerlist_nano_current_get ();
+	instance->pause_timestamp = qb_util_nano_current_get ();
 	reset_pause_timeout (instance);
 }
 
@@ -3341,7 +3344,7 @@ static int message_handler_orf_token (
 	unsigned long long tv_current;
 	unsigned long long tv_diff;
 
-	tv_current = timerlist_nano_current_get ();
+	tv_current = qb_util_nano_current_get ();
 	tv_diff = tv_current - tv_old;
 	tv_old = tv_current;
 
@@ -3573,7 +3576,7 @@ printf ("token seq %d\n", token->seq);
 			token_send (instance, token, forward_token);
 
 #ifdef GIVEINFO
-			tv_current = timerlist_nano_current_get ();
+			tv_current = qb_util_nano_current_get ();
 			tv_diff = tv_current - tv_old;
 			tv_old = tv_current;
 			log_printf (instance->totemsrp_log_level_debug,
diff --git a/lib/votequorum.c b/lib/votequorum.c
index 3f34160..470d318 100644
--- a/lib/votequorum.c
+++ b/lib/votequorum.c
@@ -45,6 +45,7 @@
 #include <sys/socket.h>
 #include <errno.h>
 
+#include <qb/qbdefs.h>
 #include <qb/qbipcc.h>
 
 #include <corosync/corotypes.h>
diff --git a/services/pload.c b/services/pload.c
index f7563c2..bd7240f 100644
--- a/services/pload.c
+++ b/services/pload.c
@@ -53,6 +53,7 @@
 #include <assert.h>
 
 #include <qb/qblist.h>
+#include <qb/qbutil.h>
 #include <qb/qbipc_common.h>
 
 #include <corosync/swab.h>
@@ -65,8 +66,6 @@
 #include <corosync/list.h>
 #include <corosync/engine/logsys.h>
 
-#include "../exec/tlist.h"
-
 LOGSYS_DECLARE_SUBSYS ("PLOAD");
 
 enum pload_exec_message_req_types {
@@ -363,11 +362,11 @@ static void message_handler_req_exec_pload_mcast (
 
 	last_msg_no = pload_mcast->msg_code;
 	if (msgs_delivered == 0) {
-		tv1 = timerlist_nano_current_get ();
+		tv1 = qb_util_nano_current_get ();
 	}
 	msgs_delivered += 1;
 	if (msgs_delivered == msgs_wanted) {
-		tv2 = timerlist_nano_current_get ();
+		tv2 = qb_util_nano_current_get ();
 		tv_elapsed = tv2 - tv1;
 		sprintf (log_buffer, "%5d Writes %d bytes per write %7.3f seconds runtime, %9.3f
TP/S, %9.3f MB/S.\n",
 			msgs_delivered,
diff --git a/services/votequorum.c b/services/votequorum.c
index f0832f2..9cb6aaf 100644
--- a/services/votequorum.c
+++ b/services/votequorum.c
@@ -55,8 +55,11 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <corosync/corotypes.h>
 #include <qb/qbipc_common.h>
+#include <qb/qbdefs.h>
+#include <qb/qbutil.h>
+
+#include <corosync/corotypes.h>
 #include <corosync/corodefs.h>
 #include <corosync/cfg.h>
 #include <corosync/list.h>
@@ -66,9 +69,6 @@
 #include <corosync/engine/coroapi.h>
 #include <corosync/engine/quorum.h>
 #include <corosync/ipc_votequorum.h>
-#include <corosync/list.h>
-
-#include "../exec/tlist.h"
 
 #define VOTEQUORUM_MAJOR_VERSION 7
 #define VOTEQUORUM_MINOR_VERSION 0
@@ -1319,8 +1319,8 @@ static void quorum_device_timer_fn(void *arg)
 	if (!quorum_device || quorum_device->state == NODESTATE_DEAD)
 		return;
 
-	if ( (quorum_device->last_hello / TIMERLIST_NS_IN_SEC) + quorumdev_poll/1000 <
-		(timerlist_nano_current_get () / TIMERLIST_NS_IN_SEC)) {
+	if ( (quorum_device->last_hello / QB_TIME_NS_IN_SEC) + quorumdev_poll/1000 <
+		(qb_util_nano_current_get () / QB_TIME_NS_IN_SEC)) {
 
 		quorum_device->state = NODESTATE_DEAD;
 		log_printf(LOGSYS_LEVEL_INFO, "lost contact with quorum device\n");
@@ -1403,7 +1403,7 @@ static void message_handler_req_lib_votequorum_qdisk_poll (void
*conn,
 
 	if (quorum_device) {
 		if (req_lib_votequorum_qdisk_poll->state) {
-			quorum_device->last_hello = timerlist_nano_current_get ();
+			quorum_device->last_hello = qb_util_nano_current_get ();
 			if (quorum_device->state == NODESTATE_DEAD) {
 				quorum_device->state = NODESTATE_MEMBER;
 				recalculate_quorum(0, 0);
-- 
1.7.3.1

[PATCH 4/7] libqb: rip out unneccessary locks

[Angus Salkeld]

Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com&gt;
---
 exec/main.c                 |   17 -----------------
 exec/objdb.c                |    9 ---------
 exec/totempg.c              |   40 ----------------------------------------
 include/corosync/cs_queue.h |   30 ------------------------------
 4 files changed, 0 insertions(+), 96 deletions(-)

diff --git a/exec/main.c b/exec/main.c
index 30d8d0f..2c1a97d 100644
--- a/exec/main.c
+++ b/exec/main.c
@@ -246,12 +246,10 @@ static struct totempg_group corosync_group = {
 
 static void serialize_lock (void)
 {
-	qb_thread_lock (serialize_lock_f);
 }
 
 static void serialize_unlock (void)
 {
-	qb_thread_unlock (serialize_lock_f);
 }
 
 static void corosync_sync_completed (void)
@@ -915,24 +913,9 @@ int corosync_sending_allowed (
 			sending_allowed = QB_TRUE;
 		} else if (pd->reserved_msgs && sync_in_process == 0) {
 			sending_allowed = QB_TRUE;
-		} else {
-			log_printf(LOGSYS_LEVEL_NOTICE,
-				   "no tx: (have quorum) (FC req) reserved:%d sync:%d",
-				   pd->reserved_msgs, sync_in_process);
 		}
-	} else {
-			log_printf(LOGSYS_LEVEL_NOTICE, "no tx: not quorate!");
 	}
 
-/*
-	sending_allowed =
-		(corosync_quorum_is_quorate() == 1 ||
-		ais_service[service]->allow_inquorate == CS_LIB_ALLOW_INQUORATE) &&
-		((ais_service[service]->lib_engine[id].flow_control ==
CS_LIB_FLOW_CONTROL_NOT_REQUIRED) ||
-		((ais_service[service]->lib_engine[id].flow_control == CS_LIB_FLOW_CONTROL_REQUIRED)
&&
-		(pd->reserved_msgs) &&
-		(sync_in_process == 0)));
-*/
 	return (sending_allowed);
 }
 
diff --git a/exec/objdb.c b/exec/objdb.c
index d77c8d9..50ef566 100644
--- a/exec/objdb.c
+++ b/exec/objdb.c
@@ -102,8 +102,6 @@ struct object_find_instance {
 
 struct objdb_iface_ver0 objdb_iface;
 struct list_head objdb_trackers_head;
-static pthread_mutex_t objdb_mutex;
-static pthread_mutexattr_t objdb_mutex_attr;
 
 DECLARE_HDB_DATABASE (object_instance_database,NULL);
 
@@ -111,12 +109,10 @@ DECLARE_HDB_DATABASE (object_find_instance_database,NULL);
 
 static void objdb_lock(void)
 {
-	pthread_mutex_lock(&objdb_mutex);
 }
 
 static void objdb_unlock(void)
 {
-	pthread_mutex_unlock(&objdb_mutex);
 }
 
 static int objdb_init (void)
@@ -149,11 +145,6 @@ static int objdb_init (void)
 	list_init (&instance->track_head);
 	list_init (&objdb_trackers_head);
 
-	pthread_mutexattr_init(&objdb_mutex_attr);
-
-	pthread_mutexattr_settype(&objdb_mutex_attr, PTHREAD_MUTEX_RECURSIVE);
-	pthread_mutex_init(&objdb_mutex, &objdb_mutex_attr);
-
 	hdb_handle_put (&object_instance_database, handle);
 	return (0);
 
diff --git a/exec/totempg.c b/exec/totempg.c
index cffb192..e83db9e 100644
--- a/exec/totempg.c
+++ b/exec/totempg.c
@@ -247,12 +247,6 @@ DECLARE_HDB_DATABASE (totempg_groups_instance_database,NULL);
 
 static unsigned char next_fragment = 1;
 
-static pthread_mutex_t totempg_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-static pthread_mutex_t callback_token_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-static pthread_mutex_t mcast_msg_mutex = PTHREAD_MUTEX_INITIALIZER;
-
 #define log_printf(level, format, args...)				\
 do {									\
         totempg_log_printf (						\
@@ -668,13 +662,10 @@ int callback_token_received_fn (enum totem_callback_token_type
type,
 	struct iovec iovecs[3];
 	int res;
 
-	pthread_mutex_lock (&mcast_msg_mutex);
 	if (mcast_packed_msg_count == 0) {
-		pthread_mutex_unlock (&mcast_msg_mutex);
 		return (0);
 	}
 	if (totemmrp_avail() == 0) {
-		pthread_mutex_unlock (&mcast_msg_mutex);
 		return (0);
 	}
 	mcast.header.version = 0;
@@ -700,7 +691,6 @@ int callback_token_received_fn (enum totem_callback_token_type type,
 	mcast_packed_msg_count = 0;
 	fragment_size = 0;
 
-	pthread_mutex_unlock (&mcast_msg_mutex);
 	return (0);
 }
 
@@ -752,9 +742,7 @@ int totempg_initialize (
 
 void totempg_finalize (void)
 {
-	pthread_mutex_lock (&totempg_mutex);
 	totemmrp_finalize ();
-	pthread_mutex_unlock (&totempg_mutex);
 }
 
 /*
@@ -776,7 +764,6 @@ static int mcast_msg (
 	int copy_base = 0;
 	int total_size = 0;
 
-	pthread_mutex_lock (&mcast_msg_mutex);
 	totemmrp_event_signal (TOTEM_EVENT_NEW_MSG, 1);
 
 	/*
@@ -806,7 +793,6 @@ static int mcast_msg (
 	if (byte_count_send_ok (total_size + sizeof(unsigned short) *
 		(mcast_packed_msg_count)) == 0) {
 
-		pthread_mutex_unlock (&mcast_msg_mutex);
 		return(-1);
 	}
 
@@ -924,7 +910,6 @@ static int mcast_msg (
 	}
 
 error_exit:
-	pthread_mutex_unlock (&mcast_msg_mutex);
 	return (res);
 }
 
@@ -979,19 +964,15 @@ int totempg_callback_token_create (
 	const void *data)
 {
 	unsigned int res;
-	pthread_mutex_lock (&callback_token_mutex);
 	res = totemmrp_callback_token_create (handle_out, type, delete,
 		callback_fn, data);
-	pthread_mutex_unlock (&callback_token_mutex);
 	return (res);
 }
 
 void totempg_callback_token_destroy (
 	void *handle_out)
 {
-	pthread_mutex_lock (&callback_token_mutex);
 	totemmrp_callback_token_destroy (handle_out);
-	pthread_mutex_unlock (&callback_token_mutex);
 }
 
 /*
@@ -1017,7 +998,6 @@ int totempg_groups_initialize (
 	struct totempg_group_instance *instance;
 	unsigned int res;
 
-	pthread_mutex_lock (&totempg_mutex);
 	res = hdb_handle_create (&totempg_groups_instance_database,
 		sizeof (struct totempg_group_instance), handle);
 	if (res != 0) {
@@ -1043,13 +1023,11 @@ int totempg_groups_initialize (
 
 	hdb_handle_put (&totempg_groups_instance_database, *handle);
 
-	pthread_mutex_unlock (&totempg_mutex);
 	return (0);
 error_destroy:
 	hdb_handle_destroy (&totempg_groups_instance_database, *handle);
 
 error_exit:
-	pthread_mutex_unlock (&totempg_mutex);
 	return (-1);
 }
 
@@ -1062,7 +1040,6 @@ int totempg_groups_join (
 	struct totempg_group *new_groups;
 	unsigned int res;
 
-	pthread_mutex_lock (&totempg_mutex);
 	res = hdb_handle_get (&totempg_groups_instance_database, handle,
 		(void *)&instance);
 	if (res != 0) {
@@ -1084,7 +1061,6 @@ int totempg_groups_join (
 	hdb_handle_put (&totempg_groups_instance_database, handle);
 
 error_exit:
-	pthread_mutex_unlock (&totempg_mutex);
 	return (res);
 }
 
@@ -1096,7 +1072,6 @@ int totempg_groups_leave (
 	struct totempg_group_instance *instance;
 	unsigned int res;
 
-	pthread_mutex_lock (&totempg_mutex);
 	res = hdb_handle_get (&totempg_groups_instance_database, handle,
 		(void *)&instance);
 	if (res != 0) {
@@ -1106,7 +1081,6 @@ int totempg_groups_leave (
 	hdb_handle_put (&totempg_groups_instance_database, handle);
 
 error_exit:
-	pthread_mutex_unlock (&totempg_mutex);
 	return (res);
 }
 
@@ -1125,7 +1099,6 @@ int totempg_groups_mcast_joined (
 	int i;
 	unsigned int res;
 
-	pthread_mutex_lock (&totempg_mutex);
 	res = hdb_handle_get (&totempg_groups_instance_database, handle,
 		(void *)&instance);
 	if (res != 0) {
@@ -1152,7 +1125,6 @@ int totempg_groups_mcast_joined (
 	hdb_handle_put (&totempg_groups_instance_database, handle);
 
 error_exit:
-	pthread_mutex_unlock (&totempg_mutex);
 	return (res);
 }
 
@@ -1203,8 +1175,6 @@ int totempg_groups_joined_reserve (
 	unsigned int res;
 	unsigned int reserved = 0;
 
-	pthread_mutex_lock (&totempg_mutex);
-	pthread_mutex_lock (&mcast_msg_mutex);
 	res = hdb_handle_get (&totempg_groups_instance_database, handle,
 		(void *)&instance);
 	if (res != 0) {
@@ -1234,19 +1204,13 @@ error_put:
 	hdb_handle_put (&totempg_groups_instance_database, handle);
 
 error_exit:
-	pthread_mutex_unlock (&mcast_msg_mutex);
-	pthread_mutex_unlock (&totempg_mutex);
 	return (reserved);
 }
 
 
 int totempg_groups_joined_release (int msg_count)
 {
-	pthread_mutex_lock (&totempg_mutex);
-	pthread_mutex_lock (&mcast_msg_mutex);
 	send_release (msg_count);
-	pthread_mutex_unlock (&mcast_msg_mutex);
-	pthread_mutex_unlock (&totempg_mutex);
 	return 0;
 }
 
@@ -1264,7 +1228,6 @@ int totempg_groups_mcast_groups (
 	int i;
 	unsigned int res;
 
-	pthread_mutex_lock (&totempg_mutex);
 	res = hdb_handle_get (&totempg_groups_instance_database, handle,
 		(void *)&instance);
 	if (res != 0) {
@@ -1292,7 +1255,6 @@ int totempg_groups_mcast_groups (
 	hdb_handle_put (&totempg_groups_instance_database, handle);
 
 error_exit:
-	pthread_mutex_unlock (&totempg_mutex);
 	return (res);
 }
 
@@ -1311,7 +1273,6 @@ int totempg_groups_send_ok_groups (
 	unsigned int i;
 	unsigned int res;
 
-	pthread_mutex_lock (&totempg_mutex);
 	res = hdb_handle_get (&totempg_groups_instance_database, handle,
 		(void *)&instance);
 	if (res != 0) {
@@ -1329,7 +1290,6 @@ int totempg_groups_send_ok_groups (
 
 	hdb_handle_put (&totempg_groups_instance_database, handle);
 error_exit:
-	pthread_mutex_unlock (&totempg_mutex);
 	return (res);
 }
 
diff --git a/include/corosync/cs_queue.h b/include/corosync/cs_queue.h
index 8fbe973..d13c0ea 100644
--- a/include/corosync/cs_queue.h
+++ b/include/corosync/cs_queue.h
@@ -47,7 +47,6 @@ struct cs_queue {
 	void *items;
 	int size_per_item;
 	int iterator;
-	pthread_mutex_t mutex;
 };
 
 static inline int cs_queue_init (struct cs_queue *cs_queue, int cs_queue_items, int
size_per_item) {
@@ -63,43 +62,35 @@ static inline int cs_queue_init (struct cs_queue *cs_queue, int
cs_queue_items,
 		return (-ENOMEM);
 	}
 	memset (cs_queue->items, 0, cs_queue_items * size_per_item);
-	pthread_mutex_init (&cs_queue->mutex, NULL);
 	return (0);
 }
 
 static inline int cs_queue_reinit (struct cs_queue *cs_queue)
 {
-	pthread_mutex_lock (&cs_queue->mutex);
 	cs_queue->head = 0;
 	cs_queue->tail = cs_queue->size - 1;
 	cs_queue->used = 0;
 	cs_queue->usedhw = 0;
 
 	memset (cs_queue->items, 0, cs_queue->size * cs_queue->size_per_item);
-	pthread_mutex_unlock (&cs_queue->mutex);
 	return (0);
 }
 
 static inline void cs_queue_free (struct cs_queue *cs_queue) {
-	pthread_mutex_destroy (&cs_queue->mutex);
 	free (cs_queue->items);
 }
 
 static inline int cs_queue_is_full (struct cs_queue *cs_queue) {
 	int full;
 
-	pthread_mutex_lock (&cs_queue->mutex);
 	full = ((cs_queue->size - 1) == cs_queue->used);
-	pthread_mutex_unlock (&cs_queue->mutex);
 	return (full);
 }
 
 static inline int cs_queue_is_empty (struct cs_queue *cs_queue) {
 	int empty;
 
-	pthread_mutex_lock (&cs_queue->mutex);
 	empty = (cs_queue->used == 0);
-	pthread_mutex_unlock (&cs_queue->mutex);
 	return (empty);
 }
 
@@ -108,7 +99,6 @@ static inline void cs_queue_item_add (struct cs_queue *cs_queue, void
*item)
 	char *cs_queue_item;
 	int cs_queue_position;
 
-	pthread_mutex_lock (&cs_queue->mutex);
 	cs_queue_position = cs_queue->head;
 	cs_queue_item = cs_queue->items;
 	cs_queue_item += cs_queue_position * cs_queue->size_per_item;
@@ -121,7 +111,6 @@ static inline void cs_queue_item_add (struct cs_queue *cs_queue, void
*item)
 	if (cs_queue->used > cs_queue->usedhw) {
 		cs_queue->usedhw = cs_queue->used;
 	}
-	pthread_mutex_unlock (&cs_queue->mutex);
 }
 
 static inline void *cs_queue_item_get (struct cs_queue *cs_queue)
@@ -129,42 +118,34 @@ static inline void *cs_queue_item_get (struct cs_queue *cs_queue)
 	char *cs_queue_item;
 	int cs_queue_position;
 
-	pthread_mutex_lock (&cs_queue->mutex);
 	cs_queue_position = (cs_queue->tail + 1) % cs_queue->size;
 	cs_queue_item = cs_queue->items;
 	cs_queue_item += cs_queue_position * cs_queue->size_per_item;
-	pthread_mutex_unlock (&cs_queue->mutex);
 	return ((void *)cs_queue_item);
 }
 
 static inline void cs_queue_item_remove (struct cs_queue *cs_queue) {
-	pthread_mutex_lock (&cs_queue->mutex);
 	cs_queue->tail = (cs_queue->tail + 1) % cs_queue->size;
 
 	assert (cs_queue->tail != cs_queue->head);
 
 	cs_queue->used--;
 	assert (cs_queue->used >= 0);
-	pthread_mutex_unlock (&cs_queue->mutex);
 }
 
 static inline void cs_queue_items_remove (struct cs_queue *cs_queue, int rel_count)
 {
-	pthread_mutex_lock (&cs_queue->mutex);
 	cs_queue->tail = (cs_queue->tail + rel_count) % cs_queue->size;
 
 	assert (cs_queue->tail != cs_queue->head);
 
 	cs_queue->used -= rel_count;
-	pthread_mutex_unlock (&cs_queue->mutex);
 }
 
 
 static inline void cs_queue_item_iterator_init (struct cs_queue *cs_queue)
 {
-	pthread_mutex_lock (&cs_queue->mutex);
 	cs_queue->iterator = (cs_queue->tail + 1) % cs_queue->size;
-	pthread_mutex_unlock (&cs_queue->mutex);
 }
 
 static inline void *cs_queue_item_iterator_get (struct cs_queue *cs_queue)
@@ -172,15 +153,12 @@ static inline void *cs_queue_item_iterator_get (struct cs_queue
*cs_queue)
 	char *cs_queue_item;
 	int cs_queue_position;
 
-	pthread_mutex_lock (&cs_queue->mutex);
 	cs_queue_position = (cs_queue->iterator) % cs_queue->size;
 	if (cs_queue->iterator == cs_queue->head) {
-		pthread_mutex_unlock (&cs_queue->mutex);
 		return (0);
 	}
 	cs_queue_item = cs_queue->items;
 	cs_queue_item += cs_queue_position * cs_queue->size_per_item;
-	pthread_mutex_unlock (&cs_queue->mutex);
 	return ((void *)cs_queue_item);
 }
 
@@ -188,28 +166,22 @@ static inline int cs_queue_item_iterator_next (struct cs_queue
*cs_queue)
 {
 	int next_res;
 
-	pthread_mutex_lock (&cs_queue->mutex);
 	cs_queue->iterator = (cs_queue->iterator + 1) % cs_queue->size;
 
 	next_res = cs_queue->iterator == cs_queue->head;
-	pthread_mutex_unlock (&cs_queue->mutex);
 	return (next_res);
 }
 
 static inline void cs_queue_avail (struct cs_queue *cs_queue, int *avail)
 {
-	pthread_mutex_lock (&cs_queue->mutex);
 	*avail = cs_queue->size - cs_queue->used - 2;
 	assert (*avail >= 0);
-	pthread_mutex_unlock (&cs_queue->mutex);
 }
 
 static inline int cs_queue_used (struct cs_queue *cs_queue) {
 	int used;
 
-	pthread_mutex_lock (&cs_queue->mutex);
 	used = cs_queue->used;
-	pthread_mutex_unlock (&cs_queue->mutex);
 
 	return (used);
 }
@@ -217,9 +189,7 @@ static inline int cs_queue_used (struct cs_queue *cs_queue) {
 static inline int cs_queue_usedhw (struct cs_queue *cs_queue) {
 	int usedhw;
 
-	pthread_mutex_lock (&cs_queue->mutex);
 	usedhw = cs_queue->usedhw;
-	pthread_mutex_unlock (&cs_queue->mutex);
 
 	return (usedhw);
 }
-- 
1.7.3.1

[PATCH 5/7] libqb: use the main loop to shutdown

[Angus Salkeld]

Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com&gt;
---
 cts/agents/syncv2.c |   13 +++++++
 exec/main.c         |   96 ++++++++++++---------------------------------------
 exec/service.c      |   79 ++++++++++++++++++++++++------------------
 3 files changed, 80 insertions(+), 108 deletions(-)

diff --git a/cts/agents/syncv2.c b/cts/agents/syncv2.c
index 354fab4..a98c539 100644
--- a/cts/agents/syncv2.c
+++ b/cts/agents/syncv2.c
@@ -91,6 +91,8 @@ static void tst_sv2_sync_activate (void);
 
 static void tst_sv2_sync_abort (void);
 
+static int tst_sv2_exec_exit_fn (void);
+
 struct corosync_service_engine tst_sv2_service_engine = {
 	.name			= "corosync test synv2 service",
 	.id			= TST_SV2_SERVICE,
@@ -105,6 +107,7 @@ struct corosync_service_engine tst_sv2_service_engine = {
 	.exec_engine_count	= 0,
 	.confchg_fn		= tst_sv2_confchg_fn,
 	.exec_init_fn		= tst_sv2_exec_init_fn,
+	.exec_exit_fn		= tst_sv2_exec_exit_fn,
 	.exec_dump_fn		= NULL,
 	.sync_mode		= CS_SYNC_V2,
 	.sync_init              = tst_sv2_sync_init_v2,
@@ -181,6 +184,16 @@ static int tst_sv2_exec_init_fn (
 	return 0;
 }
 
+static int32_t exit_count = 0;
+static int tst_sv2_exec_exit_fn (void)
+{
+	exit_count++;
+	log_printf (LOGSYS_LEVEL_INFO, "exit_count:%d", exit_count);
+	if (exit_count < 4) {
+		return -1;
+	}
+}
+
 static void tst_sv2_confchg_fn (
 	enum totem_configuration_type configuration_type,
 	const unsigned int *member_list, size_t member_list_entries,
diff --git a/exec/main.c b/exec/main.c
index 2c1a97d..c768055 100644
--- a/exec/main.c
+++ b/exec/main.c
@@ -131,10 +131,6 @@ static hdb_handle_t object_memb_handle;
 
 static corosync_timer_handle_t corosync_stats_timer_handle;
 
-static pthread_t corosync_exit_thread;
-
-static sem_t corosync_exit_sem;
-
 static const char *corosync_lock_file = LOCALSTATEDIR"/run/corosync.pid";
 
 static void serialize_unlock (void);
@@ -178,61 +174,29 @@ static void unlink_all_completed (void)
 
 void corosync_shutdown_request (void)
 {
-	static int called = 0;
-	if (called) {
-		return;
-	}
-	if (called == 0) {
-		called = 1;
-	}
-
-	sem_post (&corosync_exit_sem);
-}
-
-static void *corosync_exit_thread_handler (void *arg)
-{
-	sem_wait (&corosync_exit_sem);
-
 	corosync_service_unlink_all (api, unlink_all_completed);
-
-	return arg;
 }
 
-static void sigusr2_handler (int num)
+static int32_t sig_diag_handler (int num, void *data)
 {
 	corosync_state_dump ();
 	logsys_log_rec_store (LOCALSTATEDIR "/lib/corosync/fdata");
+	return 0;
 }
 
-static void sigterm_handler (int num)
-{
-	corosync_shutdown_request ();
-}
-
-static void sigquit_handler (int num)
-{
-	corosync_shutdown_request ();
-}
-
-static void sigintr_handler (int num)
+static int32_t sig_exit_handler (int num, void *data)
 {
-	corosync_shutdown_request ();
-}
-
-static void sigsegv_handler (int num)
-{
-	(void)signal (SIGSEGV, SIG_DFL);
-	logsys_atexit();
-	logsys_log_rec_store (LOCALSTATEDIR "/lib/corosync/fdata");
-	raise (SIGSEGV);
+	corosync_service_unlink_all (api, unlink_all_completed);
+	return 0;
 }
 
-static void sigabrt_handler (int num)
+static int32_t sig_failure_handler (int num, void* data)
 {
-	(void)signal (SIGABRT, SIG_DFL);
+	(void)signal (num, SIG_DFL);
 	logsys_atexit();
 	logsys_log_rec_store (LOCALSTATEDIR "/lib/corosync/fdata");
-	raise (SIGABRT);
+	raise (num);
+	return 0;
 }
 
 #define LOCALHOST_IP inet_addr("127.0.0.1")
@@ -1239,13 +1203,20 @@ int main (int argc, char **argv, char **envp)
 	log_printf (LOGSYS_LEVEL_NOTICE, "Corosync Cluster Engine ('%s'): started
and ready to provide service.\n", VERSION);
 	log_printf (LOGSYS_LEVEL_INFO, "Corosync built-in features:" PACKAGE_FEATURES
"\n");
 
+	corosync_poll_handle = qb_loop_create ();
 
-	(void)signal (SIGINT, sigintr_handler);
-	(void)signal (SIGUSR2, sigusr2_handler);
-	(void)signal (SIGSEGV, sigsegv_handler);
-	(void)signal (SIGABRT, sigabrt_handler);
-	(void)signal (SIGQUIT, sigquit_handler);
-	(void)signal (SIGTERM, sigterm_handler);
+	qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH,
+		SIGSEGV, NULL, sig_failure_handler, NULL);
+	qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH,
+		SIGABRT, NULL, sig_failure_handler, NULL);
+	qb_loop_signal_add(corosync_poll_handle, QB_LOOP_LOW,
+		SIGUSR2, NULL, sig_diag_handler, NULL);
+	qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH,
+		SIGINT, NULL, sig_exit_handler, NULL);
+	qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH,
+		SIGQUIT, NULL, sig_exit_handler, NULL);
+	qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH,
+		SIGTERM, NULL, sig_exit_handler, NULL);
 #if MSG_NOSIGNAL != 0
 	(void)signal (SIGPIPE, SIG_IGN);
 #endif
@@ -1419,29 +1390,6 @@ int main (int argc, char **argv, char **envp)
 	corosync_poll_handle = qb_loop_create ();
 
 	/*
-	 * Sleep for a while to let other nodes in the cluster
-	 * understand that this node has been away (if it was
-	 * an corosync restart).
-	 */
-
-// TODO what is this hack for?	usleep(totem_config.token_timeout * 2000);
-
-	/*
-	 * Create semaphore and start "exit" thread
-	 */
-	res = sem_init (&corosync_exit_sem, 0, 0);
-	if (res != 0) {
-		log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't create exit
thread.\n");
-		corosync_exit_error (AIS_DONE_FATAL_ERR);
-	}
-
-	res = pthread_create (&corosync_exit_thread, NULL, corosync_exit_thread_handler,
NULL);
-	if (res != 0) {
-		log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't create exit
thread.\n");
-		corosync_exit_error (AIS_DONE_FATAL_ERR);
-	}
-
-	/*
 	 * if totempg_initialize doesn't have root priveleges, it cannot
 	 * bind to a specific interface.  This only matters if
 	 * there is more then one interface in a system, so
diff --git a/exec/service.c b/exec/service.c
index 908527c..3b31bad 100644
--- a/exec/service.c
+++ b/exec/service.c
@@ -55,6 +55,7 @@
 #include "service.h"
 
 #include <qb/qbipcs.h>
+#include <qb/qbloop.h>
 
 LOGSYS_DECLARE_SUBSYS ("SERV");
 
@@ -123,9 +124,6 @@ static hdb_handle_t object_stats_services_handle;
 
 static void (*service_unlink_all_complete) (void) = NULL;
 
-static hdb_handle_t swrk_service_exit_handle;
-static hdb_handle_t swrk_service_unlink_handle;
-
 static unsigned int default_services_requested (struct corosync_api_v1 *corosync_api)
 {
 	hdb_handle_t object_service_handle;
@@ -572,17 +570,17 @@ unsigned int corosync_service_defaults_link_and_init (struct
corosync_api_v1 *co
  * Declaration of exit_schedwrk_handler, because of cycle
  * (service_exit_schedwrk_handler calls service_unlink_schedwrk_handler, and vice-versa)
  */
-static int service_exit_schedwrk_handler (const void *data);
+static void service_exit_schedwrk_handler (void *data);
 
-static int service_unlink_schedwrk_handler (const void *data) {
+static void service_unlink_schedwrk_handler (void *data) {
 	struct seus_handler_data *cb_data = (struct seus_handler_data *)data;
-	struct corosync_api_v1 *api = (struct corosync_api_v1 *)cb_data->api;
 
 	/*
 	 * Exit all ipc connections dependent on this service
 	 */
-	if (cs_ipcs_service_destroy (cb_data->service_engine) == -1)
-		return -1;
+	if (cs_ipcs_service_destroy (cb_data->service_engine) == -1) {
+		goto redo_this_function;
+	}
 
 	log_printf(LOGSYS_LEVEL_NOTICE,
 		"Service engine unloaded: %s\n",
@@ -592,15 +590,22 @@ static int service_unlink_schedwrk_handler (const void *data) {
 
 	lcr_ifact_release (cb_data->service_handle);
 
-	api->schedwrk_create (
-		&swrk_service_exit_handle,
-		&service_exit_schedwrk_handler,
-		data);
+	qb_loop_job_add(corosync_poll_handle_get(),
+		QB_LOOP_LOW,
+		data,
+		service_exit_schedwrk_handler);
+
+	return;
+
+ redo_this_function:
+	qb_loop_job_add(corosync_poll_handle_get(),
+		QB_LOOP_LOW,
+		data,
+		service_unlink_schedwrk_handler);
 
-	return 0;
 }
 
-static int service_exit_schedwrk_handler (const void *data) {
+static void service_exit_schedwrk_handler (void *data) {
 	int res;
 	static int current_priority = 0;
 	static int current_service_engine = 0;
@@ -624,24 +629,26 @@ static int service_exit_schedwrk_handler (const void *data) {
 		&service_handle);
 	if (res == 0) {
 		service_unlink_all_complete();
-		return (res);
+		return;
 	}
 
 	if (res == 1) {
 		cb_data->service_engine = current_service_engine;
 		cb_data->service_handle = service_handle;
 
-		api->schedwrk_create_nolock (
-			&swrk_service_unlink_handle,
-			&service_unlink_schedwrk_handler,
-			data);
-
-		return (0);
+		qb_loop_job_add(corosync_poll_handle_get(),
+			QB_LOOP_LOW,
+			data,
+			service_unlink_schedwrk_handler);
+		return;
 	}
 
-	return (res);
+	qb_loop_job_add(corosync_poll_handle_get(),
+		QB_LOOP_LOW,
+		data,
+		service_exit_schedwrk_handler);
 }
-		
+
 void corosync_service_unlink_all (
 	struct corosync_api_v1 *api,
 	void (*unlink_all_complete) (void))
@@ -662,10 +669,10 @@ void corosync_service_unlink_all (
 
 	cb_data.api = api;
 
-	api->schedwrk_create (
-		&swrk_service_exit_handle,
-		&service_exit_schedwrk_handler,
-		&cb_data);
+	qb_loop_job_add(corosync_poll_handle_get(),
+		QB_LOOP_LOW,
+		&cb_data,
+		service_exit_schedwrk_handler);
 }
 
 struct service_unlink_and_exit_data {
@@ -675,7 +682,7 @@ struct service_unlink_and_exit_data {
 	unsigned int ver;
 };
 
-static int service_unlink_and_exit_schedwrk_handler (void *data)
+static void service_unlink_and_exit_schedwrk_handler (void *data)
 {
 	struct service_unlink_and_exit_data *service_unlink_and_exit_data =
 		data;
@@ -688,8 +695,12 @@ static int service_unlink_and_exit_schedwrk_handler (void *data)
 
 	if (res == 0) {
 		free (service_unlink_and_exit_data);
+	} else {
+		qb_loop_job_add(corosync_poll_handle_get(),
+			QB_LOOP_LOW,
+			data,
+			service_unlink_and_exit_schedwrk_handler);
 	}
-	return (res);
 }
 
 typedef int (*schedwrk_cast) (const void *);
@@ -706,10 +717,10 @@ unsigned int corosync_service_unlink_and_exit (
 	service_unlink_and_exit_data->api = api;
 	service_unlink_and_exit_data->name = strdup (service_name);
 	service_unlink_and_exit_data->ver = service_ver;
-	
-	api->schedwrk_create (
-		&service_unlink_and_exit_data->handle,
-		(schedwrk_cast)service_unlink_and_exit_schedwrk_handler,
-		service_unlink_and_exit_data);
+
+	qb_loop_job_add(corosync_poll_handle_get(),
+		QB_LOOP_LOW,
+		service_unlink_and_exit_data,
+		service_unlink_and_exit_schedwrk_handler);
 	return (0);
 }
-- 
1.7.3.1

[PATCH 6/7] libqb: remove worker thread - keep to one thread.

[Angus Salkeld]

Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com&gt;
---
 exec/Makefile.am |    6 +-
 exec/totemsrp.c  |    1 -
 exec/totemudp.c  |  117 +-----------------------------
 exec/wthread.c   |  215 ------------------------------------------------------
 exec/wthread.h   |   67 -----------------
 5 files changed, 5 insertions(+), 401 deletions(-)
 delete mode 100644 exec/wthread.c
 delete mode 100644 exec/wthread.h

diff --git a/exec/Makefile.am b/exec/Makefile.am
index d5f71cc..e5ac234 100644
--- a/exec/Makefile.am
+++ b/exec/Makefile.am
@@ -37,12 +37,12 @@ INCLUDES		= -I$(top_builddir)/include -I$(top_srcdir)/include
$(nss_CFLAGS) $(rd
 
 TOTEM_SRC		= totemip.c totemnet.c totemudp.c \
 			  totemrrp.c totemsrp.c totemmrp.c totempg.c \
-			  crypto.c wthread.c tsafe.c
+			  crypto.c tsafe.c
 if BUILD_RDMA
 TOTEM_SRC		+= totemiba.c
 endif
 
-LOGSYS_SRC		= wthread.c logsys.c
+LOGSYS_SRC		= logsys.c
 LCRSO_SRC		= objdb.c vsf_ykd.c coroparse.c vsf_quorum.c
 LCRSO_OBJS		= $(LCRSO_SRC:%.c=%.o)
 LCRSO			= $(LCRSO_SRC:%.c=%.lcrso)
@@ -70,7 +70,7 @@ SHARED_LIBS_SO_TWO	= $(SHARED_LIBS:%.so.$(SONAME)=%.so.$(SOMAJOR))
 noinst_HEADERS		= apidef.h crypto.h mainconfig.h main.h tsafe.h \
 			  quorum.h service.h sync.h timer.h totemconfig.h \
 			  totemmrp.h totemnet.h totemudp.h totemiba.h totemrrp.h \
-			  totemsrp.h util.h vsf.h wthread.h schedwrk.h \
+			  totemsrp.h util.h vsf.h schedwrk.h \
 			  evil.h syncv2.h fsm.h
 
 EXTRA_DIST		= $(LCRSO_SRC)
diff --git a/exec/totemsrp.c b/exec/totemsrp.c
index 808ed7e..7595c0a 100644
--- a/exec/totemsrp.c
+++ b/exec/totemsrp.c
@@ -90,7 +90,6 @@
 #include "totemsrp.h"
 #include "totemrrp.h"
 #include "totemnet.h"
-#include "wthread.h"
 
 #include "crypto.h"
 
diff --git a/exec/totemudp.c b/exec/totemudp.c
index 1d032d6..a075a93 100644
--- a/exec/totemudp.c
+++ b/exec/totemudp.c
@@ -66,7 +66,6 @@
 #define LOGSYS_UTILS_ONLY 1
 #include <corosync/engine/logsys.h>
 #include "totemudp.h"
-#include "wthread.h"
 
 #include "crypto.h"
 
@@ -129,8 +128,6 @@ struct totemudp_instance {
 
 	int netif_bind_state;
 
-	struct worker_thread_group worker_thread_group;
-
 	void *context;
 
 	void (*totemudp_deliver_fn) (
@@ -1053,94 +1050,12 @@ static inline void mcast_sendmsg (
 	}
 }
 
-static void totemudp_mcast_thread_state_constructor (
-	void *totemudp_mcast_thread_state_in)
-{
-	struct totemudp_mcast_thread_state *totemudp_mcast_thread_state =
-		(struct totemudp_mcast_thread_state *)totemudp_mcast_thread_state_in;
-	memset (totemudp_mcast_thread_state, 0,
-		sizeof (totemudp_mcast_thread_state));
-
-	rng_make_prng (128, PRNG_SOBER,
-		&totemudp_mcast_thread_state->prng_state, NULL);
-}
-
-
-static void totemudp_mcast_worker_fn (void *thread_state, void *work_item_in)
-{
-	struct work_item *work_item = (struct work_item *)work_item_in;
-	struct totemudp_mcast_thread_state *totemudp_mcast_thread_state =
-		(struct totemudp_mcast_thread_state *)thread_state;
-	struct totemudp_instance *instance = work_item->instance;
-	struct msghdr msg_mcast;
-	unsigned char sheader[sizeof (struct security_header)];
-	int res = 0;
-	size_t buf_len;
-	struct iovec iovec_enc[2];
-	struct iovec iovec;
-	struct sockaddr_storage sockaddr;
-	int addrlen;
-
-	if (instance->totem_config->secauth == 1) {
-		iovec_enc[0].iov_base = (void *)sheader;
-		iovec_enc[0].iov_len = sizeof (struct security_header);
-		iovec_enc[1].iov_base = (void *)work_item->msg;
-		iovec_enc[1].iov_len = work_item->msg_len;
-
-		/*
-		 * Encrypt and digest the message
-		 */
-		encrypt_and_sign_worker (
-			instance,
-			totemudp_mcast_thread_state->iobuf,
-			&buf_len,
-			iovec_enc, 2);
-
-		iovec.iov_base = (void *)totemudp_mcast_thread_state->iobuf;
-		iovec.iov_len = buf_len;
-	} else {
-		iovec.iov_base = (void *)work_item->msg;
-		iovec.iov_len = work_item->msg_len;
-	}
-
-	totemip_totemip_to_sockaddr_convert(&instance->mcast_address,
-		instance->totem_interface->ip_port, &sockaddr, &addrlen);
-
-	msg_mcast.msg_name = &sockaddr;
-	msg_mcast.msg_namelen = addrlen;
-	msg_mcast.msg_iov = &iovec;
-	msg_mcast.msg_iovlen = 1;
-#if !defined(COROSYNC_SOLARIS)
-	msg_mcast.msg_control = 0;
-	msg_mcast.msg_controllen = 0;
-	msg_mcast.msg_flags = 0;
-#else
-	msg_mcast.msg_accrights = NULL;
-	msg_mcast.msg_accrightslen = 0;
-#endif
-
-	/*
-	 * Transmit multicast message
-	 * An error here is recovered by totemudp
-	 */
-	res = sendmsg (instance->totemudp_sockets.mcast_send, &msg_mcast,
-		MSG_NOSIGNAL);
-	if (res < 0) {
-		char error_str[100];
-		strerror_r (errno, error_str, sizeof(error_str));
-		log_printf (instance->totemudp_log_level_debug,
-				"sendmsg(mcast) failed (non-critical): %s\n", error_str);
-	}
-}
-
 int totemudp_finalize (
 	void *udp_context)
 {
 	struct totemudp_instance *instance = (struct totemudp_instance *)udp_context;
 	int res = 0;
 
-	worker_thread_group_exit (&instance->worker_thread_group);
-
 	if (instance->totemudp_sockets.mcast_recv > 0) {
 		close (instance->totemudp_sockets.mcast_recv);
 	 	qb_loop_poll_del (instance->totemudp_poll_handle,
@@ -1790,19 +1705,6 @@ int totemudp_initialize (
 	totemip_copy (&instance->mcast_address,
&instance->totem_interface->mcast_addr);
 	memset (instance->iov_buffer, 0, FRAME_SIZE_MAX);
 
-	/*
-	* If threaded send requested, initialize thread group data structure
-	*/
-	if (totem_config->threads) {
-		worker_thread_group_init (
-			&instance->worker_thread_group,
-			totem_config->threads, 128,
-			sizeof (struct work_item),
-			sizeof (struct totemudp_mcast_thread_state),
-			totemudp_mcast_thread_state_constructor,
-			totemudp_mcast_worker_fn);
-	}
-
 	instance->totemudp_poll_handle = poll_handle;
 
 	instance->totem_interface->bindnet.nodeid =
instance->totem_config->node_id;
@@ -1880,12 +1782,7 @@ int totemudp_recv_flush (void *udp_context)
 
 int totemudp_send_flush (void *udp_context)
 {
-	struct totemudp_instance *instance = (struct totemudp_instance *)udp_context;
-	int res = 0;
-
-	worker_thread_group_wait (&instance->worker_thread_group);
-
-	return (res);
+	return 0;
 }
 
 int totemudp_token_send (
@@ -1919,19 +1816,9 @@ int totemudp_mcast_noflush_send (
 	unsigned int msg_len)
 {
 	struct totemudp_instance *instance = (struct totemudp_instance *)udp_context;
-	struct work_item work_item;
 	int res = 0;
 
-	if (instance->totem_config->threads) {
-		work_item.msg = msg;
-		work_item.msg_len = msg_len;
-		work_item.instance = instance;
-
-		worker_thread_group_work_add (&instance->worker_thread_group,
-			&work_item);
-	} else {
-		mcast_sendmsg (instance, msg, msg_len);
-	}
+	mcast_sendmsg (instance, msg, msg_len);
 
 	return (res);
 }
diff --git a/exec/wthread.c b/exec/wthread.c
deleted file mode 100644
index 2fac4d4..0000000
--- a/exec/wthread.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (c) 2005 MontaVista Software, Inc.
- * Copyright (c) 2006, 2009 Red Hat, Inc.
- *
- * All rights reserved.
- *
- * Author: Steven Dake (sdake(a)redhat.com)
- *
- * This software licensed under BSD license, the text of which follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * - Neither the name of the MontaVista Software, Inc. nor the names of its
- *   contributors may be used to endorse or promote products derived from this
- *   software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Add work to a work group and have threads process the work
- * Provide blocking for all work to complete
- */
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <pthread.h>
-#include <errno.h>
-#include <corosync/cs_queue.h>
-
-#include "wthread.h"
-
-struct thread_data {
-	void *thread_state;
-	void *data;
-};
-
-struct worker_thread_t {
-	struct worker_thread_group *worker_thread_group;
-	pthread_mutex_t new_work_mutex;
-	pthread_cond_t new_work_cond;
-	pthread_cond_t cond;
-	pthread_mutex_t done_work_mutex;
-	pthread_cond_t done_work_cond;
-	pthread_t thread_id;
-	struct cs_queue queue;
-	void *thread_state;
-	struct thread_data thread_data;
-};
-
-static void *start_worker_thread (void *thread_data_in) {
-	struct thread_data *thread_data = (struct thread_data *)thread_data_in;
-	struct worker_thread_t *worker_thread =
-		(struct worker_thread_t *)thread_data->data;
-	void *data_for_worker_fn;
-
-	for (;;) {
-		pthread_mutex_lock (&worker_thread->new_work_mutex);
-		if (cs_queue_is_empty (&worker_thread->queue) == 1) {
-		pthread_cond_wait (&worker_thread->new_work_cond,
-			&worker_thread->new_work_mutex);
-		}
-
-		/*
-		 * We unlock then relock the new_work_mutex to allow the
-		 * worker function to execute and also allow new work to be
-		 * added to the work queue
-	  	 */
-		data_for_worker_fn = cs_queue_item_get (&worker_thread->queue);
-		pthread_mutex_unlock (&worker_thread->new_work_mutex);
-		worker_thread->worker_thread_group->worker_fn (worker_thread->thread_state,
data_for_worker_fn);
-		pthread_mutex_lock (&worker_thread->new_work_mutex);
-		cs_queue_item_remove (&worker_thread->queue);
-		pthread_mutex_unlock (&worker_thread->new_work_mutex);
-		pthread_mutex_lock (&worker_thread->done_work_mutex);
-		if (cs_queue_is_empty (&worker_thread->queue) == 1) {
-			pthread_cond_signal (&worker_thread->done_work_cond);
-		}
-		pthread_mutex_unlock (&worker_thread->done_work_mutex);
-	}
-	return (NULL);
-}
-
-int worker_thread_group_init (
-	struct worker_thread_group *worker_thread_group,
-	int threads,
-	int items_max,
-	int item_size,
-	int thread_state_size,
-	void (*thread_state_constructor)(void *),
-	void (*worker_fn)(void *thread_state, void *work_item))
-{
-	int i;
-
-	worker_thread_group->threadcount = threads;
-	worker_thread_group->last_scheduled = 0;
-	worker_thread_group->worker_fn = worker_fn;
-	worker_thread_group->threads = malloc (sizeof (struct worker_thread_t) *
-		threads);
-	if (worker_thread_group->threads == 0) {
-		return (-1);
-	}
-
-	for (i = 0; i < threads; i++) {
-		if (thread_state_size) {
-			worker_thread_group->threads[i].thread_state = malloc (thread_state_size);
-		} else {
-			worker_thread_group->threads[i].thread_state = NULL;
-		}
-		if (thread_state_constructor) {
-			thread_state_constructor (worker_thread_group->threads[i].thread_state);
-		}
-		worker_thread_group->threads[i].worker_thread_group = worker_thread_group;
-		pthread_mutex_init (&worker_thread_group->threads[i].new_work_mutex, NULL);
-		pthread_cond_init (&worker_thread_group->threads[i].new_work_cond, NULL);
-		pthread_mutex_init (&worker_thread_group->threads[i].done_work_mutex, NULL);
-		pthread_cond_init (&worker_thread_group->threads[i].done_work_cond, NULL);
-		cs_queue_init (&worker_thread_group->threads[i].queue, items_max,
-			item_size);
-
-		worker_thread_group->threads[i].thread_data.thread_state =
-			worker_thread_group->threads[i].thread_state;
-		worker_thread_group->threads[i].thread_data.data =
&worker_thread_group->threads[i];
-		pthread_create (&worker_thread_group->threads[i].thread_id,
-			NULL, start_worker_thread, &worker_thread_group->threads[i].thread_data);
-	}
-	return (0);
-}
-
-int worker_thread_group_work_add (
-	struct worker_thread_group *worker_thread_group,
-	void *item)
-{
-	int schedule;
-
-	schedule = (worker_thread_group->last_scheduled + 1) %
(worker_thread_group->threadcount);
-	worker_thread_group->last_scheduled = schedule;
-
-	pthread_mutex_lock (&worker_thread_group->threads[schedule].new_work_mutex);
-	if (cs_queue_is_full (&worker_thread_group->threads[schedule].queue)) {
-		pthread_mutex_unlock (&worker_thread_group->threads[schedule].new_work_mutex);
-		return (-1);
-	}
-	cs_queue_item_add (&worker_thread_group->threads[schedule].queue, item);
-	pthread_cond_signal (&worker_thread_group->threads[schedule].new_work_cond);
-	pthread_mutex_unlock (&worker_thread_group->threads[schedule].new_work_mutex);
-	return (0);
-}
-
-void worker_thread_group_wait (
-	struct worker_thread_group *worker_thread_group)
-{
-	int i;
-
-	for (i = 0; i < worker_thread_group->threadcount; i++) {
-		pthread_mutex_lock (&worker_thread_group->threads[i].done_work_mutex);
-		if (cs_queue_is_empty (&worker_thread_group->threads[i].queue) == 0) {
-			pthread_cond_wait (&worker_thread_group->threads[i].done_work_cond,
-				&worker_thread_group->threads[i].done_work_mutex);
-		}
-		pthread_mutex_unlock (&worker_thread_group->threads[i].done_work_mutex);
-	}
-}
-
-void worker_thread_group_exit (
-	struct worker_thread_group *worker_thread_group)
-{
-	int i;
-
-	for (i = 0; i < worker_thread_group->threadcount; i++) {
-		pthread_cancel (worker_thread_group->threads[i].thread_id);
-
-		/* Wait for worker thread to exit gracefully before destroying
-		 * mutexes and processing items in the queue etc.
-		 */
-		pthread_join (worker_thread_group->threads[i].thread_id, NULL);
-		pthread_mutex_destroy (&worker_thread_group->threads[i].new_work_mutex);
-		pthread_cond_destroy (&worker_thread_group->threads[i].new_work_cond);
-		pthread_mutex_destroy (&worker_thread_group->threads[i].done_work_mutex);
-		pthread_cond_destroy (&worker_thread_group->threads[i].done_work_cond);
-	}
-}
-void worker_thread_group_atsegv (
-	struct worker_thread_group *worker_thread_group)
-{
-	void *data_for_worker_fn;
-	struct worker_thread_t *worker_thread;
-	unsigned int i;
-
-	for (i = 0; i < worker_thread_group->threadcount; i++) {
-		worker_thread = &worker_thread_group->threads[i];
-		while (cs_queue_is_empty (&worker_thread->queue) == 0) {
-			data_for_worker_fn = cs_queue_item_get (&worker_thread->queue);
-			worker_thread->worker_thread_group->worker_fn (worker_thread->thread_state,
data_for_worker_fn);
-			cs_queue_item_remove (&worker_thread->queue);
-		}
-	}
-}
diff --git a/exec/wthread.h b/exec/wthread.h
deleted file mode 100644
index ef89594..0000000
--- a/exec/wthread.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2005 MontaVista Software, Inc.
- *
- * All rights reserved.
- *
- * Author: Steven Dake (sdake(a)redhat.com)
- *
- * This software licensed under BSD license, the text of which follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * - Neither the name of the MontaVista Software, Inc. nor the names of its
- *   contributors may be used to endorse or promote products derived from this
- *   software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef CONFIG_WTHREAD_H_DEFINED
-#define CONFIG_WTHREAD_H_DEFINED
-
-struct worker_thread_group {
-	int threadcount;
-	int last_scheduled;
-	struct worker_thread_t *threads;
-	void (*worker_fn) (void *thread_state, void *work_item);
-};
-
-extern int worker_thread_group_init (
-	struct worker_thread_group *worker_thread_group,
-	int threads,
-	int items_max,
-	int item_size,
-	int thread_state_size,
-	void (*thread_state_constructor)(void *),
-	void (*worker_fn)(void *thread_state, void *work_item));
-
-extern int worker_thread_group_work_add (
-	struct worker_thread_group *worker_thread_group,
-	void *item);
-
-extern void worker_thread_group_wait (
-	struct worker_thread_group *worker_thread_group);
-
-extern void worker_thread_group_exit (
-	struct worker_thread_group *worker_thread_group);
-
-extern void worker_thread_group_atsegv (
-	struct worker_thread_group *worker_thread_group);
-
-#endif /* WTHREAD_H_DEFINED */
-- 
1.7.3.1

[PATCH 7/7] libqb: remove tsafe.c

[Angus Salkeld]

Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com&gt;
---
 exec/Makefile.am |    4 +-
 exec/main.c      |    4 -
 exec/tsafe.c     | 1058 ------------------------------------------------------
 exec/tsafe.h     |   43 ---
 4 files changed, 2 insertions(+), 1107 deletions(-)
 delete mode 100644 exec/tsafe.c
 delete mode 100644 exec/tsafe.h

diff --git a/exec/Makefile.am b/exec/Makefile.am
index e5ac234..a0c708f 100644
--- a/exec/Makefile.am
+++ b/exec/Makefile.am
@@ -37,7 +37,7 @@ INCLUDES		= -I$(top_builddir)/include -I$(top_srcdir)/include
$(nss_CFLAGS) $(rd
 
 TOTEM_SRC		= totemip.c totemnet.c totemudp.c \
 			  totemrrp.c totemsrp.c totemmrp.c totempg.c \
-			  crypto.c tsafe.c
+			  crypto.c
 if BUILD_RDMA
 TOTEM_SRC		+= totemiba.c
 endif
@@ -67,7 +67,7 @@ SHARED_LIBS		= $(lib_LIBRARIES:%.a=%.so.$(SONAME))
 SHARED_LIBS_SO		= $(SHARED_LIBS:%.so.$(SONAME)=%.so)
 SHARED_LIBS_SO_TWO	= $(SHARED_LIBS:%.so.$(SONAME)=%.so.$(SOMAJOR))
 
-noinst_HEADERS		= apidef.h crypto.h mainconfig.h main.h tsafe.h \
+noinst_HEADERS		= apidef.h crypto.h mainconfig.h main.h \
 			  quorum.h service.h sync.h timer.h totemconfig.h \
 			  totemmrp.h totemnet.h totemudp.h totemiba.h totemrrp.h \
 			  totemsrp.h util.h vsf.h schedwrk.h \
diff --git a/exec/main.c b/exec/main.c
index c768055..9a0e76b 100644
--- a/exec/main.c
+++ b/exec/main.c
@@ -87,7 +87,6 @@
 #include "service.h"
 #include "schedwrk.h"
 #include "evil.h"
-#include "tsafe.h"
 
 LOGSYS_DECLARE_SYSTEM ("corosync",
 	LOGSYS_MODE_OUTPUT_STDERR | LOGSYS_MODE_THREADED | LOGSYS_MODE_FORK,
@@ -1384,9 +1383,6 @@ int main (int argc, char **argv, char **envp)
 		corosync_exit_error (flock_err);
 	}
 
-	/* callthis after our fork() */
-	tsafe_init (envp);
-
 	corosync_poll_handle = qb_loop_create ();
 
 	/*
diff --git a/exec/tsafe.c b/exec/tsafe.c
deleted file mode 100644
index 778cd9e..0000000
--- a/exec/tsafe.c
+++ /dev/null
@@ -1,1058 +0,0 @@
-/*
- * Copyright (c) 2010 Red Hat, Inc.
- *
- * All rights reserved.
- *
- * Author: Angus Salkeld <asalkeld(a)redhat.com&gt;
- *
- * This software licensed under BSD license, the text of which follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * - Neither the name of the MontaVista Software, Inc. nor the names of its
- *   contributors may be used to endorse or promote products derived from this
- *   software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <config.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include <assert.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <grp.h>
-#include <pwd.h>
-#include <netdb.h>
-#include <nl_types.h>
-#include <libgen.h>
-#include <dlfcn.h>
-#ifdef HAVE_UTMPX_H
-#include <utmpx.h>
-#endif /* HAVE_UTMPX_H */
-#include <search.h>
-#include <locale.h>
-#include <dirent.h>
-#include <pthread.h>
-
-#include <tsafe.h>
-
-#ifndef RTLD_NEXT
-#define RTLD_NEXT       ((void *) -1l)
-#endif /* !RTLD_NEXT */
-
-#ifdef COROSYNC_BSD
-#define CONST_ON_BSD const
-#else
-#define CONST_ON_BSD
-#endif /* COROSYNC_BSD */
-
-
-
-/*
- * The point of this file is to prevent people from using functions that are
- * known not to be thread safe (see man pthreads).
- */
-
-static int tsafe_disabled = 1;
-static int tsafe_inited = 0;
-static char **coro_environ;
-static void atfork_prepare (void);
-static void atfork_parent (void);
-static void atfork_child (void);
-
-#if defined(HAVE_PTHREAD_SPIN_LOCK)
-static pthread_spinlock_t tsafe_enabled_mutex;
-#else
-static pthread_mutex_t tsafe_enabled_mutex = PTHREAD_MUTEX_INITIALIZER;
-#endif
-
-
-void tsafe_init (char **envp)
-{
-	int i;
-	int size = 1;
-
-	for (i = 0; envp[i] != NULL; i++) {
-		size++;
-	}
-	coro_environ = malloc (sizeof (char*) * size);
-	for (i = 0; envp[i] != NULL; i++) {
-		coro_environ[i] = strdup (envp[i]);
-	}
-	coro_environ[size-1] = NULL;
-
-#if defined(HAVE_PTHREAD_SPIN_LOCK)
-	pthread_spin_init (&tsafe_enabled_mutex, 0);
-#endif
-
-	pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
-
-	tsafe_disabled = 1;
-	tsafe_inited = 1;
-}
-
-static void tsafe_lock (void)
-{
-#if defined(HAVE_PTHREAD_SPIN_LOCK)
-	pthread_spin_lock (&tsafe_enabled_mutex);
-#else
-	pthread_mutex_lock (&tsafe_enabled_mutex);
-#endif
-}
-
-static void tsafe_unlock (void)
-{
-#if defined(HAVE_PTHREAD_SPIN_LOCK)
-	pthread_spin_unlock (&tsafe_enabled_mutex);
-#else
-	pthread_mutex_unlock (&tsafe_enabled_mutex);
-#endif
-}
-
-void tsafe_off (void)
-{
-	tsafe_lock ();
-	tsafe_disabled = 1;
-	tsafe_unlock ();
-}
-
-void tsafe_on (void)
-{
-	tsafe_lock ();
-	tsafe_disabled = 0;
-	tsafe_unlock ();
-}
-
-static void atfork_prepare (void)
-{
-	tsafe_lock ();
-}
-
-static void atfork_parent (void)
-{
-	tsafe_unlock ();
-}
-
-static void atfork_child (void)
-{
-	if (tsafe_inited && !tsafe_disabled) {
-		tsafe_disabled = 1;
-	}
-	tsafe_unlock ();
-}
-
-static void* _get_real_func_(const char * func_name)
-{
-	void * func = NULL;
-#ifdef COROSYNC_BSD
-	static void *handle;
-	/*
-	 * On BSD we open the libc and retrive the pointer to "func_name".
-	 */
-	handle = dlopen("/usr/lib/libc.so", RTLD_LAZY);
-	func = dlsym (handle, func_name);
-#else
-	/*
-	 * On linux/Sun we can set func to next instance of "func_name",
-	 * which is the original "func_name"
-	 */
-	func = dlsym (RTLD_NEXT, func_name);
-#endif
-	return func;
-}
-
-#ifdef COROSYNC_LINUX
-/* we are implementing these functions only to know when to turn tsafe
- * on and off.
- */
-int pthread_create(pthread_t *thread, const pthread_attr_t *attr,
-                   void *(*start_routine) (void *), void *arg)
-{
-	static int (*real_pthread_create)(pthread_t *thread, const pthread_attr_t *attr,
-                   void *(*start_routine) (void *), void *arg) = NULL;
-
-	if (tsafe_inited && tsafe_disabled) {
-		tsafe_on ();
-	}
-
-	if (real_pthread_create == NULL) {
-		real_pthread_create = _get_real_func_ ("pthread_create");
-	}
-	return real_pthread_create (thread, attr, start_routine, arg);
-}
-
-#endif /* COROSYNC_LINUX */
-
-/*
- * we will allow this one as there doesn't seem to be any other option.
- * and only used in lcr
- * char *dlerror(void)
- * {
- * }
- */
-
-/* the following functions are needed so we are either banning them or
- * re-implementing them (depending on tsafe_on).
- */
-char *getenv(const char *name)
-{
-	static char* (*real_getenv)(const char *name) = NULL;
-	int entry;
-	int found = 0;
-	char *eq;
-	size_t name_len;
-
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_getenv == NULL) {
-			real_getenv = _get_real_func_ ("getenv");
-		}
-		return real_getenv (name);
-	}
-	for (entry = 0; coro_environ[entry] != NULL; entry++) {
-		eq = strchr (coro_environ[entry], '=');
-		name_len = eq - coro_environ[entry];
-
-		if (name_len == strlen (name) &&
-			strncmp(name, coro_environ[entry], name_len) == 0) {
-			found = 1;
-			break;
-		}
-	}
-
-	if (found) {
-		eq = strchr (coro_environ[entry], '=');
-		return (eq + 1);
-	}
-	return NULL;
-}
-
-/* all the following functions are banned and will result in an abort.
- */
-
-int setenv(const char *name, const char *value, int overwrite)
-{
-	static int (*real_setenv)(const char *name, const char *value, int overwrite) = NULL;
-
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_setenv == NULL) {
-			real_setenv = _get_real_func_ ("setenv");
-		}
-		return real_setenv (name, value, overwrite);
-	}
-	assert (0);
-	return 0;
-}
-
-int unsetenv(const char *name)
-{
-	static int (*real_unsetenv)(const char *name) = NULL;
-
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_unsetenv == NULL) {
-			real_unsetenv = _get_real_func_ ("unsetenv");
-		}
-		return real_unsetenv (name);
-	}
-	assert (0);
-	return 0;
-}
-
-int putenv(char *string)
-{
-	static int (*real_putenv)(char *string) = NULL;
-
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_putenv == NULL) {
-			real_putenv = _get_real_func_ ("putenv");
-		}
-		return real_putenv (string);
-	}
-	assert (0);
-	return 0;
-}
-
-char *asctime(const struct tm *tm)
-{
-	static char * (*real_asctime)(const struct tm *tm) = NULL;
-
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_asctime == NULL) {
-			real_asctime = _get_real_func_ ("asctime");
-		}
-		return real_asctime (tm);
-	}
-	assert(0);
-	return NULL;
-}
-
-char *basename (CONST_ON_BSD char *path)
-{
-	static char *(*real_basename)(CONST_ON_BSD char *path) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_basename == NULL) {
-			real_basename = _get_real_func_ ("basename");
-		}
-		return real_basename (path);
-	}
-	assert(0);
-	return NULL;
-}
-
-char *catgets(nl_catd catalog, int set_number,
-	int message_number, const char *message)
-{
-	return NULL;
-}
-
-#ifdef _XOPEN_SOURCE
-char *crypt(const char *key, const char *salt)
-{
-	static char *(*real_crypt)(const char *key, const char *salt) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_crypt == NULL) {
-			real_crypt = _get_real_func_ ("crypt");
-		}
-		return real_crypt (key, salt);
-	}
-	assert(0);
-	return NULL;
-}
-#endif /* _XOPEN_SOURCE */
-
-char *ctermid(char *s)
-{
-	static char *(*real_ctermid)(char *s) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_ctermid == NULL) {
-			real_ctermid = _get_real_func_ ("ctermid");
-		}
-		return real_ctermid (s);
-	}
-	assert(0);
-	return NULL;
-}
-
-char *ctime(const time_t *timep)
-{
-	static char *(*real_ctime)(const time_t *timep) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_ctime == NULL) {
-			real_ctime = _get_real_func_ ("ctime");
-		}
-		return real_ctime (timep);
-	}
-	assert(0);
-	return NULL;
-}
-
-char *dirname(CONST_ON_BSD char *path)
-{
-	static char *(*real_dirname)(CONST_ON_BSD char *path) = NULL;
-
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_dirname == NULL) {
-			real_dirname = _get_real_func_ ("dirname");
-		}
-		return real_dirname (path);
-	}
-	assert(0);
-	return NULL;
-}
-
-double drand48(void)
-{
-	static double (*real_drand48)(void) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_drand48 == NULL) {
-			real_drand48 = _get_real_func_ ("drand48");
-		}
-		return real_drand48 ();
-	}
-	assert(0);
-	return 0;
-}
-
-#ifdef _XOPEN_SOURCE
-void encrypt(char block[64], int edflag)
-{
-	static void (*real_encrypt)(char block[64], int edflag) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_encrypt == NULL) {
-			real_encrypt = _get_real_func_ ("encrypt");
-		}
-		return real_encrypt (block, edflag);
-	}
-	assert(0);
-}
-#endif /* _XOPEN_SOURCE */
-
-void endgrent(void)
-{
-	static void (*real_endgrent)(void) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_endgrent == NULL) {
-			real_endgrent = _get_real_func_ ("endgrent");
-		}
-		return real_endgrent ();
-	}
-	assert(0);
-}
-
-void endpwent(void)
-{
-	static void (*real_endpwent)(void) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_endpwent == NULL) {
-			real_endpwent = _get_real_func_ ("endpwent");
-		}
-		return real_endpwent ();
-	}
-	assert(0);
-}
-
-#ifdef _XOPEN_SOURCE
-struct tm *getdate(const char *string)
-{
-	static struct tm *(*real_getdate)(const char *string) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_getdate == NULL) {
-			real_getdate = _get_real_func_ ("getdate");
-		}
-		return real_getdate (string);
-	}
-	assert(0);
-	return NULL;
-}
-#endif /* _XOPEN_SOURCE */
-
-struct group *getgrent(void)
-{
-	static struct group *(*real_getgrent)(void) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_getgrent == NULL) {
-			real_getgrent = _get_real_func_ ("getgrent");
-		}
-		return real_getgrent ();
-	}
-	assert(0);
-	return NULL;
-}
-
-struct group *getgrgid(gid_t gid)
-{
-	static struct group *(*real_getgrgid)(gid_t gid) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_getgrgid == NULL) {
-			real_getgrgid = _get_real_func_ ("getgrgid");
-		}
-		return real_getgrgid (gid);
-	}
-	assert(0);
-	return NULL;
-}
-
-struct group *getgrnam(const char *name)
-{
-	static struct group *(*real_getgrnam)(const char *name) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_getgrnam == NULL) {
-			real_getgrnam = _get_real_func_ ("getgrnam");
-		}
-		return real_getgrnam (name);
-	}
-	assert(0);
-	return NULL;
-}
-
-struct hostent *gethostent(void)
-{
-	static struct hostent *(*real_gethostent)(void) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_gethostent == NULL) {
-			real_gethostent = _get_real_func_ ("gethostent");
-		}
-		return real_gethostent ();
-	}
-	assert(0);
-	return NULL;
-}
-
-char *getlogin(void)
-{
-	static char *(*real_getlogin)(void) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_getlogin == NULL) {
-			real_getlogin = _get_real_func_ ("getlogin");
-		}
-		return real_getlogin ();
-	}
-	assert(0);
-	return NULL;
-}
-
-struct netent *getnetbyaddr(uint32_t net, int type)
-{
-	static struct netent *(*real_getnetbyaddr)(uint32_t net, int type) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_getnetbyaddr == NULL) {
-			real_getnetbyaddr = _get_real_func_ ("getnetbyaddr");
-		}
-		return real_getnetbyaddr (net, type);
-	}
-	assert(0);
-	return NULL;
-}
-
-struct netent *getnetbyname(const char *name)
-{
-	static struct netent *(*real_getnetbyname)(const char *name) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_getnetbyname == NULL) {
-			real_getnetbyname = _get_real_func_ ("getnetbyname");
-		}
-		return real_getnetbyname (name);
-	}
-	assert(0);
-	return NULL;
-}
-
-struct netent *getnetent(void)
-{
-	static struct netent *(*real_getnetent)(void) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_getnetent == NULL) {
-			real_getnetent = _get_real_func_ ("getnetent");
-		}
-		return real_getnetent ();
-	}
-	assert(0);
-	return NULL;
-}
-
-struct protoent *getprotobyname(const char *name)
-{
-	static struct protoent *(*real_getprotobyname)(const char *name) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_getprotobyname == NULL) {
-			real_getprotobyname = _get_real_func_ ("getprotobyname");
-		}
-		return real_getprotobyname (name);
-	}
-	assert(0);
-	return NULL;
-}
-
-struct protoent *getprotobynumber(int proto)
-{
-	static struct protoent *(*real_getprotobynumber)(int proto) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_getprotobynumber == NULL) {
-			real_getprotobynumber = _get_real_func_ ("getprotobynumber");
-		}
-		return real_getprotobynumber (proto);
-	}
-	assert(0);
-	return NULL;
-}
-
-struct protoent *getprotoent(void)
-{
-	static struct protoent *(*real_getprotoent)(void) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_getprotoent == NULL) {
-			real_getprotoent = _get_real_func_ ("getprotoent");
-		}
-		return real_getprotoent ();
-	}
-	assert(0);
-	return NULL;
-}
-
-struct passwd *getpwent(void)
-{
-	static struct passwd *(*real_getpwent)(void) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_getpwent == NULL) {
-			real_getpwent = _get_real_func_ ("getpwent");
-		}
-		return real_getpwent ();
-	}
-	assert(0);
-	return NULL;
-}
-
-struct passwd *getpwnam(const char *name)
-{
-	static struct passwd *(*real_getpwnam)(const char *name) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_getpwnam == NULL) {
-			real_getpwnam = _get_real_func_ ("getpwnam");
-		}
-		return real_getpwnam (name);
-	}
-	assert(0);
-	return NULL;
-}
-
-struct passwd *getpwuid(uid_t uid)
-{
-	static struct passwd *(*real_getpwuid)(uid_t uid) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_getpwuid == NULL) {
-			real_getpwuid = _get_real_func_ ("getpwuid");
-		}
-		return real_getpwuid (uid);
-	}
-	assert(0);
-	return NULL;
-}
-
-struct servent *getservent(void)
-{
-	static struct servent *(*real_getservent)(void) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_getservent == NULL) {
-			real_getservent = _get_real_func_ ("getservent");
-		}
-		return real_getservent ();
-	}
-	assert(0);
-	return NULL;
-}
-
-struct servent *getservbyname(const char *name, const char *proto)
-{
-	static struct servent *(*real_getservbyname)(const char *name, const char *proto) =
NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_getservbyname == NULL) {
-			real_getservbyname = _get_real_func_ ("getservbyname");
-		}
-		return real_getservbyname (name, proto);
-	}
-	assert(0);
-	return NULL;
-}
-
-struct servent *getservbyport(int port, const char *proto)
-{
-	static struct servent *(*real_getservbyport)(int port, const char *proto) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_getservbyport == NULL) {
-			real_getservbyport = _get_real_func_ ("getservbyport");
-		}
-		return real_getservbyport (port, proto);
-	}
-	assert(0);
-	return NULL;
-}
-
-#ifdef HAVE_UTMPX_H
-struct utmpx *getutxent(void)
-{
-	static struct utmpx *(*real_getutxent)(void) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_getutxent == NULL) {
-			real_getutxent = _get_real_func_ ("getutxent");
-		}
-		return real_getutxent ();
-	}
-	assert(0);
-	return NULL;
-}
-
-struct utmpx *getutxid(const struct utmpx *a)
-{
-	static struct utmpx *(*real_getutxid)(const struct utmpx *a) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_getutxid == NULL) {
-			real_getutxid = _get_real_func_ ("getutxid");
-		}
-		return real_getutxid (a);
-	}
-	assert(0);
-	return NULL;
-}
-
-struct utmpx *getutxline(const struct utmpx *a)
-{
-	static struct utmpx *(*real_getutxline)(const struct utmpx *a) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_getutxline == NULL) {
-			real_getutxline = _get_real_func_ ("getutxline");
-		}
-		return real_getutxline (a);
-	}
-	assert(0);
-	return NULL;
-}
-#endif /* HAVE_UTMPX_H */
-
-struct tm *gmtime(const time_t *timep)
-{
-	static struct tm *(*real_gmtime)(const time_t *timep) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_gmtime == NULL) {
-			real_gmtime = _get_real_func_ ("gmtime");
-		}
-		return real_gmtime (timep);
-	}
-	assert(0);
-	return NULL;
-}
-
-int hcreate(size_t nel)
-{
-	static int (*real_hcreate)(size_t nel) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_hcreate == NULL) {
-			real_hcreate = _get_real_func_ ("hcreate");
-		}
-		return real_hcreate (nel);
-	}
-	assert(0);
-	return 0;
-}
-
-ENTRY *hsearch(ENTRY item, ACTION action)
-{
-	static ENTRY *(*real_hsearch)(ENTRY item, ACTION action) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_hsearch == NULL) {
-			real_hsearch = _get_real_func_ ("hsearch");
-		}
-		return real_hsearch (item, action);
-	}
-	assert(0);
-	return NULL;
-}
-
-void hdestroy(void)
-{
-	static void (*real_hdestroy)(void) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_hdestroy == NULL) {
-			real_hdestroy = _get_real_func_ ("hdestroy");
-		}
-		return real_hdestroy ();
-	}
-	assert(0);
-}
-
-char *inet_ntoa(struct in_addr in)
-{
-	static char *(*real_inet_ntoa)(struct in_addr in) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_inet_ntoa == NULL) {
-			real_inet_ntoa = _get_real_func_ ("inet_ntoa");
-		}
-		return real_inet_ntoa (in);
-	}
-	assert(0);
-	return NULL;
-}
-
-char *l64a(long value)
-{
-	static char *(*real_l64a)(long value) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_l64a == NULL) {
-			real_l64a = _get_real_func_ ("l64a");
-		}
-		return real_l64a (value);
-	}
-	assert(0);
-	return NULL;
-}
-
-double lgamma(double x)
-{
-	static double (*real_lgamma)(double x) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_lgamma == NULL) {
-			real_lgamma = _get_real_func_ ("lgamma");
-		}
-		return real_lgamma (x);
-	}
-	assert(0);
-	return 0;
-
-}
-
-float lgammaf(float x)
-{
-	static float (*real_lgammaf)(float x) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_lgammaf == NULL) {
-			real_lgammaf = _get_real_func_ ("lgammaf");
-		}
-		return real_lgammaf (x);
-	}
-	assert(0);
-	return 0;
-}
-
-#ifdef COROSYNC_LINUX
-long double lgammal(long double x)
-{
-	static long double (*real_lgammal)(long double x) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_lgammal == NULL) {
-			real_lgammal = _get_real_func_ ("lgammal");
-		}
-		return real_lgammal (x);
-	}
-	assert(0);
-	return 0;
-}
-#endif
-
-struct lconv *localeconv(void)
-{
-	static struct lconv *(*real_localeconv)(void) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_localeconv == NULL) {
-			real_localeconv = _get_real_func_ ("localeconv");
-		}
-		return real_localeconv ();
-	}
-	assert(0);
-	return NULL;
-}
-
-struct tm *localtime(const time_t *timep)
-{
-	static struct tm *(*real_localtime)(const time_t *timep) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_localtime == NULL) {
-			real_localtime = _get_real_func_ ("localtime");
-		}
-		return real_localtime (timep);
-	}
-	assert(0);
-	return NULL;
-}
-
-long int lrand48(void)
-{
-	static long int (*real_lrand48)(void) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_lrand48 == NULL) {
-			real_lrand48 = _get_real_func_ ("lrand48");
-		}
-		return real_lrand48 ();
-	}
-	assert(0);
-	return 0;
-}
-
-long int mrand48(void)
-{
-	static long int (*real_mrand48)(void) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_mrand48 == NULL) {
-			real_mrand48 = _get_real_func_ ("mrand48");
-		}
-		return real_mrand48 ();
-	}
-	assert(0);
-	return 0;
-}
-
-#ifdef COROSYNC_LINUX
-struct utmpx *pututxline(const struct utmpx *a)
-{
-	static struct utmpx *(*real_pututxline)(const struct utmpx *a) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_pututxline == NULL) {
-			real_pututxline = _get_real_func_ ("pututxline");
-		}
-		return real_pututxline (a);
-	}
-	assert(0);
-	return NULL;
-}
-#endif
-
-int rand(void)
-{
-	static int (*real_rand)(void) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_rand == NULL) {
-			real_rand = _get_real_func_ ("rand");
-		}
-		return real_rand ();
-	}
-	assert(0);
-	return 0;
-}
-
-
-struct dirent *readdir(DIR *dirp)
-{
-	static struct dirent *(*real_readdir)(DIR *dirp) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_readdir == NULL) {
-			real_readdir = _get_real_func_ ("readdir");
-		}
-		return real_readdir (dirp);
-	}
-	assert(0);
-	return NULL;
-}
-
-
-#ifdef COROSYNC_BSD
-int setgrent(void)
-{
-	static int (*real_setgrent)(void) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_setgrent == NULL) {
-			real_setgrent = _get_real_func_ ("setgrent");
-		}
-		return real_setgrent ();
-	}
-	assert(0);
-	return 0;
-}
-#else
-void setgrent(void)
-{
-	static void (*real_setgrent)(void) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_setgrent == NULL) {
-			real_setgrent = _get_real_func_ ("setgrent");
-		}
-		real_setgrent ();
-	}
-	assert(0);
-}
-#endif
-
-#ifdef _XOPEN_SOURCE
-void setkey(const char *key)
-{
-	static void (*real_setkey)(const char *key) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_setkey == NULL) {
-			real_setkey = _get_real_func_ ("setkey");
-		}
-		return real_setkey (key);
-	}
-	assert(0);
-}
-#endif /* _XOPEN_SOURCE */
-
-void setpwent(void)
-{
-	static void (*real_setpwent)(void) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_setpwent == NULL) {
-			real_setpwent = _get_real_func_ ("setpwent");
-		}
-		return real_setpwent ();
-	}
-	assert(0);
-}
-
-void setutxent(void)
-{
-	static void (*real_setutxent)(void) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_setutxent == NULL) {
-			real_setutxent = _get_real_func_ ("setutxent");
-		}
-		return real_setutxent ();
-	}
-	assert(0);
-}
-
-char *strsignal(int sig)
-{
-	static char *(*real_strsignal)(int sig) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_strsignal == NULL) {
-			real_strsignal = _get_real_func_ ("strsignal");
-		}
-		return real_strsignal (sig);
-	}
-	assert(0);
-	return NULL;
-}
-
-char *strtok(char *str, const char *delim)
-{
-	static char *(*real_strtok)(char *str, const char *delim) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_strtok == NULL) {
-			real_strtok = _get_real_func_ ("strtok");
-		}
-		return real_strtok (str, delim);
-	}
-	assert(0);
-	return NULL;
-}
-
-int system(const char *command)
-{
-	static int (*real_system)(const char *command) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_system == NULL) {
-			real_system = _get_real_func_ ("system");
-		}
-		return real_system (command);
-	}
-	assert(0);
-	return 0;
-}
-
-char *tmpnam(char *s)
-{
-	static char *(*real_tmpnam)(char *s) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_tmpnam == NULL) {
-			real_tmpnam = _get_real_func_ ("tmpnam");
-		}
-		return real_tmpnam (s);
-	}
-	assert(0);
-	return NULL;
-}
-
-char *ttyname(int fd)
-{
-	static char *(*real_ttyname)(int fd) = NULL;
-	if (!tsafe_inited || tsafe_disabled) {
-		if (real_ttyname == NULL) {
-			real_ttyname = _get_real_func_ ("ttyname");
-		}
-		return real_ttyname (fd);
-	}
-	assert(0);
-	return NULL;
-}
-
-
diff --git a/exec/tsafe.h b/exec/tsafe.h
deleted file mode 100644
index e5673d6..0000000
--- a/exec/tsafe.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2010 Red Hat, Inc.
- *
- * All rights reserved.
- *
- * Author: Angus Salkeld <asalkeld(a)redhat.com&gt;
- *
- * This software licensed under BSD license, the text of which follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * - Neither the name of the MontaVista Software, Inc. nor the names of its
- *   contributors may be used to endorse or promote products derived from this
- *   software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _TSAFE_H_
-#define _TSAFE_H_
-
-extern void tsafe_init (char **envp);
-extern void tsafe_off (void);
-extern void tsafe_on (void);
-
-#endif /* _TSAFE_H_ */
-
-- 
1.7.3.1

[Angus Salkeld]

On Tue, Nov 09, 2010 at 09:48:12AM +1100, Angus Salkeld wrote:
>  Hi
>   
lol - wrong list :)
sending to openais.


>  I have re worked these patches so that there is not an unneccessaryly
> large
>  amount of namespace changes (these can be done at any time later). this
>  should also help in cherry picking patches between branches. The hdb
>  patch was very extensive!
>  
>  This series makes corosync have only one pthread - the logsys thread.
>  
>  Regards
>  Angus
>  
>  _______________________________________________
>  quarterback-devel mailing list
>  quarterback-devel(a)lists.fedorahosted.org
>  https://fedorahosted.org/mailman/listinfo/quarterback-devel