Commit 1a9d732f authored by Leigh B Stoller's avatar Leigh B Stoller

Checkpoint event/tevc and event/proxy move and build.

parent b726f701
...@@ -4827,6 +4827,8 @@ outfiles="Makeconf GNUmakefile \ ...@@ -4827,6 +4827,8 @@ outfiles="Makeconf GNUmakefile \
event/GNUmakefile \ event/GNUmakefile \
event/program-agent/GNUmakefile \ event/program-agent/GNUmakefile \
event/link-agent/GNUmakefile \ event/link-agent/GNUmakefile \
event/proxy/GNUmakefile \
event/tevc/GNUmakefile \
tools/GNUmakefile \ tools/GNUmakefile \
tools/pcapper/GNUmakefile \ tools/pcapper/GNUmakefile \
sensors/GNUmakefile \ sensors/GNUmakefile \
......
...@@ -155,6 +155,8 @@ outfiles="Makeconf GNUmakefile \ ...@@ -155,6 +155,8 @@ outfiles="Makeconf GNUmakefile \
event/GNUmakefile \ event/GNUmakefile \
event/program-agent/GNUmakefile \ event/program-agent/GNUmakefile \
event/link-agent/GNUmakefile \ event/link-agent/GNUmakefile \
event/proxy/GNUmakefile \
event/tevc/GNUmakefile \
tools/GNUmakefile \ tools/GNUmakefile \
tools/pcapper/GNUmakefile \ tools/pcapper/GNUmakefile \
sensors/GNUmakefile \ sensors/GNUmakefile \
......
...@@ -10,7 +10,7 @@ SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR)) ...@@ -10,7 +10,7 @@ SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
include $(OBJDIR)/Makeconf include $(OBJDIR)/Makeconf
SUBDIRS = program-agent link-agent tbgen SUBDIRS = program-agent link-agent tevc proxy
all: all-subdirs all: all-subdirs
......
...@@ -3,17 +3,13 @@ ...@@ -3,17 +3,13 @@
# Copyright (c) 2000-2011 University of Utah and the Flux Group. # Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
SRCDIR = @srcdir@ SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@ TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ../.. OBJDIR = @top_builddir@
SUBDIR = event/proxy SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
SYSTEM := $(shell uname -s) SYSTEM := $(shell uname -s)
PROGRAMS = evproxy proxytest eventping evproxyplab
ifneq ($(SYSTEM),Linux) PROGRAMS = evproxy proxytest evproxyplab
PROGRAMS += version0_gateway
endif
include $(OBJDIR)/Makeconf include $(OBJDIR)/Makeconf
...@@ -94,18 +90,14 @@ evproxyplab-debug: evproxyplab.o \ ...@@ -94,18 +90,14 @@ evproxyplab-debug: evproxyplab.o \
${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/event.h ${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/event.h
$(CPPC) $(LDFLAGS) -o $@ evproxyplab.o $(LIBS) $(CPPC) $(LDFLAGS) -o $@ evproxyplab.o $(LIBS)
version0_gateway: version0_gateway.c
$(CC) $(CFLAGS) $(PLDFLAGS) -pthread -o $@ $< -L/usr/local/lib \
-lpubsub_r -ltb -lm
eventping-debug: eventping.o eventping-debug: eventping.o
$(CC) $(LDFLAGS) -o $@ eventping.o -pthread $(LIBS) $(CC) $(LDFLAGS) -o $@ eventping.o -pthread $(LIBS)
$(PROGRAMS): ${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/event.h $(PROGRAMS): ${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/event.h
control-install: $(INSTALL_SBINDIR)/version0_gateway control-install:
install: $(INSTALL_DIR)/opsdir/sbin/version0_gateway boss-install: $(INSTALL_DIR)/opsdir/sbin/version0_gateway
client: evproxy evproxyplab client: evproxy evproxyplab
client-install: client client-install: client
......
/* /*
* EMULAB-COPYRIGHT * EMULAB-COPYRIGHT
* Copyright (c) 2003-2008 University of Utah and the Flux Group. * Copyright (c) 2003-2011 University of Utah and the Flux Group.
* All rights reserved. * All rights reserved.
*/ */
...@@ -132,7 +132,7 @@ main(int argc, char **argv) ...@@ -132,7 +132,7 @@ main(int argc, char **argv)
* or on a client node. * or on a client node.
*/ */
if (!server) if (!server)
server = EVENTSERVER; server = "event-server";
/* /*
* XXX Need to daemonize earlier or the threads go away. * XXX Need to daemonize earlier or the threads go away.
......
/* /*
* EMULAB-COPYRIGHT * EMULAB-COPYRIGHT
* Copyright (c) 2003-2009 University of Utah and the Flux Group. * Copyright (c) 2003-2011 University of Utah and the Flux Group.
* All rights reserved. * All rights reserved.
*/ */
...@@ -172,9 +172,8 @@ main(int argc, char **argv) ...@@ -172,9 +172,8 @@ main(int argc, char **argv)
* or on a client node. * or on a client node.
*/ */
if (!server) if (!server)
server = EVENTSERVER; server = "event-server";
/* /*
* Convert server/port to elvin thing. * Convert server/port to elvin thing.
* *
......
...@@ -3,13 +3,12 @@ ...@@ -3,13 +3,12 @@
# Copyright (c) 2000-2011 University of Utah and the Flux Group. # Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
SRCDIR = @srcdir@ SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@ TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ../.. OBJDIR = @top_builddir@
SUBDIR = event/tbgen SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
SYSTEM := $(shell uname -s) SYSTEM := $(shell uname -s)
PROGRAMS = tevc PROGRAMS = tevc
include $(OBJDIR)/Makeconf include $(OBJDIR)/Makeconf
......
/* /*
* EMULAB-COPYRIGHT * EMULAB-COPYRIGHT
* Copyright (c) 2000-2010 University of Utah and the Flux Group. * Copyright (c) 2000-2011 University of Utah and the Flux Group.
* All rights reserved. * All rights reserved.
*/ */
...@@ -165,10 +165,7 @@ main(int argc, char **argv) ...@@ -165,10 +165,7 @@ main(int argc, char **argv)
if (control) if (control)
server = "localhost"; server = "localhost";
else else
server = EVENTSERVER; server = "event-server";
}
if (!port && control) {
port = BOSSEVENTPORT;
} }
/* /*
......
...@@ -5613,7 +5613,6 @@ else ...@@ -5613,7 +5613,6 @@ else
event/etc/elvind-inetd.conf event/etc/GNUmakefile\ event/etc/elvind-inetd.conf event/etc/GNUmakefile\
event/sched/GNUmakefile \ event/sched/GNUmakefile \
event/new_sched/GNUmakefile \ event/new_sched/GNUmakefile \
event/tbgen/GNUmakefile \
event/example/GNUmakefile event/example/tbsend.pl \ event/example/GNUmakefile event/example/tbsend.pl \
event/example/tbrecv.pl event/example/tbsend-short.pl \ event/example/tbrecv.pl event/example/tbsend-short.pl \
event/example/tbsend.py event/example/tbrecv.py \ event/example/tbsend.py event/example/tbrecv.py \
...@@ -7230,6 +7229,8 @@ outfiles="$outfiles clientside/GNUmakefile \ ...@@ -7230,6 +7229,8 @@ outfiles="$outfiles clientside/GNUmakefile \
clientside/sensors/canaryd/GNUmakefile clientside/sensors/canaryd/feedbacklogs \ clientside/sensors/canaryd/GNUmakefile clientside/sensors/canaryd/feedbacklogs \
clientside/os/GNUmakefile clientside/os/syncd/GNUmakefile \ clientside/os/GNUmakefile clientside/os/syncd/GNUmakefile \
clientside/event/link-agent/GNUmakefile \ clientside/event/link-agent/GNUmakefile \
clientside/event/proxy/GNUmakefile \
clientside/event/tevc/GNUmakefile \
clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile" clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile"
# #
......
...@@ -702,7 +702,6 @@ else ...@@ -702,7 +702,6 @@ else
event/etc/elvind-inetd.conf event/etc/GNUmakefile\ event/etc/elvind-inetd.conf event/etc/GNUmakefile\
event/sched/GNUmakefile \ event/sched/GNUmakefile \
event/new_sched/GNUmakefile \ event/new_sched/GNUmakefile \
event/tbgen/GNUmakefile \
event/example/GNUmakefile event/example/tbsend.pl \ event/example/GNUmakefile event/example/tbsend.pl \
event/example/tbrecv.pl event/example/tbsend-short.pl \ event/example/tbrecv.pl event/example/tbsend-short.pl \
event/example/tbsend.py event/example/tbrecv.py \ event/example/tbsend.py event/example/tbrecv.py \
...@@ -1095,6 +1094,8 @@ outfiles="$outfiles clientside/GNUmakefile \ ...@@ -1095,6 +1094,8 @@ outfiles="$outfiles clientside/GNUmakefile \
clientside/sensors/canaryd/GNUmakefile clientside/sensors/canaryd/feedbacklogs \ clientside/sensors/canaryd/GNUmakefile clientside/sensors/canaryd/feedbacklogs \
clientside/os/GNUmakefile clientside/os/syncd/GNUmakefile \ clientside/os/GNUmakefile clientside/os/syncd/GNUmakefile \
clientside/event/link-agent/GNUmakefile \ clientside/event/link-agent/GNUmakefile \
clientside/event/proxy/GNUmakefile \
clientside/event/tevc/GNUmakefile \
clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile" clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile"
# #
......
...@@ -15,9 +15,6 @@ include $(OBJDIR)/Makeconf ...@@ -15,9 +15,6 @@ include $(OBJDIR)/Makeconf
SYSTEM := $(shell uname -s) SYSTEM := $(shell uname -s)
SUBDIRS = proxy example linktest SUBDIRS = proxy example linktest
ifneq ($(SYSTEM),CYGWIN_NT-5.1)
SUBDIRS += trafgen
endif
ifeq ($(SYSTEM),FreeBSD) ifeq ($(SYSTEM),FreeBSD)
FBSDREL := $(shell uname -r | sed -e 's/\([^-][^-]*\)-.*/\1/') FBSDREL := $(shell uname -r | sed -e 's/\([^-][^-]*\)-.*/\1/')
FBSDMAJ := $(basename $(FBSDREL)) FBSDMAJ := $(basename $(FBSDREL))
......
...@@ -3,14 +3,13 @@ ...@@ -3,14 +3,13 @@
# Copyright (c) 2000-2011 University of Utah and the Flux Group. # Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
SRCDIR = @srcdir@ SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@ TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ../.. OBJDIR = ../..
SUBDIR = event/proxy SUBDIR = event/proxy
SYSTEM := $(shell uname -s) SYSTEM := $(shell uname -s)
PROGRAMS = evproxy proxytest eventping evproxyplab PROGRAMS = eventping
ifneq ($(SYSTEM),Linux) ifneq ($(SYSTEM),Linux)
PROGRAMS += version0_gateway PROGRAMS += version0_gateway
endif endif
...@@ -79,21 +78,6 @@ LIBS += -ldl -lz ...@@ -79,21 +78,6 @@ LIBS += -ldl -lz
PLIBS += -ldl -lz PLIBS += -ldl -lz
endif endif
evproxy-debug: evproxy.o $(LIBTBDIR)/log.o
ifneq ($(SYSTEM),CYGWIN_NT-5.1)
$(CC) $(PLDFLAGS) -o $@ -pthread evproxy.o $(PLIBS)
else
$(CC) $(LDFLAGS) -o $@ evproxy.o $(LIBS)
endif
# Dave swears we use this on plab nodes. Hand installed into the rootball.
evproxyplab.o: evproxyplab.cc
$(CPPC) $(CFLAGS) -c $<
evproxyplab-debug: evproxyplab.o \
${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/event.h
$(CPPC) $(LDFLAGS) -o $@ evproxyplab.o $(LIBS)
version0_gateway: version0_gateway.c version0_gateway: version0_gateway.c
$(CC) $(CFLAGS) $(PLDFLAGS) -pthread -o $@ $< -L/usr/local/lib \ $(CC) $(CFLAGS) $(PLDFLAGS) -pthread -o $@ $< -L/usr/local/lib \
-lpubsub_r -ltb -lm -lpubsub_r -ltb -lm
...@@ -107,10 +91,8 @@ control-install: $(INSTALL_SBINDIR)/version0_gateway ...@@ -107,10 +91,8 @@ control-install: $(INSTALL_SBINDIR)/version0_gateway
install: $(INSTALL_DIR)/opsdir/sbin/version0_gateway install: $(INSTALL_DIR)/opsdir/sbin/version0_gateway
client: evproxy evproxyplab client:
client-install: client client-install:
$(INSTALL_PROGRAM) evproxy$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/evproxy$(EXE)
$(INSTALL_PROGRAM) evproxyplab$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/evproxy_shared$(EXE)
clean: clean:
/bin/rm -f *.o $(PROGRAMS) *-debug /bin/rm -f *.o $(PROGRAMS) *-debug
......
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