[Pkg-grid-commits] nws/debian/patches CpuCount, 1.3, 1.4 adaptCPU,
1.3, 1.4 nws_ctrl_activity, 1.3, 1.4 nws_setup, 1.5,
1.6 prefix_binary, 1.3, 1.4
Martin Quinson
mquinson at alioth.debian.org
Mon Aug 8 21:20:26 UTC 2005
Update of /cvsroot/pkg-grid/nws/debian/patches
In directory haydn:/tmp/cvs-serv2871
Modified Files:
CpuCount adaptCPU nws_ctrl_activity nws_setup prefix_binary
Log Message:
Update to 2.13 upstream
Index: nws_ctrl_activity
===================================================================
RCS file: /cvsroot/pkg-grid/nws/debian/patches/nws_ctrl_activity,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- nws_ctrl_activity 7 Dec 2004 20:49:42 -0000 1.3
+++ nws_ctrl_activity 8 Aug 2005 21:20:24 -0000 1.4
@@ -53,11 +53,11 @@
4 files changed, 699 insertions(+), 1 deletion(-)
%patch
-Index: nws-2.11/Include/nws_api.h
+Index: nws-2.13/Include/nws_api.h
===================================================================
---- nws-2.11.orig/Include/nws_api.h
-+++ nws-2.11/Include/nws_api.h
-@@ -293,6 +293,12 @@ char *
+--- nws-2.13.orig/Include/nws_api.h 2005-08-05 22:54:02.000000000 +0200
++++ nws-2.13/Include/nws_api.h 2005-08-08 17:07:06.948978424 +0200
+@@ -293,6 +293,12 @@
NWSAPI_NwsAttributeName_r(NWSAPI_NwsAttribute attribute);
char *
NWSAPI_NwsAttributeValue_r(NWSAPI_NwsAttribute attribute);
@@ -70,7 +70,7 @@
/**
-@@ -599,6 +605,19 @@ int
+@@ -734,6 +740,19 @@
NWSAPI_HaltActivity(const NWSAPI_HostSpec *whichSensor,
const char *activityName);
@@ -90,7 +90,7 @@
/*
** Contacts #whichSensor# to use #controlName# to start a #skillName# activity,
-@@ -687,6 +706,7 @@ NWSAPI_EnvironmentValue(const char *name
+@@ -830,6 +849,7 @@
# define NwsAttribute NWSAPI_NwsAttribute
# define NwsAttributeName_r NWSAPI_NwsAttributeName_r
# define NwsAttributeValue_r NWSAPI_NwsAttributeValue_r
@@ -98,7 +98,7 @@
# define Object NWSAPI_Object
# define ObjectSet NWSAPI_ObjectSet
# define ACTIVITIES NWSAPI_ACTIVITIES
-@@ -738,6 +758,7 @@ NWSAPI_EnvironmentValue(const char *name
+@@ -883,6 +903,7 @@
# define HaltActivity NWSAPI_HaltActivity
# define StartActivity NWSAPI_StartActivity
# define RestartActivities NWSAPI_RestartActivities
@@ -106,11 +106,11 @@
#endif /* NWSAPI_SHORTNAMES */
#ifdef NWS_API_COMPAT
-Index: nws-2.11/Interface/Makefile
+Index: nws-2.13/Interface/Makefile
===================================================================
---- nws-2.11.orig/Interface/Makefile
-+++ nws-2.11/Interface/Makefile
-@@ -30,7 +30,8 @@ PROGRAMS = $(buildbindir)/nws_add_foreca
+--- nws-2.13.orig/Interface/Makefile 2005-08-08 17:06:47.077999272 +0200
++++ nws-2.13/Interface/Makefile 2005-08-08 17:07:06.948978424 +0200
+@@ -32,7 +32,8 @@
$(buildbindir)/nws_search \
$(buildbindir)/nws_start_activity \
$(buildbindir)/nws_whattime \
@@ -120,10 +120,10 @@
SCRIPTS = $(buildbindir)/nws_html_hosts \
$(buildbindir)/nws_hostadmin \
-Index: nws-2.11/Interface/nws_ctrl_activity.c
+Index: nws-2.13/Interface/nws_ctrl_activity.c
===================================================================
---- /dev/null
-+++ nws-2.11/Interface/nws_ctrl_activity.c
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ nws-2.13/Interface/nws_ctrl_activity.c 2005-08-08 17:07:06.950978120 +0200
@@ -0,0 +1,556 @@
+/* $Id$ */
+
@@ -681,11 +681,11 @@
+ optind++;
+ return 0;
+}
-Index: nws-2.11/Common/nws_api.c
+Index: nws-2.13/Common/nws_api.c
===================================================================
---- nws-2.11.orig/Common/nws_api.c
-+++ nws-2.11/Common/nws_api.c
-@@ -1919,6 +1924,121 @@ NWSAPI_SeriesName_r(const NWSAPI_SeriesS
+--- nws-2.13.orig/Common/nws_api.c 2005-08-05 22:54:02.000000000 +0200
++++ nws-2.13/Common/nws_api.c 2005-08-08 17:07:06.954977512 +0200
+@@ -1176,6 +1176,121 @@
}
Index: CpuCount
===================================================================
RCS file: /cvsroot/pkg-grid/nws/debian/patches/CpuCount,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CpuCount 7 Dec 2004 20:49:42 -0000 1.3
+++ CpuCount 8 Aug 2005 21:20:24 -0000 1.4
@@ -11,37 +11,33 @@
configure | 1 +
7 files changed, 64 insertions(+), 5 deletions(-)
-Index: nws-2.11/Include/skills.h
+Index: nws-2.13/Include/skills.h
===================================================================
---- nws-2.11.orig/Include/skills.h
-+++ nws-2.11/Include/skills.h
-@@ -31,17 +31,17 @@ extern "C" {
- #endif
+--- nws-2.13.orig/Include/skills.h 2005-08-08 17:16:25.699035504 +0200
++++ nws-2.13/Include/skills.h 2005-08-08 17:16:30.264341472 +0200
+@@ -22,7 +22,7 @@
+ #include "register.h"
- /* # of known skills and # of resources we are measuring */
--#define RESOURCE_COUNT (12 + EXPERIMENTAL_RESOURCES)
--#define SKILL_COUNT (9 + EXPERIMENTAL_SKILLS)
-+#define RESOURCE_COUNT (13 + EXPERIMENTAL_RESOURCES)
-+#define SKILL_COUNT (10 + EXPERIMENTAL_SKILLS)
-
/* Skills supported by this sensor and the resources they measure. */
-typedef enum {cpuMonitor=0, diskMonitor, memoryMonitor, tcpConnectMonitor,
+typedef enum {cpuMonitor=0, cpuCountMonitor, diskMonitor, memoryMonitor, tcpConnectMonitor,
tcpMessageMonitor, filesystemMonitor, availabilityMonitor,
- startMonitor, memorySpeedMonitor
+ #ifdef EXPERIMENTAL
+ batchQueueMonitor,
+@@ -30,7 +30,7 @@
+ memorySpeedMonitor, endSkills
} 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
+ startTime,
+ #ifdef EXPERIMENTAL
+Index: nws-2.13/Sensor/ExpCPU/Makefile
===================================================================
---- nws-2.11.orig/Sensor/ExpCPU/Makefile
-+++ nws-2.11/Sensor/ExpCPU/Makefile
-@@ -12,7 +12,8 @@ OBJS = $(buildobjdir)/activeCpu.o \
+--- nws-2.13.orig/Sensor/ExpCPU/Makefile 2005-08-08 17:16:25.700035352 +0200
++++ nws-2.13/Sensor/ExpCPU/Makefile 2005-08-08 17:16:30.265341320 +0200
+@@ -12,7 +12,8 @@
$(buildobjdir)/hybridCpu.o \
$(buildobjdir)/passiveCpu.o \
$(buildobjdir)/profiler.o \
@@ -51,10 +47,10 @@
.PHONY: all clean dist install
-Index: nws-2.11/Sensor/ExpCPU/countCpu.c
+Index: nws-2.13/Sensor/ExpCPU/countCpu.c
===================================================================
---- /dev/null
-+++ nws-2.11/Sensor/ExpCPU/countCpu.c
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ nws-2.13/Sensor/ExpCPU/countCpu.c 2005-08-08 17:17:22.097461640 +0200
@@ -0,0 +1,26 @@
+/* $Id$ */
+
@@ -75,17 +71,17 @@
+ if (!totalCpus)
+ totalCpus = CPUCount();
+
-+ AppendResult(countCpu, "", 1, totalCpus, length, results);
++ AppendResult(countCpu, "", /* succeeded*/1, /*value*/ totalCpus, /*timestamp*/0, length, results);
+}
+
+int
+CpuCountMonitorAvailable(const char *options) {
+ return 1;
+}
-Index: nws-2.11/Sensor/ExpCPU/countCpu.h
+Index: nws-2.13/Sensor/ExpCPU/countCpu.h
===================================================================
---- /dev/null
-+++ nws-2.11/Sensor/ExpCPU/countCpu.h
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ nws-2.13/Sensor/ExpCPU/countCpu.h 2005-08-08 17:16:30.265341320 +0200
@@ -0,0 +1,20 @@
+/* $Id$ */
+
@@ -107,29 +103,30 @@
+CpuCountMonitorAvailable(const char *options);
+
+#endif
-Index: nws-2.11/Sensor/nws_sensor.c
+Index: nws-2.13/Sensor/nws_sensor.c
===================================================================
---- nws-2.11.orig/Sensor/nws_sensor.c
-+++ nws-2.11/Sensor/nws_sensor.c
-@@ -459,6 +459,14 @@ main( int argc,
- CliqueJoin(&k, cliqueName, HostCImage(&sensorCookie), -1);
+--- nws-2.13.orig/Sensor/nws_sensor.c 2005-08-08 17:16:25.700035352 +0200
++++ nws-2.13/Sensor/nws_sensor.c 2005-08-08 17:22:57.327498928 +0200
+@@ -242,6 +242,15 @@
+ break;
}
}
-+ /* name = CreateActivityName(sensorCookie.name, sensorCookie.port, SkillName(cpuCountMonitor));
-+ if (name == NULL) {
-+ ABORT("couldn't generate the activity name\n");
-+ }*/
++ /* name = CreateActivityName(sensorCookie.name, sensorCookie.port, SkillName(cpuCountMonitor));
++ if (name == NULL) {
++ ABORT("couldn't generate the activity name\n");
++ }
++ */
+ if(!StartPeriodicActivity(NULL, SkillName(cpuCountMonitor), "period:86400")) {
+ WARN("StartSensor: auto-start of CPU monitor failed\n");
+ }
-+ FREE(name);
++ /*FREE(name);*/
nextBeatTime = 0;
-Index: nws-2.11/Sensor/skills.c
+Index: nws-2.13/Sensor/skills.c
===================================================================
---- nws-2.11.orig/Sensor/skills.c
-+++ nws-2.11/Sensor/skills.c
+--- nws-2.13.orig/Sensor/skills.c 2005-08-08 17:16:25.700035352 +0200
++++ nws-2.13/Sensor/skills.c 2005-08-08 17:16:30.266341168 +0200
@@ -14,6 +14,7 @@
#include "connect_exp.h"
#include "disk.h"
@@ -138,7 +135,7 @@
#include "memory.h"
#include "tcp_bw_exp.h"
#include "fstests.h"
-@@ -45,6 +46,7 @@ typedef struct {
+@@ -45,6 +46,7 @@
static const NwsResource myResources[RESOURCE_COUNT] = {
{"CPU Fraction", "availableCpu", availableCpu},
{"CPU Fraction", "currentCpu", currentCpu},
@@ -146,19 +143,19 @@
{"Megabytes", "freeDisk", freeDisk,},
{"Megabytes", "freeMemory", freeMemory,},
{"Milliseconds", "connectTimeTcp", connectTimeTcp,},
-@@ -133,6 +135,7 @@ typedef struct {
+@@ -141,6 +143,7 @@
static const NwsSkill mySkills[SKILL_COUNT] = {
- {"cpuMonitor", PERIODIC_CONTROL, "nice", "0", {availableCpu, currentCpu}, 2, &HybridCpuMonitorAvailable, &HybridCpuUseSkill},
-+ {"cpuCountMonitor", PERIODIC_CONTROL, "", NULL, {countCpu}, 1, &CpuCountMonitorAvailable, &CpuCountUseSkill},
- {"diskMonitor", PERIODIC_CONTROL, "path", NULL, {freeDisk}, 1, &DiskFreeAvailable, &DiskFreeUseSkill},
- {"memoryMonitor", PERIODIC_CONTROL, "type", "passive", {freeMemory}, 1, &MemoryMonitorAvailable, &MemoryUseSkill},
- {"tcpConnectMonitor", CLIQUE_CONTROL, "", NULL, {connectTimeTcp}, 1, &TcpConnectAvailable, &TcpConnectUseSkill},
-Index: nws-2.11/configure
+ {"cpuMonitor", PERIODIC_CONTROL, "nice", "0", {availableCpu, currentCpu}, 2, &HybridCpuMonitorAvailable, &HybridCpuUseSkill, DEAFULT_PERIODIC_PERIOD},
++ {"cpuCountMonitor", PERIODIC_CONTROL, "", NULL, {countCpu}, 1, &CpuCountMonitorAvailable, &CpuCountUseSkill},
+ {"diskMonitor", PERIODIC_CONTROL, "path", NULL, {freeDisk}, 1, &DiskFreeAvailable, &DiskFreeUseSkill, DEAFULT_PERIODIC_PERIOD},
+ {"memoryMonitor", PERIODIC_CONTROL, "type", "passive", {freeMemory}, 1, &MemoryMonitorAvailable, &MemoryUseSkill, DEAFULT_PERIODIC_PERIOD},
+ {"tcpConnectMonitor", CLIQUE_CONTROL, "", NULL, {connectTimeTcp}, 1, &TcpConnectAvailable, &TcpConnectUseSkill, DEAFULT_CLIQUE_PERIOD},
+Index: nws-2.13/configure
===================================================================
---- nws-2.11.orig/configure
-+++ nws-2.11/configure
-@@ -3390,6 +3390,7 @@ esac
+--- nws-2.13.orig/configure 2005-08-08 17:16:25.700035352 +0200
++++ nws-2.13/configure 2005-08-08 17:16:30.269340712 +0200
+@@ -3404,6 +3404,7 @@
SENSORS_OBJS="${NWS_BUILD_DIR}/obj/activeCpu.o \
${NWS_BUILD_DIR}/obj/hybridCpu.o \
${NWS_BUILD_DIR}/obj/passiveCpu.o \
Index: prefix_binary
===================================================================
RCS file: /cvsroot/pkg-grid/nws/debian/patches/prefix_binary,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- prefix_binary 7 Dec 2004 20:49:42 -0000 1.3
+++ prefix_binary 8 Aug 2005 21:20:24 -0000 1.4
@@ -14,11 +14,11 @@
2 files changed, 59 insertions(+), 47 deletions(-)
%patch
-Index: nws-2.11/Doc/users_guide.html
+Index: nws-2.13/Doc/users_guide.html
===================================================================
---- nws-2.11.orig/Doc/users_guide.html
-+++ nws-2.11/Doc/users_guide.html
-@@ -28,19 +28,19 @@ vermillion.ufo.edu that listens on port
+--- nws-2.13.orig/Doc/users_guide.html 2005-08-05 22:54:02.000000000 +0200
++++ nws-2.13/Doc/users_guide.html 2005-08-08 17:04:08.354128968 +0200
+@@ -28,19 +28,19 @@
The other programs located in the bin subdirectory are utility programs
designed to
<ul>
@@ -45,7 +45,7 @@
</ul>
Each of these programs contacts one or more NWS hosts through their listening
ports in order to fulfill your requests.
-@@ -234,7 +234,7 @@ The other attributes associated with NWS
+@@ -234,7 +234,7 @@
NWS sensors register objects with an <b>objectclass</b> value of
<b>nwsSkill</b>. These objects represent services that the sensor can
perform, and different sensors may register different skills. These skills are
@@ -54,7 +54,7 @@
NWS resource monitoring. In addition to <b>name</b> and <b>objectclass</b>
attributes, each registered skill has a <b>host</b> attribute, which is the
registration name of the sensor that registered the skill, and a
-@@ -498,7 +498,7 @@ itself with the name server previously s
+@@ -498,7 +498,7 @@
<p>
After starting a memory host, you can set up an NWS sensor host on one or more
machines to monitor resource availability. After starting a sensor host, you
@@ -63,7 +63,7 @@
which resources it should monitor. Run the program in the background.
<p>
-@@ -618,11 +618,11 @@ This command, executed on green.ufo.edu,
+@@ -618,11 +618,11 @@
</pre>
@@ -77,7 +77,7 @@
measurements. It takes from standard input a series of lines that contain
time-stamp/measurement pairs and prints these lines to standard output along
with forecast and forecast error values. Any text that follows the time-stamp
-@@ -657,7 +657,7 @@ For example, given the input
+@@ -657,7 +657,7 @@
</pre>
<p>
@@ -86,7 +86,7 @@
<p>
<pre>
-@@ -689,16 +689,16 @@ measurements for the series; the fourth
+@@ -689,16 +689,16 @@
forecasts to that point.
@@ -106,7 +106,7 @@
[<b>-z</b>]
<i>command</i>
<i>host</i> [<i>host</i> ...]
-@@ -749,15 +749,15 @@ target hosts.
+@@ -749,15 +749,15 @@
</table>
@@ -125,7 +125,7 @@
[<b>-L</b>]
[<b>-S</b> <i>host</i>]
<i>name</i>
-@@ -782,33 +782,33 @@ resource or set of resources.
+@@ -782,33 +782,33 @@
clique member to halt a clique.
</table>
@@ -166,7 +166,7 @@
www1.whitehouse.gov 198.137.240.91
</pre>
-@@ -940,7 +940,7 @@ list of NWS hosts that have been specifi
+@@ -940,7 +940,7 @@
<b>start</b> command. Each record lists the machine name, host type, port, NWS
binary path, and switches for a particular NWS host. When the script is asked
to manage NWS hosts, it queries this data base to determine what hosts are
@@ -175,7 +175,7 @@
to contact NWS hosts, so this program must be available in some directory
listed in your PATH environment variable.
-@@ -1491,7 +1491,7 @@ activity is registered with the NWS name
+@@ -1491,7 +1491,7 @@
and <b>controlName</b> determine which resources the activity monitors and how
frequently measurements are made. Which other option attribute names are
recognized depends on the skill and control. If you do not specify a
@@ -184,7 +184,7 @@
determine the values from the other options you list. See the discussion on
<a href="#registrations">NWS registrations</a> above for a list of supported
skills and controls and their associated option attributes.
-@@ -1527,7 +1527,7 @@ Assuming that this file was named "mycli
+@@ -1527,7 +1527,7 @@
running would be:
<pre>
@@ -193,7 +193,7 @@
</pre>
<p>
-@@ -1550,11 +1550,11 @@ file to read:
+@@ -1550,11 +1550,11 @@
<p>
(you could delete the line containing green rather than commenting it), use the
@@ -208,7 +208,7 @@
</pre>
<p>
-@@ -1562,27 +1562,27 @@ This command would direct the sensor on
+@@ -1562,27 +1562,27 @@
CPU availability for both nice 0 and nice 19 processes:
<pre>
@@ -241,17 +241,18 @@
953834769 == Thu Mar 23 10:06:09 2000
911837431 == Mon Nov 23 08:10:31 1998
-Index: nws-2.11/Interface/Makefile
+Index: nws-2.13/Interface/Makefile
===================================================================
---- nws-2.11.orig/Interface/Makefile
-+++ nws-2.11/Interface/Makefile
-@@ -22,18 +22,18 @@ OBJS = $(buildobjdir)/add_forecast.o \
+--- nws-2.13.orig/Interface/Makefile 2005-08-05 22:54:03.000000000 +0200
++++ nws-2.13/Interface/Makefile 2005-08-08 17:06:27.205020424 +0200
+@@ -23,19 +23,19 @@
DEP_LIB = $(buildlibdir)/$(LIBNWSNAME)
# the programs we are building and aliases
-PROGRAMS = $(buildbindir)/add_forecast \
+PROGRAMS = $(buildbindir)/nws_add_forecast \
$(buildbindir)/nws_ctrl \
+ $(buildbindir)/nws_cmd \
- $(buildbindir)/halt_activity \
+ $(buildbindir)/nws_halt_activity \
$(buildbindir)/nws_extract \
@@ -270,7 +271,7 @@
.PHONY: all clean dist install
-@@ -51,13 +51,22 @@ install:
+@@ -53,13 +53,22 @@
@$(CP) $(PROGRAMS) $(bindir)
@$(CP) $(SCRIPTS) $(bindir)
@echo "Installing man pages for user commands ..."
@@ -298,10 +299,10 @@
# Compilation rules for C.
$(buildobjdir)/%.o : %.c $(buildincdir)/*.h ../Include/*.h
-@@ -66,3 +75,6 @@ $(buildobjdir)/%.o : %.c $(buildincdir)/
+@@ -68,3 +77,6 @@
# Linking rules
$(buildbindir)/% : $(buildobjdir)/%.o $(DEP_LIB)
- $(CC) -o $@ $< $(LDFLAGS) $(DEP_LIB)
+ $(CC) -o $@ $< $(DEP_LIB) $(LDFLAGS)
+
+$(buildbindir)/nws_% : $(buildobjdir)/%.o $(DEP_LIB)
-+ $(CC) -o $@ $< $(LDFLAGS) $(DEP_LIB)
++ $(CC) -o $@ $< $(DEP_LIB) $(LDFLAGS)
Index: adaptCPU
===================================================================
RCS file: /cvsroot/pkg-grid/nws/debian/patches/adaptCPU,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- adaptCPU 7 Dec 2004 20:49:42 -0000 1.3
+++ adaptCPU 8 Aug 2005 21:20:24 -0000 1.4
@@ -14,10 +14,10 @@
1 files changed, 15 insertions(+), 8 deletions(-)
%patch
-Index: nws-2.11/Sensor/ExpCPU/hybridCpu.c
+Index: nws-2.13/Sensor/ExpCPU/hybridCpu.c
===================================================================
---- nws-2.11.orig/Sensor/ExpCPU/hybridCpu.c
-+++ nws-2.11/Sensor/ExpCPU/hybridCpu.c
+--- nws-2.13.orig/Sensor/ExpCPU/hybridCpu.c 2005-08-08 17:12:20.027383272 +0200
++++ nws-2.13/Sensor/ExpCPU/hybridCpu.c 2005-08-08 17:16:30.276339648 +0200
@@ -1,6 +1,6 @@
/* $Id$ */
@@ -36,7 +36,7 @@
/*
-@@ -95,7 +96,7 @@ HybridCpuUseSkill(const char * options,
+@@ -95,7 +96,7 @@
INITIAL_ACTIVE_FREQ,
ADAPT,
DEFAULT_ACTIVE_LENGTH,
@@ -45,7 +45,7 @@
}
/* Get measurements for each nice value. */
tmp = GetOptionValue(options, "nice", "0");
-@@ -186,6 +187,9 @@ HybridCpuGetLoad(unsigned short niceValu
+@@ -186,6 +187,9 @@
if(!adaptingPeriod)
track->fuse -= track->burn;
else if(fabs(track->passivePrior - passiveAvail[track->bestResource]) >=
@@ -55,7 +55,7 @@
WILD_VARIATION)
track->fuse -= track->burn * 2;
else if(fabs(track->passivePrior - passiveAvail[track->bestResource]) <=
-@@ -197,6 +201,9 @@ HybridCpuGetLoad(unsigned short niceValu
+@@ -197,6 +201,9 @@
if(track->fuse <= 0) {
/* Run an active probe and reset all counters. */
@@ -65,7 +65,7 @@
activeResult =
ActiveCpuGetLoad(niceValue, 60, activeProbeLength, &activeAvail);
LOG2("hybridCpu: Active probe %d reports %f\n", testNumber, activeAvail);
-@@ -238,16 +245,16 @@ HybridCpuGetLoad(unsigned short niceValu
+@@ -238,16 +245,16 @@
}
@@ -86,7 +86,7 @@
LOG3("hybridCpu: %s probe %d returns %f\n",
PassiveCpuResourceName(i), testNumber, passiveReport);
}
-@@ -294,7 +301,7 @@ HybridCpuOpenMonitor(const unsigned shor
+@@ -294,7 +301,7 @@
adaptingPeriod = adaptPeriod;
}
Index: nws_setup
===================================================================
RCS file: /cvsroot/pkg-grid/nws/debian/patches/nws_setup,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- nws_setup 7 Dec 2004 20:45:35 -0000 1.5
+++ nws_setup 8 Aug 2005 21:20:24 -0000 1.6
@@ -38,11 +38,11 @@
Interface/nws_setup | 826 ++++++++++++++++++++++++++++++++++++++++++++++++++++
%patch
-Index: nws-2.11/Interface/Makefile
+Index: nws-2.13/Interface/Makefile
===================================================================
---- nws-2.11.orig/Interface/Makefile
-+++ nws-2.11/Interface/Makefile
-@@ -33,7 +33,10 @@ PROGRAMS = $(buildbindir)/nws_add_foreca
+--- nws-2.13.orig/Interface/Makefile 2005-08-08 17:06:27.205020424 +0200
++++ nws-2.13/Interface/Makefile 2005-08-08 17:06:47.077999272 +0200
+@@ -35,7 +35,10 @@
$(buildbindir)/nws_ping
SCRIPTS = $(buildbindir)/nws_html_hosts \
@@ -54,7 +54,7 @@
.PHONY: all clean dist install
-@@ -44,7 +47,7 @@ clean:
+@@ -46,7 +49,7 @@
dist:
@$(INSTALL) -d $(DIST_ROOT)/Interface
@@ -63,7 +63,7 @@
install:
@echo "Installing user commands ..."
-@@ -61,6 +64,9 @@ install:
+@@ -63,6 +66,9 @@
fi; done
@mv nws_hostadmin.1 nws-hostadmin.1
@mv nws_html_hosts.1 html-hosts.1
@@ -73,7 +73,7 @@
$(buildbindir)/nws_html_hosts: html-hosts
$(INSTALL) html-hosts $(buildbindir)/nws_html_hosts
-@@ -68,6 +74,12 @@ $(buildbindir)/nws_html_hosts: html-host
+@@ -70,6 +76,12 @@
$(buildbindir)/nws_hostadmin: nws-hostadmin
$(INSTALL) nws-hostadmin $(buildbindir)/nws_hostadmin
@@ -86,10 +86,10 @@
# Compilation rules for C.
$(buildobjdir)/%.o : %.c $(buildincdir)/*.h ../Include/*.h
$(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
-Index: nws-2.11/Interface/nws.conf
+Index: nws-2.13/Interface/nws.conf
===================================================================
---- /dev/null
-+++ nws-2.11/Interface/nws.conf
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ nws-2.13/Interface/nws.conf 2005-08-08 17:06:47.078999120 +0200
@@ -0,0 +1,154 @@
+# ConfFile for NWS - to be parsed by nws_setup
+# (Written by Martin Quinson <mquinson at ens-lyon.fr>)
@@ -122,7 +122,7 @@
+# Values used:
+# Here are the ones mandatory:
+# part_to_run=list of the parts of nws to run on this host
-+# authorized part name are : "nameserver memory sensor forecaster"
++# authorized part name are : "nameserver memory sensor "
+# order is not important. I manage this :)
+# skills=list of the skills of the server to manage
+
@@ -229,10 +229,10 @@
+group=master
+
+# Which processes to run on the different kind of hosts
-+part_to_run(master)=nameserver memory sensor forecaster
++part_to_run(master)=nameserver memory sensor
+part_to_run(slave)= sensor
+
-+part_to_run(center)=nameserver memory sensor forecaster
++part_to_run(center)=nameserver memory sensor
+part_to_run(leader)= memory sensor
+
+# Which activities to run on the different kind of hosts
@@ -245,11 +245,11 @@
+# Default args for the activities
+skill.cpuMonitor=nice:0
+skill.memoryMonitor=
-Index: nws-2.11/Interface/nws_setup
+Index: nws-2.13/Interface/nws_setup
===================================================================
---- /dev/null
-+++ nws-2.11/Interface/nws_setup
-@@ -0,0 +1,852 @@
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ nws-2.13/Interface/nws_setup 2005-08-08 17:06:47.082998512 +0200
+@@ -0,0 +1,836 @@
+#! /usr/bin/perl -w
+# My personal script to manage to NWS familly of daemons.
+# Contrary to the upstream provided scripts, it does not
@@ -1018,8 +1018,8 @@
+possible_actions=start test stop log
+possible_infos=name pidfile
+# which process are runnable ?
-+possible_parts=nameserver memory sensor forecaster#in order of launching
-+possible_stop=forecaster sensor memory nameserver #in order of stoping
++possible_parts=nameserver memory sensor #in order of launching
++possible_stop= sensor memory nameserver #in order of stoping
+possible_skills=tcpMessageMonitor tcpConnectMonitor cpuMonitor memoryMonitor diskMonitor
+
+# command line to start,test,stop each process
@@ -1027,32 +1027,24 @@
+ -e $nameserver_errfile -l $nameserver_logfile -i $nameserver_pidfile \
+ -f $nameserver_state -c $nameserver_expire \
+ 1>>$nameserver_logfile 2>>$nameserver_errfile
-+test_nameserver=$nws_ctrl -t 3 test $nameserver_name
++test_nameserver=$nws_cmd -t 3 test $nameserver_name
+stop_nameserver=$nws_ctrl -t 3 halt $nameserver_name
+log_nameserver=$nws_ctrl -t 3 log $nameserver_name
+
+start_memory=$memory_bin -N $nameserver -v 5 \
+ -p $memory_port -d $memory_state -s $memory_size \
+ -e $memory_errfile -l $memory_logfile -i $memory_pidfile 1>>$memory_logfile 2>>$memory_errfile
-+test_memory=$nws_ctrl -t 3 test $memory_name
++test_memory=$nws_cmd -t 3 test $memory_name
+stop_memory=$nws_ctrl -t 3 halt $memory_name
+log_memory=$nws_ctrl -t 3 log $memory_name
+
+start_sensor=$sensor_bin -N $nameserver -M $memory -v 5 \
+ -p $sensor_port -c $sensor_cpu \
+ -e $sensor_errfile -l $sensor_logfile -i $sensor_pidfile 1>>$sensor_logfile 2>>$sensor_errfile
-+test_sensor=$nws_ctrl -t 3 test $hostname:$sensor_port
++test_sensor=$nws_cmd -t 3 test $hostname:$sensor_port
+stop_sensor=$nws_ctrl -t 3 halt $hostname:$sensor_port
+log_sensor=$nws_ctrl -t 3 log $hostname:$sensor_port
+
-+start_forecaster=$forecaster_bin -N $nameserver -p $forecaster_port \
-+ -e $forecaster_errfile -l $forecaster_logfile -i $forecaster_pidfile \
-+ 1>>$forecaster_logfile 2>>$forecaster_errfile
-+test_forecaster=$nws_ctrl -t 3 test $forecaster_name
-+stop_forecaster=$nws_ctrl -t 3 halt $forecaster_name
-+log_forecaster=$nws_ctrl -t 3 log $forecaster_name
-+
-+
+## default values about processes (should correspond to the cmd line args above)
+# (globals)
+nameserver=$ENV{NAME_SERVER}||$hostname:$nameserver_port
@@ -1094,19 +1086,11 @@
+sensor_pidfile=$state_path/sensor.$hostname.$sensor_port.pid
+
+
-+
-+forecaster_bin=$bin_path/nws_forecast
-+forecaster_port=$ENV{FORECASTER_PORT}||8070
-+
-+forecaster_name=$hostname:$forecaster_port
-+forecaster_errfile=$log_path/forecaster.$hostname.$forecaster_port.err
-+forecaster_logfile=$log_path/forecaster.$hostname.$forecaster_port.log
-+forecaster_pidfile=$state_path/forecaster.$hostname.$forecaster_port.pid
-Index: nws-2.11/Makedefs.in
+Index: nws-2.13/Makedefs.in
===================================================================
---- nws-2.11.orig/Makedefs.in
-+++ nws-2.11/Makedefs.in
-@@ -19,6 +19,7 @@ buildbindir = $(builddir)/bin
+--- nws-2.13.orig/Makedefs.in 2005-08-05 22:54:02.000000000 +0200
++++ nws-2.13/Makedefs.in 2005-08-08 17:06:47.082998512 +0200
+@@ -19,6 +19,7 @@
buildlibdir = $(builddir)/lib
buildincdir = $(builddir)/include
buildobjdir = $(builddir)/obj
More information about the Pkg-grid-commits
mailing list