Remove message queues

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
ClusterLabs · May 28, 2012 · 70a9623 · 70a9623
1 parent aaae0a3
commit 70a9623
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 936 deletions.
diff --git a/docs/mainpage.h b/docs/mainpage.h
@@ -3,11 +3,13 @@
  *
  * @section overview Overview
  *
- * libqb is a thread-safe library with the primary purpose of providing high performance client server reusable features.
+ * libqb is a thread-safe library with the primary purpose of providing high
+ * performance client server reusable features.
  *
  * It provides high performance ipc, and poll.
  *
- * We don't intend be an all encompassing library, but instead provide very specially focused APIs that are highly
+ * We don't intend be an all encompassing library, but instead provide very
+ * specially focused APIs that are highly
  *
  * tuned for maximum performance for client/server applications.
  *
@@ -74,8 +76,6 @@
  * and service applications.  It supports many features including:
  * - Multiple transport implementations
  *   -# Shared memory implementation for very high performance.
- *   -# Posix Message queues
- *   -# SysV Message queues
  *   -# Unix sockets
  * - A synchronous request/response channel and asynchronous response channel per ipc connection.
  * - User defined private data per IPC connection.

diff --git a/examples/ipcserver.c b/examples/ipcserver.c
@@ -300,15 +300,9 @@ main(int32_t argc, char *argv[])
 		case 'm':
 			ipc_type = QB_IPC_SHM;
 			break;
-		case 's':
-			ipc_type = QB_IPC_SYSV_MQ;
-			break;
 		case 'u':
 			ipc_type = QB_IPC_SOCKET;
 			break;
-		case 'p':
-			ipc_type = QB_IPC_POSIX_MQ;
-			break;
 		case 'g':
 			use_glib = QB_TRUE;
 			break;

diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -71,14 +71,6 @@ source_to_lint		= util.c hdb.c ringbuffer.c ringbuffer_helper.c \
 libqb_la_SOURCES	= $(source_to_lint) unix.c
 libqb_la_LIBADD	        = @LTLIBOBJS@
 
-if HAVE_SYSV_MQ
-  libqb_la_SOURCES+=ipc_sysv_mq.c
-endif
-
-if HAVE_POSIX_MQ
-  libqb_la_SOURCES+=ipc_posix_mq.c
-endif
-
 if HAVE_SEM_TIMEDWAIT
 else
   libqb_la_SOURCES+=rpl_sem.c

diff --git a/lib/ipc_int.h b/lib/ipc_int.h
@@ -25,9 +25,6 @@
 #include "os_base.h"
 
 #include <dirent.h>
-#ifdef HAVE_MQUEUE_H
-#include <mqueue.h>
-#endif /* HAVE_MQUEUE_H */
 #include <qb/qblist.h>
 #include <qb/qbloop.h>
 #include <qb/qbipcc.h>
@@ -76,16 +73,6 @@ struct qb_ipc_one_way {
 			void* shared_data;
 			char shared_file_name[NAME_MAX];
 		} us;
-#ifdef HAVE_MQUEUE_H
-		struct {
-			mqd_t q;
-			char name[NAME_MAX];
-		} pmq;
-#endif
-		struct {
-			int32_t q;
-			int32_t key;
-		} smq;
 		struct {
 			qb_ringbuffer_t *rb;
 		} shm;
@@ -122,9 +109,7 @@ int32_t qb_ipc_us_recv_ready(struct qb_ipc_one_way *one_way, int32_t ms_timeout)
 
 void qb_ipcc_us_sock_close(int32_t sock);
 
-int32_t qb_ipcc_pmq_connect(struct qb_ipcc_connection *c, struct qb_ipc_connection_response * response);
 int32_t qb_ipcc_us_connect(struct qb_ipcc_connection *c, struct qb_ipc_connection_response * response);
-int32_t qb_ipcc_smq_connect(struct qb_ipcc_connection *c, struct qb_ipc_connection_response * response);
 int32_t qb_ipcc_shm_connect(struct qb_ipcc_connection *c, struct qb_ipc_connection_response * response);
 
 struct qb_ipcs_service;
@@ -192,9 +177,7 @@ struct qb_ipcs_connection {
 	struct qb_ipcs_connection_stats_2 stats;
 };
 
-void qb_ipcs_pmq_init(struct qb_ipcs_service *s);
 void qb_ipcs_us_init(struct qb_ipcs_service *s);
-void qb_ipcs_smq_init(struct qb_ipcs_service *s);
 void qb_ipcs_shm_init(struct qb_ipcs_service *s);
 
 int32_t qb_ipcs_us_publish(struct qb_ipcs_service *s);