Changeset 4592 for pymolproxy

Timestamp:

Aug 1, 2014 7:30:44 PM (10 years ago)

Author:

ldelgass

Message:

Remove old (non-threaded) pymolproxy implementation from trunk. Can be restored
to a branch if ever need it again. The trunk version of nanoscale will be
changed to use pymolproxy as the binary name

Location:

pymolproxy/trunk

Files:

• Makefile.in (modified) (4 diffs)
• pymolproxy.c (moved) (moved from pymolproxy/trunk/pymolproxy2.c) (1 diff)

pymolproxy/trunk/Makefile.in

@@ -1 +1 @@
 
-TARGETS =       pymolproxy pymolproxy2
+TARGETS =       pymolproxy
 
 CC =            @CC@
@@ -34 +34 @@
 .PHONY: all install clean distclean
 
-FILES =         pymolproxy pymolproxy2 
+FILES =         pymolproxy
 PROXY_OBJS =    pymolproxy.o md5.o
-PROXY2_OBJS =   pymolproxy2.o md5.o 
 LIBS =          $(TCL_LIB_SPEC) \
                 -Wl,-rpath,$(libdir) 
@@ -45 +44 @@
 
 pymolproxy: $(PROXY_OBJS) 
-        $(CC) $(CC_SWITCHES) -o $@ $^ $(LIBS)
-
-pymolproxy2: $(PROXY2_OBJS) 
         $(CC) $(CC_SWITCHES) -o $@ $^ $(LIBS) -lpthread
 
@@ -55 +51 @@
 install: install-pymolproxy install-scripts
 
-install-pymolproxy: pymolproxy pymolproxy2
+install-pymolproxy: pymolproxy
         $(MKDIR_P) -m 0755 $(bindir)
         for i in $(FILES) ; do \

pymolproxy/trunk/pymolproxy.c

@@ -253 +253 @@
         s++;
     }
-    length = snprintf(message, MSG_LEN, "pymolproxy2 (%d) %s: %s:%d ", 
+    length = snprintf(message, MSG_LEN, "pymolproxy (%d) %s: %s:%d ", 
         getpid(), syslogLevels[priority],  s, lineNum);
     length += vsnprintf(message + length, MSG_LEN - length, fmt, lst);