This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
Cluster Project branch, master, updated. cluster-2.99.00-8-g0517650
- From: teigland at sourceware dot org
- To: cluster-cvs at sources dot redhat dot com, cluster-devel at redhat dot com
- Date: 30 Apr 2008 14:21:53 -0000
- Subject: Cluster Project branch, master, updated. cluster-2.99.00-8-g0517650
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=0517650a953e37dade072c55d02fe2a5d990a0ec
The branch, master has been updated
via 0517650a953e37dade072c55d02fe2a5d990a0ec (commit)
from ec62ff54c098e4942db8d74a33fddf5a18a2a03d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0517650a953e37dade072c55d02fe2a5d990a0ec
Author: David Teigland <teigland@redhat.com>
Date: Wed Apr 30 09:15:41 2008 -0500
dlm_controld: fix build problems in previous commit
Signed-off-by: David Teigland <teigland@redhat.com>
-----------------------------------------------------------------------
Summary of changes:
dlm/tool/main.c | 2 +-
group/dlm_controld/Makefile | 2 +-
group/dlm_controld/main.c | 13 ++++++++-----
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/dlm/tool/main.c b/dlm/tool/main.c
index 423863c..fcd6b35 100644
--- a/dlm/tool/main.c
+++ b/dlm/tool/main.c
@@ -395,7 +395,7 @@ void do_spaces(void)
static void do_deadlock_check(char *name)
{
- dlmc_deadlk_check(name);
+ /* dlmc_deadlk_check(name); */
}
int main(int argc, char **argv)
diff --git a/group/dlm_controld/Makefile b/group/dlm_controld/Makefile
index e5f88b0..94d4515 100644
--- a/group/dlm_controld/Makefile
+++ b/group/dlm_controld/Makefile
@@ -44,7 +44,7 @@ LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
LDFLAGS += -L${dlmlibdir} -L${dlmlibcontroldir} -ldlm -ldlmcontrol
LDFLAGS += -L${fencedlibdir} -lfenced
LDFLAGS += -L${openaislibdir} -lcpg -lSaCkpt
-LDFLAGS += -L../lib -lgroup
+LDFLAGS += -L../lib -lgroup -lpthread
${TARGET}: ${OBJS}
diff --git a/group/dlm_controld/main.c b/group/dlm_controld/main.c
index 7417071..5646df1 100644
--- a/group/dlm_controld/main.c
+++ b/group/dlm_controld/main.c
@@ -12,6 +12,7 @@
#include "dlm_daemon.h"
#include "config.h"
+#include <pthread.h>
#include <linux/dlmconstants.h>
#include <linux/netlink.h>
#include <linux/genetlink.h>
@@ -27,6 +28,8 @@ static int client_size = 0;
static struct client *client = NULL;
static struct pollfd *pollfd = NULL;
static int group_mode;
+static pthread_t query_thread;
+static pthread_mutex_t query_mutex;
struct client {
int fd;
@@ -73,7 +76,7 @@ int do_write(int fd, void *buf, size_t count)
return 0;
}
-static void do_dump(int fd)
+static void query_dump_debug(int fd)
{
int len;
@@ -547,16 +550,16 @@ static void *process_queries(void *arg)
query_dump_debug(f);
break;
case DLMC_CMD_DUMP_PLOCKS:
- query_dump_plocks(f);
+ /* query_dump_plocks(f); */
break;
case DLMC_CMD_NODE_INFO:
- query_node_info(f, h.data);
+ /* query_node_info(f, h.data); */
break;
case DLMC_CMD_LOCKSPACE_INFO:
- query_lockspace_info(f);
+ /* query_lockspace_info(f); */
break;
case DLMC_CMD_LOCKSPACE_NODES:
- query_lockspace_nodes(f, h.option, h.data);
+ /* query_lockspace_nodes(f, h.option, h.data); */
break;
default:
break;
hooks/post-receive
--
Cluster Project