Changeset 6643

Timestamp:

Nov 15, 2016 3:05:24 PM (8 years ago)

Author:

ldelgass

Message:

merge r6642 from pymolproxy trunk (dataset stats)

Location:

pymolproxy/branches/1.0

Files:

• . (modified) (1 prop)
• pymolproxy.c (modified) (6 diffs)

pymolproxy/branches/1.0/pymolproxy.c

@@ -87 +87 @@
 #include <md5.h>
 
-#define PYMOLPROXY_VERSION "1.0.2"
+#define PYMOLPROXY_VERSION "1.0.3"
 
 #undef INLINE
@@ -137 +137 @@
 typedef struct {
     pid_t pid;                          /* Child process. */
+    size_t numDataSets;                 /* # of pdb data sets received */
+    size_t numDataBytes;                /* # of bytes received as pdb */
     size_t numFrames;                   /* # of frames sent to client. */
     size_t numBytes;                    /* # of bytes for all frames. */
@@ -643 +645 @@
      *   - Stop date of session
      *   - Stop date of session in seconds
+     *   - Number of data sets loaded from client
+     *   - Number of data bytes total loaded from client
      *   - Number of frames returned
      *   - Number of bytes total returned (in frames)
@@ -678 +682 @@
     Tcl_DStringAppendElement(&ds, "date_secs");
     sprintf(buf, "%ld", now.tv_sec);
+    Tcl_DStringAppendElement(&ds, buf);
+    /* num_data_sets */
+    Tcl_DStringAppendElement(&ds, "num_data_sets");
+    sprintf(buf, "%lu", (unsigned long)stats.numDataSets);
+    Tcl_DStringAppendElement(&ds, buf);
+    /* data_set_bytes */
+    Tcl_DStringAppendElement(&ds, "data_set_bytes");
+    sprintf(buf, "%lu", (unsigned long)stats.numDataBytes);
     Tcl_DStringAppendElement(&ds, buf);
     /* num_frames */
@@ -1159 +1171 @@
         p->status = TCL_OK;
     }
+    stats.numDataSets++;
+    stats.numDataBytes += numBytes;
  error:
     if (allocated != NULL) {
@@ -2499 +2513 @@
     DEBUG("Idle timeout: %ld", idleTimeout);
 
+    memset(&stats, 0, sizeof(stats));
     InitProxy(&proxy, argv + optind);
     if (pthread_create(&thread1, NULL, &ClientToServer, &proxy) < 0) {