[Pkg-grid-commits] nws/debian/patches CpuCount,1.2,1.3 adaptCPU,1.2,1.3 nws_ctrl_activity,1.2,1.3 prefix_binary,1.2,1.3

[Martin Quinson]

Update of /cvsroot/pkg-grid/nws/debian/patches
In directory haydn:/tmp/cvs-serv24229

Modified Files:
	CpuCount adaptCPU nws_ctrl_activity prefix_binary 
Log Message:
Version of the patches against the newest NWS release that actually compile

Index: adaptCPU
===================================================================
RCS file: /cvsroot/pkg-grid/nws/debian/patches/adaptCPU,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3

Index: nws_ctrl_activity
===================================================================
RCS file: /cvsroot/pkg-grid/nws/debian/patches/nws_ctrl_activity,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nws_ctrl_activity	7 Dec 2004 16:40:07 -0000	1.2
+++ nws_ctrl_activity	7 Dec 2004 20:49:42 -0000	1.3
@@ -64,7 +64,7 @@
 +/*
 +** Search the attribute #name# from #object# 
 +*/
-+const NWSAPI_NwsAttribute
++NWSAPI_NwsAttribute
 +NWSAPI_FindNwsAttribute(const NWSAPI_Object ofObject,
 +			const char *name);
  
@@ -114,7 +114,7 @@
  			$(buildbindir)/nws_search \
  			$(buildbindir)/nws_start_activity \
  			$(buildbindir)/nws_whattime \
--			$(buildbindir)/nws_ping
+-			$(buildbindir)/nws_ping 
 +			$(buildbindir)/nws_ping \
 +			$(buildbindir)/nws_ctrl_activity
  
@@ -685,18 +685,6 @@
 ===================================================================
 --- nws-2.11.orig/Common/nws_api.c
 +++ nws-2.11/Common/nws_api.c
-@@ -833,6 +833,11 @@ NWSAPI_AutoFetchBegin(const char *series
- 	return StartFetch(list, howMany);
- }
- 
-+const NwsAttribute
-+NWSAPI_FindNwsAttribute(const Object ofObject,
-+                 const char *name) {
-+  return FindNwsAttribute(ofObject,name);
-+}
- 
- int
- NWSAPI_AutoFetchBeginObject(ObjectSet seriesSet) {
 @@ -1919,6 +1924,121 @@ NWSAPI_SeriesName_r(const NWSAPI_SeriesS
  }
  

Index: CpuCount
===================================================================
RCS file: /cvsroot/pkg-grid/nws/debian/patches/CpuCount,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CpuCount	7 Dec 2004 16:40:07 -0000	1.2
+++ CpuCount	7 Dec 2004 20:49:42 -0000	1.3
@@ -2,20 +2,20 @@
 
 %diffstat
 %patch
- Include/skills.h         |    6 +++---
+ Include/skills.h         |    8 ++++----
  Sensor/ExpCPU/Makefile   |    3 ++-
  Sensor/ExpCPU/countCpu.c |   26 ++++++++++++++++++++++++++
  Sensor/ExpCPU/countCpu.h |   20 ++++++++++++++++++++
  Sensor/nws_sensor.c      |    8 ++++++++
  Sensor/skills.c          |    3 +++
  configure                |    1 +
- 7 files changed, 63 insertions(+), 4 deletions(-)
+ 7 files changed, 64 insertions(+), 5 deletions(-)
 
 Index: nws-2.11/Include/skills.h
 ===================================================================
 --- nws-2.11.orig/Include/skills.h
 +++ nws-2.11/Include/skills.h
-@@ -31,11 +31,11 @@ extern "C" {
+@@ -31,17 +31,17 @@ extern "C" {
  #endif
  
  /* # of known skills and # of resources we are measuring */
@@ -30,6 +30,13 @@
  	tcpMessageMonitor, filesystemMonitor, availabilityMonitor, 
  	startMonitor, memorySpeedMonitor 
  } KnownSkills;
+ 
+ 
+-typedef enum {availableCpu=0, currentCpu, freeDisk, freeMemory, connectTimeTcp, 
++typedef enum {availableCpu=0, currentCpu, countCpu, freeDisk, freeMemory, connectTimeTcp, 
+ 	bandwidthTcp, latencyTcp, fsreadSpeed, fswriteSpeed ,upTime,
+ 	startTime, memorySpeed 
+ } MeasuredResources;
 Index: nws-2.11/Sensor/ExpCPU/Makefile
 ===================================================================
 --- nws-2.11.orig/Sensor/ExpCPU/Makefile
@@ -108,11 +115,11 @@
  			CliqueJoin(&k, cliqueName, HostCImage(&sensorCookie), -1);
  		}
  	}
-+        name = CreateActivityName(sensorCookie.name, sensorCookie.port, SkillName(cpuCountMonitor));
++   /*        name = CreateActivityName(sensorCookie.name, sensorCookie.port, SkillName(cpuCountMonitor));
 +	if (name == NULL) {
 +		ABORT("couldn't generate the activity name\n");
-+	}
-+	if(!StartPeriodicActivity(name, SkillName(cpuCountMonitor), "period:86400")) {
++	}*/
++	if(!StartPeriodicActivity(NULL, SkillName(cpuCountMonitor), "period:86400")) {
 +		WARN("StartSensor: auto-start of CPU monitor failed\n");
 +	}
 +	FREE(name);

Index: prefix_binary
===================================================================
RCS file: /cvsroot/pkg-grid/nws/debian/patches/prefix_binary,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- prefix_binary	7 Dec 2004 16:40:07 -0000	1.2
+++ prefix_binary	7 Dec 2004 20:49:42 -0000	1.3
@@ -275,16 +275,16 @@
  	@$(CP) $(SCRIPTS) $(bindir)
  	@echo "Installing man pages for user commands ..."
 -	@$(CP) *.1 $(mandir)/man1
-+ 	@mv nws-hostadmin.1 nws_hostadmin.1 || true
-+ 	@mv html-hosts.1 nws_html_hosts.1 || true
-+ 	@for m in *.1 ; do \
-+ 	  if [ -e $(bindir)/`basename $$m .1` ] ; then \
-+ 	    cp -v $$m $(mandir)/man1; \
-+ 	  else \
-+ 	    p=`echo $$m|sed 's|^|nws_|'`; cp -v $$m $(mandir)/man1/$$p; \
-+ 	fi; done
-+ 	@mv nws_hostadmin.1 nws-hostadmin.1
-+ 	@mv nws_html_hosts.1 html-hosts.1
++	@mv nws-hostadmin.1 nws_hostadmin.1 || true
++	@mv html-hosts.1 nws_html_hosts.1 || true
++	@for m in *.1 ; do \
++	  if [ -e $(bindir)/`basename $$m .1` ] ; then \
++	    cp -v $$m $(mandir)/man1; \
++	  else \
++	    p=`echo $$m|sed 's|^|nws_|'`; cp -v $$m $(mandir)/man1/$$p; \
++	fi; done
++	@mv nws_hostadmin.1 nws-hostadmin.1
++	@mv nws_html_hosts.1 html-hosts.1
  
 -$(buildbindir)/html-hosts: html-hosts
 -	$(INSTALL) html-hosts $(buildbindir)/html-hosts