Commit 323d41dd authored by Leigh Stoller's avatar Leigh Stoller

Minor changes to the plab version of the proxy, so that we can run it

on local shared hosts. Like plab nodes, vnodes from different
experiments will be running on the same physnode, and the plab proxy
does exactly what we need.

I actually install it as evproxy_shared ...

Lbs
parent 949d9709
......@@ -95,6 +95,7 @@ $(PROGRAMS): ../lib/libevent.a ../lib/event.h
client: evproxy
client-install: client
$(INSTALL_PROGRAM) evproxy$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/evproxy$(EXE)
$(INSTALL_PROGRAM) evproxyplab$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/evproxy_shared$(EXE)
clean:
/bin/rm -f *.o $(PROGRAMS) *-debug
......@@ -40,7 +40,8 @@ static char nodeidstr[BUFSIZ], ipaddr[32];
void
usage(char *progname)
{
fprintf(stderr, "Usage: %s [-s server] [-p port] -n pnodeid -l local_elvin_port\n", progname);
fprintf(stderr, "Usage: %s [-s server] [-p port] [-l local_elvin_port] "
"-n pnodeid \n", progname);
exit(-1);
}
......@@ -118,9 +119,8 @@ main(int argc, char **argv)
if (argc)
usage(progname);
if ((! pnodeid) || (! lport))
fatal("Must provide pnodeid and local event server port");
if (! pnodeid)
fatal("Must provide pnodeid");
if (debug) {
loginit(0, 0);
......@@ -190,7 +190,9 @@ main(int argc, char **argv)
snprintf(nodeidstr, sizeof(nodeidstr), "__%s_proxy", pnodeid);
/* Register with the event system on the local node */
snprintf(buf, sizeof(buf), "elvin://localhost:%s",lport);
snprintf(buf, sizeof(buf), "elvin://localhost%s%s",
(lport ? ":" : ""),
(lport ? lport : ""));
localhandle = event_register(buf, 0);
if (localhandle == NULL) {
fatal("could not register with local event system");
......
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