Commit 4ae441cc authored by Leigh Stoller's avatar Leigh Stoller

Checkpoint

parent e37bbe2c
......@@ -202,7 +202,6 @@ ifneq ($(SYSTEM),CYGWIN_NT-5.1)
@$(MAKE) -C capture client
@$(MAKE) -C tip client
endif
@$(MAKE) -C sensors client
@$(MAKE) -C tmcd client
client-install: client client-mkdirs
......@@ -216,7 +215,6 @@ ifneq ($(SYSTEM),CYGWIN_NT-5.1)
@$(MAKE) -C capture client-install
@$(MAKE) -C tip client-install
endif
@$(MAKE) -C sensors client-install
@$(MAKE) -C tmcd client-install
subboss: client
......@@ -232,7 +230,6 @@ ifneq ($(SYSTEM),CYGWIN_NT-5.1)
@$(MAKE) -C capture client-install
@$(MAKE) -C tip client-install
endif
@$(MAKE) -C sensors client-install
@$(MAKE) -C utils subboss-install
@$(MAKE) -C os subboss-install
@$(MAKE) -C db subboss-install
......@@ -279,25 +276,21 @@ mfsoscheck:
mfs: mfsoscheck
@$(MAKE) -C os mfs
@$(MAKE) -C sensors mfs
@$(MAKE) -C tmcd mfs
@$(MAKE) -C clientside mfs
mfs-nostatic: mfsoscheck
@NOSTATIC=1 $(MAKE) -C os mfs
@NOSTATIC=1 $(MAKE) -C sensors mfs
@NOSTATIC=1 $(MAKE) -C tmcd mfs
@NOSTATIC=1 $(MAKE) -C clientside mfs
mfs-install: destdircheck mfs client-mkdirs
@$(MAKE) -C os mfs-install
@$(MAKE) -C sensors mfs-install
@$(MAKE) -C tmcd mfs-install
@$(MAKE) -C clientside mfs-install
mfs-nostatic-install: destdircheck mfs-nostatic client-mkdirs
@$(MAKE) -C os mfs-install
@$(MAKE) -C sensors mfs-install
@$(MAKE) -C tmcd mfs-install
@$(MAKE) -C clientside mfs-install
......
......@@ -20,7 +20,7 @@ ifeq ($(WITH_EMULAB),0)
SUBDIRS += lib
endif
# These must be after lib.
SUBDIRS += event tools os
SUBDIRS += event tools os sensors
ifeq ($(WITH_EMULAB),1)
all: all-subdirs
......
......@@ -4828,6 +4828,8 @@ outfiles="Makeconf GNUmakefile \
event/program-agent/GNUmakefile \
tools/GNUmakefile \
tools/pcapper/GNUmakefile \
sensors/GNUmakefile \
sensors/slothd/GNUmakefile \
os/GNUmakefile os/syncd/GNUmakefile \
os/dijkstra/GNUmakefile os/genhostsfile/GNUmakefile"
......
......@@ -156,6 +156,8 @@ outfiles="Makeconf GNUmakefile \
event/program-agent/GNUmakefile \
tools/GNUmakefile \
tools/pcapper/GNUmakefile \
sensors/GNUmakefile \
sensors/slothd/GNUmakefile \
os/GNUmakefile os/syncd/GNUmakefile \
os/dijkstra/GNUmakefile os/genhostsfile/GNUmakefile"
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005, 2007 University of Utah and the Flux Group.
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved.
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ../..
SUBDIR = sensors/slothd
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = @top_builddir@
SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
SYSTEM := $(shell uname -s)
SLOTHD_DIR = unknownclient
TBLIB = $(OBJDIR)/lib/libtb/libtb.a
SBIN_SCRIPTS = sdisrunning sddeploy
SDPROGS = sdcollectd$(EXE) slothd$(EXE)
SYSTEM := $(shell uname -s)
include $(OBJDIR)/Makeconf
CC?=gcc
......@@ -85,6 +83,8 @@ ifeq ($(SYSTEM),CYGWIN_NT-5.1)
endif
control-install:
mfs: client
mfs-install: client-install
clean:
rm -f *.o $(SDPROGS) $(WINPROGS) slothd-debug *~ core *.core version.c
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2000-2005 University of Utah and the Flux Group.
* Copyright (c) 2000-2005, 2011 University of Utah and the Flux Group.
* All rights reserved.
*/
......@@ -199,7 +199,7 @@ int parse_args(int argc, char **argv) {
opts->agg_interval = DEF_AINTVL;
opts->debug = 0;
opts->port = SLOTHD_DEF_PORT;
opts->servname = BOSSNODE;
opts->servname = (char *)0;
opts->load_thresh = DEF_LTHRSH;
opts->pkt_thresh = DEF_CTHRSH;
opts->cif_thresh = DEF_CTHRSH;
......@@ -327,6 +327,10 @@ int init_slothd(void) {
lerror("Could not alloc socket");
return -1;
}
if (opts->servname == (char *) 0) {
lerror("Need to specify the server hostname");
return -1;
}
if (!(hent = gethostbyname(opts->servname))) {
lerror("Can't resolve server hostname"); /* XXX use herror */
return -1;
......
......@@ -7027,8 +7027,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
os/zapdisk/GNUmakefile \
pxe/GNUmakefile pxe/bootinfo.restart \
security/GNUmakefile security/lastlog_daemon \
sensors/GNUmakefile sensors/slothd/GNUmakefile \
sensors/slothd/sdisrunning sensors/slothd/sddeploy \
sensors/GNUmakefile \
sensors/canaryd/GNUmakefile sensors/canaryd/feedbacklogs \
sensors/and/GNUmakefile sensors/and/and-emulab.conf \
sensors/powermon/GNUmakefile sensors/powermon/powermon \
......@@ -7228,6 +7227,8 @@ outfiles="$outfiles clientside/GNUmakefile \
clientside/GNUmakefile clientside/event/GNUmakefile \
clientside/event/program-agent/GNUmakefile \
clientside/tools/GNUmakefile clientside/tools/pcapper/GNUmakefile \
clientside/sensors/GNUmakefile clientside/sensors/slothd/GNUmakefile \
clientside/sensors/slothd/sdisrunning clientside/sensors/slothd/sddeploy \
clientside/os/GNUmakefile clientside/os/syncd/GNUmakefile \
clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile"
......
......@@ -892,8 +892,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
os/zapdisk/GNUmakefile \
pxe/GNUmakefile pxe/bootinfo.restart \
security/GNUmakefile security/lastlog_daemon \
sensors/GNUmakefile sensors/slothd/GNUmakefile \
sensors/slothd/sdisrunning sensors/slothd/sddeploy \
sensors/GNUmakefile \
sensors/canaryd/GNUmakefile sensors/canaryd/feedbacklogs \
sensors/and/GNUmakefile sensors/and/and-emulab.conf \
sensors/powermon/GNUmakefile sensors/powermon/powermon \
......@@ -1093,6 +1092,8 @@ outfiles="$outfiles clientside/GNUmakefile \
clientside/GNUmakefile clientside/event/GNUmakefile \
clientside/event/program-agent/GNUmakefile \
clientside/tools/GNUmakefile clientside/tools/pcapper/GNUmakefile \
clientside/sensors/GNUmakefile clientside/sensors/slothd/GNUmakefile \
clientside/sensors/slothd/sdisrunning clientside/sensors/slothd/sddeploy \
clientside/os/GNUmakefile clientside/os/syncd/GNUmakefile \
clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment