[Cluster-devel] cluster/cman/daemon ais.c barrier.c cmanccs.c ...

[pcaulfield@sourceware.org <pcaulfield@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2008-01-02 16:35:44

Modified files:
	cman/daemon    : ais.c barrier.c cmanccs.c commands.c config.c 
	                 daemon.c logging.c 

Log message:
	Use define CMAN_NAME for the purpose for which it was intended

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&r1=1.58&r2=1.59
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/barrier.c.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/cmanccs.c.diff?cvsroot=cluster&r1=1.38&r2=1.39
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/commands.c.diff?cvsroot=cluster&r1=1.79&r2=1.80
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/config.c.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/daemon.c.diff?cvsroot=cluster&r1=1.38&r2=1.39
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/logging.c.diff?cvsroot=cluster&r1=1.17&r2=1.18

--- cluster/cman/daemon/ais.c	2007/12/31 05:15:43	1.58
+++ cluster/cman/daemon/ais.c	2008/01/02 16:35:44	1.59
@@ -39,7 +39,9 @@
 #include <openais/service/swab.h>
 #include <openais/service/logsys.h>
 
+#include "list.h"
 #include "cnxman-socket.h"
+#include "cnxman-private.h"
 #include "commands.h"
 #include "logging.h"
 
@@ -71,7 +73,7 @@
         { .group          = "CMAN", .group_len      = 4},
 };
 
-LOGSYS_DECLARE_SUBSYS ("CMAN", LOG_INFO);
+LOGSYS_DECLARE_SUBSYS (CMAN_NAME, LOG_INFO);
 
 /* This structure is tacked onto the start of a cluster message packet for our
  * own nefarious purposes. */
@@ -220,7 +222,7 @@
 
 	/* Enable stderr logging if requested by cman_tool */
 	if (debug_mask)
-		logsys_config_subsys_set("CMAN", LOGSYS_TAG_LOG, LOG_DEBUG);
+		logsys_config_subsys_set(CMAN_NAME, LOGSYS_TAG_LOG, LOG_DEBUG);
 
 	/* Read low-level totem/aisexec etc config from CCS */
 	init_config(objdb);
@@ -584,7 +586,7 @@
 		objdb->object_create(object_handle, &logger_object_handle,
 				      "logger_subsys", strlen("logger_subsys"));
 		objdb->object_key_create(logger_object_handle, "subsys", strlen("subsys"),
-					 "CMAN", strlen("CMAN")+1);
+					 CMAN_NAME, strlen(CMAN_NAME)+1);
 
 		if (debug_mask) {
 			objdb->object_key_create(logger_object_handle, "debug", strlen("debug"),
--- cluster/cman/daemon/barrier.c	2007/10/03 10:06:21	1.13
+++ cluster/cman/daemon/barrier.c	2008/01/02 16:35:44	1.14
@@ -45,7 +45,7 @@
 
 extern int we_are_a_cluster_member;
 
-LOGSYS_DECLARE_SUBSYS ("CMAN", LOG_INFO);
+LOGSYS_DECLARE_SUBSYS (CMAN_NAME, LOG_INFO);
 
 /* A barrier */
 struct cl_barrier {
--- cluster/cman/daemon/cmanccs.c	2007/11/29 11:19:12	1.38
+++ cluster/cman/daemon/cmanccs.c	2008/01/02 16:35:44	1.39
@@ -73,7 +73,7 @@
 static unsigned short cluster_id;
 static char cluster_name[MAX_CLUSTER_NAME_LEN + 1];
 
-LOGSYS_DECLARE_SUBSYS ("CMAN", LOG_INFO);
+LOGSYS_DECLARE_SUBSYS (CMAN_NAME, LOG_INFO);
 
 static uint16_t generate_cluster_id(char *name)
 {
--- cluster/cman/daemon/commands.c	2008/01/02 16:23:28	1.79
+++ cluster/cman/daemon/commands.c	2008/01/02 16:35:44	1.80
@@ -48,7 +48,7 @@
 #include "ais.h"
 
 #define max(a,b) (((a) > (b)) ? (a) : (b))
-LOGSYS_DECLARE_SUBSYS ("CMAN", LOG_INFO);
+LOGSYS_DECLARE_SUBSYS (CMAN_NAME, LOG_INFO);
 
 /* Reference counting for cluster applications */
 static int use_count;
--- cluster/cman/daemon/config.c	2007/10/03 10:06:21	1.19
+++ cluster/cman/daemon/config.c	2008/01/02 16:35:44	1.20
@@ -12,13 +12,18 @@
 ******************************************************************************/
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
+#include <netinet/in.h>
 
 #include <openais/service/objdb.h>
+#include "list.h"
+#include "cnxman-socket.h"
+#include "cnxman-private.h"
 #include "ccs.h"
 #include "logging.h"
 
-LOGSYS_DECLARE_SUBSYS ("CMAN", LOG_INFO);
+LOGSYS_DECLARE_SUBSYS (CMAN_NAME, LOG_INFO);
 
 static int read_config_for(int ccs_fd, struct objdb_iface_ver0 *objdb, unsigned int parent,
 			   char *object, char *key, int always_create)
--- cluster/cman/daemon/daemon.c	2007/10/03 10:06:21	1.38
+++ cluster/cman/daemon/daemon.c	2008/01/02 16:35:44	1.39
@@ -42,7 +42,7 @@
 #include "barrier.h"
 #include "ais.h"
 
-LOGSYS_DECLARE_SUBSYS ("CMAN", LOG_INFO);
+LOGSYS_DECLARE_SUBSYS (CMAN_NAME, LOG_INFO);
 
 struct queued_reply
 {
--- cluster/cman/daemon/logging.c	2007/10/03 10:06:21	1.17
+++ cluster/cman/daemon/logging.c	2008/01/02 16:35:44	1.18
@@ -22,9 +22,12 @@
 #include <netinet/in.h>
 
 #include <openais/service/logsys.h>
+#include "list.h"
+#include "cnxman-socket.h"
+#include "cnxman-private.h"
 #include "logging.h"
 
-LOGSYS_DECLARE_SUBSYS ("CMAN", LOG_INFO);
+LOGSYS_DECLARE_SUBSYS (CMAN_NAME, LOG_INFO);
 
 int subsys_mask = 0;