[PATCH 1/3] Add a util library with locking wrappers.

[Angus Salkeld]

Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com&gt;
---
 include/os_base.h      |    1 +
 include/qb/Makefile.am |    3 +-
 include/qb/qbutil.h    |   55 ++++++++++++++++++++++++
 lib/Makefile.am        |    7 +++-
 lib/util.c             |  110 ++++++++++++++++++++++++++++++++++++++++++++++++
 man/Makefile.am        |    4 +-
 6 files changed, 176 insertions(+), 4 deletions(-)
 create mode 100644 include/qb/qbutil.h
 create mode 100644 lib/util.c

diff --git a/include/os_base.h b/include/os_base.h
index 0ff7e68..e0c2711 100644
--- a/include/os_base.h
+++ b/include/os_base.h
@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #endif /* HAVE_STDLIB_H */
 #include <stdio.h>
+#include <stdint.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif /* HAVE_UNISTD_H */
diff --git a/include/qb/Makefile.am b/include/qb/Makefile.am
index 0341274..aed2cc0 100644
--- a/include/qb/Makefile.am
+++ b/include/qb/Makefile.am
@@ -23,5 +23,6 @@ instdir 		= $(includedir)/qb/
 inst_HEADERS		= qbtsafe.h qbhdb.h qblist.h qbpoll.h \
 			  qbtimer.h qbplugin.h qbplugin_comp.h \
 			  qbipcc.h qbipcs.h qbwthread.h qbqueue.h \
-			  qblogsys.h qbhash.h qbipc_common.h
+			  qblogsys.h qbhash.h qbipc_common.h \
+			  qbutil.h
 
diff --git a/include/qb/qbutil.h b/include/qb/qbutil.h
new file mode 100644
index 0000000..d6c9987
--- /dev/null
+++ b/include/qb/qbutil.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * Author: Angus Salkeld <asalkeld(a)redhat.com&gt;
+ *
+ * libqb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * libqb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with libqb.  If not, see <http://www.gnu.org/licenses/>;.
+ */
+
+#ifndef QB_UTIL_H_DEFINED
+#define QB_UTIL_H_DEFINED
+
+typedef enum {
+	QB_THREAD_LOCK_SHORT,
+	QB_THREAD_LOCK_LONG,
+} qb_thread_lock_type_t;
+
+struct qb_thread_lock_s;
+typedef struct qb_thread_lock_s qb_thread_lock_t;
+
+/**
+ * create a new lock.
+ * @param type QB_THREAD_LOCK_SHORT == spinlock (where available, else mutex)
+ *        QB_THREAD_LOCK_LONG == mutex 
+ * @return pointer to qb_thread_lock_type_t or NULL on error.
+ */
+qb_thread_lock_t* qb_thread_lock_create (qb_thread_lock_type_t type);
+
+/**
+ * calls either pthread_mutex_lock() or pthread_spin_lock.
+ */
+int32_t qb_thread_lock (qb_thread_lock_t* tl);
+
+/**
+ * calls either pthread_mutex_trylock() or pthread_spin_trylock.
+ */
+int32_t qb_thread_trylock (qb_thread_lock_t* tl);
+
+/**
+ * calls either pthread_mutex_unlock() or pthread_spin_unlock.
+ */
+int32_t qb_thread_unlock (qb_thread_lock_t* tl);
+
+#endif /* QB_UTIL_H_DEFINED */
+
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 83b1f32..9582341 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -39,12 +39,17 @@ noinst_HEADERS          = ipc_int.h
 #
 
 lib_LTLIBRARIES		= libqbhash.la libqbpoll.la libqbtimer.la libqblogsys.la \
-			  libqbtsafe.la  libqbwthread.la libqbipcc.la libqbipcs.la
+			  libqbtsafe.la  libqbwthread.la libqbipcc.la libqbipcs.la \
+			  libqbutil.la
 
 lib_LIBRARIES		= libqbplugin.a
 
 libqbplugin_a_SOURCES	= plugin_loader.c
 
+libqbutil_la_CPPFLAGS	= -I$(top_builddir)/include -I$(top_srcdir)/include
+libqbutil_la_LDFLAGS	= -version-info 0:0:0
+libqbutil_la_SOURCES	= util.c
+
 libqbhash_la_CPPFLAGS	= -I$(top_builddir)/include -I$(top_srcdir)/include
 libqbhash_la_LDFLAGS	= -version-info 0:0:0
 libqbhash_la_SOURCES	= hash.c
diff --git a/lib/util.c b/lib/util.c
new file mode 100644
index 0000000..1fcac7f
--- /dev/null
+++ b/lib/util.c
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * All rights reserved.
+ *
+ * Author: Angus Salkeld <asalkeld(a)redhat.com&gt;
+ *
+ * libqb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * libqb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with libqb.  If not, see <http://www.gnu.org/licenses/>;.
+ */
+#include <config.h>
+
+#include "os_base.h"
+#include <sys/shm.h>
+#include <sys/mman.h>
+#include <pthread.h>
+#if _POSIX_THREAD_PROCESS_SHARED > 0
+#include <semaphore.h>
+#else
+#include <sys/sem.h>
+#endif
+#include <qb/qbutil.h>
+
+struct qb_thread_lock_s {
+	qb_thread_lock_type_t type;
+#if defined(HAVE_PTHREAD_SPIN_LOCK)
+	pthread_spinlock_t spinlock;
+#endif
+	pthread_mutex_t mutex;
+
+};
+
+
+qb_thread_lock_t* qb_thread_lock_create (qb_thread_lock_type_t type)
+{
+	struct qb_thread_lock_s* tl = malloc (sizeof (struct qb_thread_lock_s));
+	int res;
+
+#if defined(HAVE_PTHREAD_SPIN_LOCK)
+	if (type == QB_THREAD_LOCK_SHORT) {
+		tl->type = QB_THREAD_LOCK_SHORT;
+		res = pthread_spin_init (&tl->spinlock, 1);
+	} else
+#endif
+	{
+		tl->type = QB_THREAD_LOCK_LONG;
+		res = pthread_mutex_init (&tl->mutex, NULL);
+	}
+	if (res == 0) {
+		return tl;
+	} else {
+		free (tl);
+		return NULL;
+	}
+}
+
+int32_t qb_thread_lock (qb_thread_lock_t* tl)
+{
+	int res;
+#if defined(HAVE_PTHREAD_SPIN_LOCK)
+	if (tl->type == QB_THREAD_LOCK_SHORT) {
+		res = pthread_spin_lock (&tl->spinlock);
+	} else
+#endif
+	{
+		res = pthread_mutex_lock (&tl->mutex);
+	}
+	return (int32_t)res;
+}
+
+int32_t qb_thread_unlock (qb_thread_lock_t* tl)
+{
+	int res;
+#if defined(HAVE_PTHREAD_SPIN_LOCK)
+	if (tl->type == QB_THREAD_LOCK_SHORT) {
+		res = pthread_spin_unlock (&tl->spinlock);
+	} else
+#endif
+	{
+		res = pthread_mutex_unlock (&tl->mutex);
+	}
+	return (int32_t)res;
+}
+
+int32_t qb_thread_trylock (qb_thread_lock_t* tl)
+{
+	int res;
+#if defined(HAVE_PTHREAD_SPIN_LOCK)
+	if (tl->type == QB_THREAD_LOCK_SHORT) {
+		res = pthread_spin_trylock (&tl->spinlock);
+	} else
+#endif
+	{
+		res = pthread_mutex_trylock (&tl->mutex);
+	}
+	return (int32_t)res;
+}
+
+
+
diff --git a/man/Makefile.am b/man/Makefile.am
index 1ad6571..29b1668 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -24,7 +24,7 @@ dist_man_MANS = man3/qbtsafe.h.3 man3/qbhdb.h.3 man3/qblist.h.3 \
 	       	man3/qbpoll.h.3 man3/qbtimer.h.3 man3/qbplugin.h.3 \
 		man3/qbplugin_comp.h.3 man3/qbipcc.h.3 man3/qbipcs.h.3 \
 		man3/qbqueue.h.3 man3/qbwthread.h.3 man3/qblogsys.h.3 \
-		man3/qbhash.h.3 man3/qbipc_common.h.3
+		man3/qbhash.h.3 man3/qbipc_common.h.3 man3/qbutil.h.3
 
 inc_dir = $(top_srcdir)/include/qb
 
@@ -32,7 +32,7 @@ dependant_headers = $(inc_dir)/qbtsafe.h $(inc_dir)/qbhdb.h
$(inc_dir)/qblist.h
 		    $(inc_dir)/qbpoll.h $(inc_dir)/qbtimer.h $(inc_dir)/qbplugin.h \
 		    $(inc_dir)/qbplugin_comp.h $(inc_dir)/qbipcc.h $(inc_dir)/qbipc_common.h \
 		    $(inc_dir)/qbipcs.h $(inc_dir)/qbqueue.h $(inc_dir)/qbwthread.h \
-		    $(inc_dir)/qblogsys.h $(inc_dir)/qbhash.h
+		    $(inc_dir)/qblogsys.h $(inc_dir)/qbhash.h $(inc_dir)/qbutil.h
 
 $(dist_man_MANS): Doxyfile $(dependant_headers)
 	doxygen Doxyfile
-- 
1.6.6.1

[PATCH 2/3] Add a library logging function.

[Angus Salkeld]

Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com&gt;
---
 include/qb/qbutil.h |   12 ++++++++++++
 lib/Makefile.am     |    2 +-
 lib/util.c          |   32 ++++++++++++++++++++++++++++++++
 lib/util_int.h      |   35 +++++++++++++++++++++++++++++++++++
 4 files changed, 80 insertions(+), 1 deletions(-)
 create mode 100644 lib/util_int.h

diff --git a/include/qb/qbutil.h b/include/qb/qbutil.h
index d6c9987..09ffa65 100644
--- a/include/qb/qbutil.h
+++ b/include/qb/qbutil.h
@@ -51,5 +51,17 @@ int32_t qb_thread_trylock (qb_thread_lock_t* tl);
  */
 int32_t qb_thread_unlock (qb_thread_lock_t* tl);
 
+
+typedef void (* qb_util_log_fn_t)(const char *file_name,
+	int32_t file_line,
+	int32_t severity,
+	const char *msg);
+
+/**
+ * Use this function output libqb internal log message as you wish.
+ */
+void qb_util_set_log_function (qb_util_log_fn_t fn);
+
+
 #endif /* QB_UTIL_H_DEFINED */
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9582341..ee2a7c4 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -21,7 +21,7 @@
 
 MAINTAINERCLEANFILES	= Makefile.in
 
-noinst_HEADERS          = ipc_int.h
+noinst_HEADERS          = ipc_int.h util_int.h
 
 #pkgconfigdir		= $(libdir)/pkgconfig
 #pkgconfig_DATA		= libqbhash.pc
diff --git a/lib/util.c b/lib/util.c
index 1fcac7f..f9acd5b 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -21,6 +21,8 @@
 #include <config.h>
 
 #include "os_base.h"
+#include "util_int.h"
+#include <stdarg.h>
 #include <sys/shm.h>
 #include <sys/mman.h>
 #include <pthread.h>
@@ -107,4 +109,34 @@ int32_t qb_thread_trylock (qb_thread_lock_t* tl)
 }
 
 
+/*
+ * ---------------------------------------------------
+ * Logging functions for the library.
+ */
+static qb_util_log_fn_t real_log_fn = NULL;
+
+void _qb_util_log (const char *file_name,
+	int32_t file_line,
+	int32_t severity,
+	const char *format,
+	...)
+{
+	if (real_log_fn) {
+		va_list ap;
+		char msg[256];
+
+		va_start (ap, format);
+		vsnprintf (msg, 256, format, ap);
+		va_end (ap);
+
+		real_log_fn (file_name, file_line, severity, msg);
+	}
+}
+
+
+void qb_util_set_log_function (qb_util_log_fn_t fn)
+{
+	real_log_fn = fn;
+}
+
 
diff --git a/lib/util_int.h b/lib/util_int.h
new file mode 100644
index 0000000..d91f205
--- /dev/null
+++ b/lib/util_int.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * Author: Angus Salkeld <asalkeld(a)redhat.com&gt;
+ *
+ * libqb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * libqb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with libqb.  If not, see <http://www.gnu.org/licenses/>;.
+ */
+
+#ifndef QB_UTIL_INT_H_DEFINED
+#define QB_UTIL_INT_H_DEFINED
+
+#define qb_util_log(severity, args...)				\
+do {							\
+	_qb_util_log (__FILE__,  __LINE__, severity, ##args);	\
+} while(0)
+
+void _qb_util_log (const char *file_name,
+	int32_t file_line,
+	int32_t severity,
+	const char *format,
+	...);
+
+#endif /* QB_UTIL_INT_H_DEFINED */
+
-- 
1.6.6.1

[PATCH 3/3] use new interanl logging functions

[Angus Salkeld]

Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com&gt;
---
 include/qb/qbipcs.h |   12 ------------
 lib/Makefile.am     |    5 +++++
 lib/hash.c          |    3 +++
 lib/ipcc.c          |    1 +
 lib/ipcs.c          |   36 +++++++++++-------------------------
 lib/poll.c          |    1 +
 lib/util_int.h      |    4 +++-
 tests/bms.c         |   18 ++++++++----------
 8 files changed, 32 insertions(+), 48 deletions(-)

diff --git a/include/qb/qbipcs.h b/include/qb/qbipcs.h
index 6a35792..73ad6e2 100644
--- a/include/qb/qbipcs.h
+++ b/include/qb/qbipcs.h
@@ -41,9 +41,6 @@ struct qb_ipcs_init_state {
 	const struct sched_param *sched_param;
 	void *(*malloc) (size_t size);
 	void (*free) (void *ptr);
-        void (*old_log_printf) (
-                const char *format,
-                ...) __attribute__((format(printf, 1, 2)));
 	int (*service_available)(unsigned int service);
 	int (*private_data_size_get)(unsigned int service);
 	int (*security_valid)(int uid, int gid);
@@ -60,21 +57,12 @@ struct qb_ipcs_init_state {
 	qb_ipcs_init_fn_lvalue (*init_fn_get)(unsigned int service);
 	qb_ipcs_exit_fn_lvalue (*exit_fn_get)(unsigned int service);
 	qb_ipcs_handler_fn_lvalue (*handler_fn_get)(unsigned int service, unsigned int id);
-	/* v2 functions */
 	qb_hdb_handle_t (*stats_create_connection) (const char* name,
 		pid_t pid, int fd);
 	void (*stats_destroy_connection) (qb_hdb_handle_t handle);
 	void (*stats_update_value) (qb_hdb_handle_t handle,
 		const char *name, const void *value, size_t value_len);
 	void (*stats_increment_value) (qb_hdb_handle_t handle, const char* name);
-	void (*log_printf) (
-		unsigned int rec_ident,
-		const char *function_name,
-		const char *file_name,
-		int file_line,
-		const char *format,
-		...) __attribute__((format(printf, 5, 6)));
-	int log_subsys_id;
 	void (*stats_decrement_value) (qb_hdb_handle_t handle, const char* name);
 };
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index ee2a7c4..90c6248 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -53,10 +53,12 @@ libqbutil_la_SOURCES	= util.c
 libqbhash_la_CPPFLAGS	= -I$(top_builddir)/include -I$(top_srcdir)/include
 libqbhash_la_LDFLAGS	= -version-info 0:0:0
 libqbhash_la_SOURCES	= hash.c
+libqbhash_la_LIBADD	= libqbutil.la
 
 libqbpoll_la_CPPFLAGS	= -I$(top_builddir)/include -I$(top_srcdir)/include
 libqbpoll_la_LDFLAGS	= -version-info 0:0:0
 libqbpoll_la_SOURCES	= poll.c
+libqbpoll_la_LIBADD	= libqbutil.la
 
 libqbtimer_la_CPPFLAGS	= -I$(top_builddir)/include -I$(top_srcdir)/include
 libqbtimer_la_LDFLAGS	= -version-info 0:0:0
@@ -73,12 +75,15 @@ libqbtsafe_la_SOURCES	= tsafe.c
 libqbwthread_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
 libqbwthread_la_LDFLAGS	= -version-info 0:0:0
 libqbwthread_la_SOURCES	= wthread.c
+libqbwthread_la_LIBADD	= libqbutil.la
 
 libqbipcc_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
 libqbipcc_la_LDFLAGS	= -version-info 0:0:0
 libqbipcc_la_SOURCES	= ipcc.c
+libqbipcc_la_LIBADD	= libqbutil.la
 
 libqbipcs_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
 libqbipcs_la_LDFLAGS	= -version-info 0:0:0
 libqbipcs_la_SOURCES	= ipcs.c
+libqbipcs_la_LIBADD	= libqbutil.la
 
diff --git a/lib/hash.c b/lib/hash.c
index cdd2319..b0800d3 100644
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -24,6 +24,7 @@
 #include <config.h>
 
 #include "os_base.h"
+#include "util_int.h"
 
 #include <qb/qbhdb.h>
 #include <qb/qblist.h>
@@ -87,10 +88,12 @@ int32_t qb_hash_initialize (
 
 	res = qb_hdb_handle_create (&qb_hash_handle_db, size, handle);
 	if (res != 0) {
+		qb_util_log(LOG_ERR, "could not create handle (%s)", strerror(errno));
 		return (res);
 	}
 	res = qb_hdb_handle_get (&qb_hash_handle_db, *handle, (void *)&hash_table);
 	if (res != 0) {
+		qb_util_log(LOG_ERR, "could not get handle (%s)", strerror(errno));
 		goto hash_destroy;
 	}
 
diff --git a/lib/ipcc.c b/lib/ipcc.c
index 062c70d..fb7d578 100644
--- a/lib/ipcc.c
+++ b/lib/ipcc.c
@@ -28,6 +28,7 @@
 #include <qb/qbipcc.h>
 #include <qb/qbhdb.h>
 #include "ipc_int.h"
+#include "util_int.h"
 
 #if _POSIX_THREAD_PROCESS_SHARED > 0
 #include <semaphore.h>
diff --git a/lib/ipcs.c b/lib/ipcs.c
index 4265937..5824c83 100644
--- a/lib/ipcs.c
+++ b/lib/ipcs.c
@@ -37,10 +37,7 @@
 #include <qb/qbhdb.h>
 #include <qb/qbipcs.h>
 #include "ipc_int.h"
-
-//#define LOGSYS_UTILS_ONLY 1
-#include <syslog.h>
-//#include <qb/engine/logsys.h>
+#include "util_int.h"
 
 #if _POSIX_THREAD_PROCESS_SHARED > 0
 #include <semaphore.h>
@@ -141,16 +138,6 @@ static void ipc_disconnect (struct conn_info *conn_info);
 static void msg_send (void *conn, const struct iovec *iov, unsigned int iov_len,
 		      int locked);
 
-#define log_printf(level, format, args...) \
-do { \
-        api->log_printf ( level, \
-                /*LOGSYS_ENCODE_RECID(level, */\
-                                    /*api->log_subsys_id,*/ \
-                                    /*LOGSYS_RECID_LOG),*/ \
-                __FUNCTION__, __FILE__, __LINE__, \
-                (const char *)format, ##args); \
-} while (0)
-
 static qb_hdb_handle_t dummy_stats_create_connection (
 	const char *name,
 	pid_t pid,
@@ -819,11 +806,11 @@ retry_recv:
 
 #else /* no credentials */
 	authenticated = 1;
- 	log_printf (LOG_ERR, "Platform does not support IPC authentication.  Using no
authentication\n");
+ 	qb_util_log (LOG_ERR, "Platform does not support IPC authentication.  Using no
authentication\n");
 #endif /* no credentials */
 
 	if (authenticated == 0) {
-		log_printf (LOG_ERR, "Invalid IPC credentials.\n");
+		qb_util_log (LOG_ERR, "Invalid IPC credentials.\n");
 		ipc_disconnect (conn_info);
 		return (-1);
  	}
@@ -898,7 +885,6 @@ extern void qb_ipcs_ipc_init (
 	int res;
 
 	api = init_state;
-	api->old_log_printf	= NULL;
 	api->stats_create_connection	= dummy_stats_create_connection;
 	api->stats_destroy_connection	= dummy_stats_destroy_connection;
 	api->stats_update_value		= dummy_stats_update_value;
@@ -913,7 +899,7 @@ extern void qb_ipcs_ipc_init (
 	server_fd = socket (PF_LOCAL, SOCK_STREAM, 0);
 #endif
 	if (server_fd == -1) {
-		log_printf (LOG_CRIT, "Cannot create client connections socket.\n");
+		qb_util_log (LOG_CRIT, "Cannot create client connections socket.\n");
 		api->fatal_error ("Can't create library listen socket");
 	};
 
@@ -921,7 +907,7 @@ extern void qb_ipcs_ipc_init (
 	if (res == -1) {
 		char error_str[100];
 		strerror_r (errno, error_str, 100);
-		log_printf (LOG_CRIT, "Could not set non-blocking operation on server socket:
%s\n", error_str);
+		qb_util_log (LOG_CRIT, "Could not set non-blocking operation on server socket:
%s\n", error_str);
 		api->fatal_error ("Could not set non-blocking operation on server
socket");
 	}
 
@@ -938,7 +924,7 @@ extern void qb_ipcs_ipc_init (
 		struct stat stat_out;
 		res = stat (SOCKETDIR, &stat_out);
 		if (res == -1 || (res == 0 && !S_ISDIR(stat_out.st_mode))) {
-			log_printf (LOG_CRIT, "Required directory not present %s\n", SOCKETDIR);
+			qb_util_log (LOG_CRIT, "Required directory not present %s\n", SOCKETDIR);
 			api->fatal_error ("Please create required directory.");
 		}
 		sprintf (un_addr.sun_path, "%s/%s", SOCKETDIR, api->socket_name);
@@ -950,7 +936,7 @@ extern void qb_ipcs_ipc_init (
 	if (res) {
 		char error_str[100];
 		strerror_r (errno, error_str, 100);
-		log_printf (LOG_CRIT, "Could not bind AF_UNIX (%s): %s.\n", un_addr.sun_path,
error_str);
+		qb_util_log (LOG_CRIT, "Could not bind AF_UNIX (%s): %s.\n",
un_addr.sun_path, error_str);
 		api->fatal_error ("Could not bind to AF_UNIX socket\n");
 	}
 
@@ -1180,10 +1166,10 @@ static int flow_control_event_send (struct conn_info *conn_info,
char event)
 
 	if (conn_info->flow_control_state != new_fc) {
 		if (new_fc == 1) {
-			log_printf (LOG_INFO, "Enabling flow control for %d, event %d\n",
+			qb_util_log (LOG_INFO, "Enabling flow control for %d, event %d\n",
 				conn_info->client_pid, event);
 		} else {
-			log_printf (LOG_INFO, "Disabling flow control for %d, event %d\n",
+			qb_util_log (LOG_INFO, "Disabling flow control for %d, event %d\n",
 				conn_info->client_pid, event);
 		}
 		conn_info->flow_control_state = new_fc;
@@ -1446,7 +1432,7 @@ retry_accept:
 	if (new_fd == -1) {
 		char error_str[100];
 		strerror_r (errno, error_str, 100);
-		log_printf (LOG_ERR,
+		qb_util_log (LOG_ERR,
 			"Could not accept Library connection: %s\n", error_str);
 		return (0); /* This is an error, but -1 would indicate disconnect from poll loop */
 	}
@@ -1455,7 +1441,7 @@ retry_accept:
 	if (res == -1) {
 		char error_str[100];
 		strerror_r (errno, error_str, 100);
-		log_printf (LOG_ERR,
+		qb_util_log (LOG_ERR,
 			"Could not set non-blocking operation on library connection: %s\n",
 			error_str);
 		close (new_fd);
diff --git a/lib/poll.c b/lib/poll.c
index f1fed9d..3d4a322 100644
--- a/lib/poll.c
+++ b/lib/poll.c
@@ -32,6 +32,7 @@
 #include <qb/qbpoll.h>
 #include <qb/qblist.h>
 #include "tlist.h"
+#include "util_int.h"
 
 typedef int (*dispatch_fn_t) (qb_hdb_handle_t hdb_handle, int fd, int revents, void
*data);
 
diff --git a/lib/util_int.h b/lib/util_int.h
index d91f205..76a3b84 100644
--- a/lib/util_int.h
+++ b/lib/util_int.h
@@ -20,6 +20,8 @@
 #ifndef QB_UTIL_INT_H_DEFINED
 #define QB_UTIL_INT_H_DEFINED
 
+#include <syslog.h>
+
 #define qb_util_log(severity, args...)				\
 do {							\
 	_qb_util_log (__FILE__,  __LINE__, severity, ##args);	\
@@ -29,7 +31,7 @@ void _qb_util_log (const char *file_name,
 	int32_t file_line,
 	int32_t severity,
 	const char *format,
-	...);
+	...) __attribute__((format(printf, 4, 5)));
 
 #endif /* QB_UTIL_INT_H_DEFINED */
 
diff --git a/tests/bms.c b/tests/bms.c
index f197e4f..4bb6985 100644
--- a/tests/bms.c
+++ b/tests/bms.c
@@ -42,6 +42,7 @@
 #include <stdarg.h>
 #include <sched.h>
 
+#include <qb/qbutil.h>
 #include <qb/qbpoll.h>
 #include <qb/qbipcs.h>
 
@@ -183,16 +184,12 @@ static void bms_sending_allowed_release (void
*sending_allowed_private_data)
 {
 }
 
-static void ipc_log_printf (const char *format, ...) __attribute__((format(printf, 1,
2)));
-static void ipc_log_printf (const char *format, ...)
+static void ipc_log_fn(const char *file_name,
+	int32_t file_line,
+	int32_t severity,
+	const char *msg)
 {
-	va_list ap;
-
-	va_start (ap, format);
-
-	vfprintf (stderr, format, ap);
-
-	va_end (ap);
+	fprintf (stderr, "%s:%d [%d] %s", file_name, file_line, severity, msg);
 }
 
 static void ipc_fatal_error (const char *error_msg)
@@ -264,7 +261,6 @@ struct qb_ipcs_init_state ipc_init_state = {
 	.sched_param			= NULL,
 	.malloc				= malloc,
 	.free				= free,
-	.log_printf			= ipc_log_printf,
 	.fatal_error			= ipc_fatal_error,
 	.security_valid			= bms_security_valid,
 	.service_available		= bms_service_available,
@@ -324,6 +320,8 @@ int main (int argc, char *argv[])
 	}
 	signal (SIGUSR1, sigusr1_handler);
 
+	qb_util_set_log_function (ipc_log_fn);
+
         bms_poll_handle = qb_poll_create ();
 
 	qb_ipcs_ipc_init (&ipc_init_state);
-- 
1.6.6.1