Mainly a problem with recent versions of OpenSolaris that provide apache 2.2
through SUNW provided packages like :
* Solaris Express Developer Edition
* OpenSolaris 2008.05 (AKA Indiana)
* Solaris Express Nevada
Not exclusive of Solaris, as the conflict will be triggered also in other
platforms that will have a header named "scoreboard.h" added to the include
path before the internal headers from ganglia are added.
This time, attaching patch for real
Carlo
Index: gmond/gmond.c
===================================================================
--- gmond/gmond.c (revision 1432)
+++ gmond/gmond.c (working copy)
@@ -29,7 +29,7 @@
#include "dtd.h" /* the DTD definition for our XML */
#include "g25_config.h" /* for converting old file formats to new */
#include "daemon_init.h"
-#include "scoreboard.h"
+#include "gm_scoreboard.h"
#include "ganglia_priv.h"
/* Specifies a single value metric callback */
Index: gmond/modules/status/mod_gstatus.c
===================================================================
--- gmond/modules/status/mod_gstatus.c (revision 1432)
+++ gmond/modules/status/mod_gstatus.c (working copy)
@@ -36,7 +36,7 @@
#include <stdlib.h>
#include "file.h"
-#include "scoreboard.h"
+#include "gm_scoreboard.h"
#include <apr_strings.h>
Index: lib/scoreboard.c
===================================================================
--- lib/scoreboard.c (revision 1432)
+++ lib/scoreboard.c (working copy)
@@ -4,7 +4,7 @@
#include "ganglia_priv.h"
#include "gm_msg.h"
-#include "scoreboard.h"
+#include "gm_scoreboard.h"
#include <apr_hash.h>
#include <apr_strings.h>
Index: lib/Makefile.am
===================================================================
--- lib/Makefile.am (revision 1432)
+++ lib/Makefile.am (working copy)
@@ -27,7 +27,7 @@
dotconf.c dotconf.h error_msg.c ganglia_priv.h \
ganglia.c hash.c hash.h inetaddr.c llist.c llist.h \
my_inet_ntop.c my_inet_ntop.h net.h rdwr.c rdwr.h readdir.c readdir.h tcp.c \
-scoreboard.c scoreboard.h apr_net.c apr_net.h libgmond.c
+scoreboard.c gm_scoreboard.h apr_net.c apr_net.h libgmond.c
libganglia_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-release $(LT_RELEASE) \
Index: lib/scoreboard.h
===================================================================
--- lib/scoreboard.h (revision 1432)
+++ lib/scoreboard.h (working copy)
@@ -1,57 +0,0 @@
-#ifndef SCOREBOARD_H
-#define SCOREBOARD_H 1
-
-#include <apr_pools.h>
-
-/* Author: Brad Nicholes (bnicholes novell.com) */
-
-enum ganglia_scoreboard_types {
- GSB_UNKNOWN = 0,
- GSB_COUNTER = 1,
- GSB_READ_RESET = 2,
- GSB_STATE = 3
-};
-typedef enum ganglia_scoreboard_types ganglia_scoreboard_types;
-
-/* predefined scoreboard elements */
-#define PKTS_RECVD_ALL "gmond_pkts_recvd_all"
-#define PKTS_RECVD_FAILED "gmond_pkts_recvd_failed"
-#define PKTS_RECVD_IGNORED "gmond_pkts_recvd_ignored"
-#define PKTS_RECVD_METADATA "gmond_pkts_recvd_metadata"
-#define PKTS_RECVD_VALUE "gmond_pkts_recvd_value"
-#define PKTS_RECVD_REQUEST "gmond_pkts_recvd_request"
-#define PKTS_SENT_ALL "gmond_pkts_sent_all"
-#define PKTS_SENT_METADATA "gmond_pkts_sent_metadata"
-#define PKTS_SENT_VALUE "gmond_pkts_sent_value"
-#define PKTS_SENT_REQUEST "gmond_pkts_sent_request"
-#define PKTS_SENT_FAILED "gmond_pkts_sent_failed"
-
-
-/* The scoreboard is only enabled whe --enable-status is set on configure */
-#ifdef GSTATUS
-void ganglia_scoreboard_init(apr_pool_t *pool);
-void* ganglia_scoreboard_iterator();
-char* ganglia_scoreboard_next(void **intr);
-void ganglia_scoreboard_add(char *name, ganglia_scoreboard_types type);
-int ganglia_scoreboard_get(char *name);
-void ganglia_scoreboard_set(char *name, int val);
-void ganglia_scoreboard_reset(char *name);
-int ganglia_scoreboard_inc(char *name);
-void ganglia_scoreboard_dec(char *name);
-ganglia_scoreboard_types ganglia_scoreboard_type(char *name);
-#else
-#define ganglia_scoreboard_init(p)
-#define ganglia_scoreboard_iterator() (NULL)
-#define ganglia_scoreboard_next(i) (NULL)
-#define ganglia_scoreboard_add(n,t)
-#define ganglia_scoreboard_get(n) (0)
-#define ganglia_scoreboard_set(n,v)
-#define ganglia_scoreboard_reset(n)
-#define ganglia_scoreboard_inc(n)
-#define ganglia_scoreboard_dec(n)
-#define ganglia_scoreboard_type(n) (GSB_UNKNOWN)
-#endif
-
-#endif /*SCOREBOARD_H*/
-
-
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Ganglia-developers mailing list
Ganglia-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ganglia-developers
