Changeset 3313

Timestamp:

Feb 20, 2013, 9:22:46 AM (12 years ago)

Author:

ldelgass

Message:

vtkvis: write stats on data sets loaded. Should probably write a separate entry
before each data set is loaded and flush, so stats can be recorded before an
OOM situation.

Location:

branches/Rappture 1.2/packages/vizservers

Files:

• nanovis/nanovis.cpp (modified) (1 diff)
• pymolproxy/pymolproxy2.c (modified) (2 diffs)
• vtkvis/RpVtkRenderServer.cpp (modified) (5 diffs)
• vtkvis/RpVtkRenderServer.h (modified) (1 diff)
• vtkvis/RpVtkRendererCmd.cpp (modified) (1 diff)

branches/Rappture 1.2/packages/vizservers/nanovis/nanovis.cpp

@@ -338 +338 @@
     /* 
      * Session information:
-     *   1. Start date of session in seconds.
-     *   2. Process ID
-     *   3. Number of frames returned.
-     *   4. Number of bytes total returned (in frames).
-     *   5. Total elapsed time of all commands.
-     *   6. Total elapsed time of session.
-     *   7. Exit code of pymol server.
-     *   8. User time.  
-     *   9. System time.
-     *  10. Maximum resident size.
+     *   - Name of render server
+     *   - Process ID
+     *   - Hostname where server is running
+     *   - Start date of session
+     *   - Start date of session in seconds
+     *   - Number of frames returned
+     *   - Number of bytes total returned (in frames)
+     *   - Number of commands received
+     *   - Total elapsed time of all commands
+     *   - Total elapsed time of session
+     *   - Exit code of vizserver
+     *   - User time 
+     *   - System time
+     *   - User time of children 
+     *   - System time of children
      */ 
 

branches/Rappture 1.2/packages/vizservers/pymolproxy/pymolproxy2.c

@@ -624 +624 @@
     /* 
      * Session information:
-     *   1. Start date of session in seconds.
-     *   2. Process ID
-     *   3. Number of frames returned.
-     *   4. Number of bytes total returned (in frames).
-     *   5. Total elapsed time of all commands.
-     *   6. Total elapsed time of session.
-     *   7. Exit code of pymol server.
-     *   8. User time.  
-     *   9. System time.
-     *  10. Maximum resident size.
+     *   - Name of render server
+     *   - Process ID
+     *   - Hostname where server is running
+     *   - Start date of session
+     *   - Start date of session in seconds
+     *   - Number of frames returned
+     *   - Number of bytes total returned (in frames)
+     *   - Number of commands received
+     *   - Total elapsed time of all commands
+     *   - Total elapsed time of session
+     *   - Exit code of vizserver
+     *   - User time 
+     *   - System time
+     *   - User time of children 
+     *   - System time of children 
      */ 
 
@@ -641 +646 @@
     /* renderer */
     Tcl_DStringAppendElement(&ds, "renderer");
-    Tcl_DStringAppendElement(&ds, "nanovis");
+    Tcl_DStringAppendElement(&ds, "pymol");
     /* pid */
     Tcl_DStringAppendElement(&ds, "pid");

branches/Rappture 1.2/packages/vizservers/vtkvis/RpVtkRenderServer.cpp

@@ -273 +273 @@
     /* 
      * Session information:
-     *   1. Start date of session in seconds.
-     *   2. Process ID
-     *   3. Number of frames returned.
-     *   4. Number of bytes total returned (in frames).
-     *   5. Total elapsed time of all commands.
-     *   6. Total elapsed time of session.
-     *   7. Exit code of vizserver.
-     *   8. User time.  
-     *   9. System time.
-     *  10. Maximum resident size.
+     *   - Name of render server
+     *   - Process ID
+     *   - Hostname where server is running
+     *   - Start date of session
+     *   - Start 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)
+     *   - Number of commands received
+     *   - Total elapsed time of all commands
+     *   - Total elapsed time of session
+     *   - Exit code of vizserver
+     *   - User time 
+     *   - System time
+     *   - User time of children 
+     *   - System time of children 
      */
 
@@ -309 +316 @@
     sprintf(buf, "%ld", g_stats.start.tv_sec);
     Tcl_DStringAppendElement(&ds, buf);
+    /* num_data_sets */
+    Tcl_DStringAppendElement(&ds, "num_data_sets");
+    sprintf(buf, "%lu", (unsigned long int)g_stats.nDataSets);
+    Tcl_DStringAppendElement(&ds, buf);
+    /* data_set_bytes */
+    Tcl_DStringAppendElement(&ds, "data_set_bytes");
+    sprintf(buf, "%lu", (unsigned long int)g_stats.nDataBytes);
+    Tcl_DStringAppendElement(&ds, buf);
     /* num_frames */
     Tcl_DStringAppendElement(&ds, "num_frames");
@@ -315 +330 @@
     /* frame_bytes */
     Tcl_DStringAppendElement(&ds, "frame_bytes");
-    sprintf(buf, "%lu", (unsigned long int)g_stats.nBytes);
+    sprintf(buf, "%lu", (unsigned long int)g_stats.nFrameBytes);
     Tcl_DStringAppendElement(&ds, buf);
     /* num_commands */
@@ -429 +444 @@
             queueFrame(queue, imgData);
             g_stats.nFrames++;
-            g_stats.nBytes += imgData->GetDataSize() * imgData->GetDataTypeSize();
+            g_stats.nFrameBytes += imgData->GetDataSize() * imgData->GetDataTypeSize();
         } else {
             TRACE("No render required");
@@ -532 +547 @@
             writeFrame(g_fdOut, imgData);
             g_stats.nFrames++;
-            g_stats.nBytes += imgData->GetDataSize() * imgData->GetDataTypeSize();
+            g_stats.nFrameBytes += imgData->GetDataSize() * imgData->GetDataTypeSize();
         } else {
             TRACE("No render required");

branches/Rappture 1.2/packages/vizservers/vtkvis/RpVtkRenderServer.h

@@ -29 +29 @@
 typedef struct {
     pid_t pid;
+    size_t nDataSets;       /**< # of data sets received */
+    size_t nDataBytes;      /**< # of bytes received as data sets */
     size_t nFrames;         /**< # of frames sent to client. */
-    size_t nBytes;          /**< # of bytes for all frames. */
+    size_t nFrameBytes;     /**< # of bytes for all frames. */
     size_t nCommands;       /**< # of commands executed */
     double cmdTime;         /**< Elasped time spend executing commands. */

branches/Rappture 1.2/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -4071 +4071 @@
     g_renderer->addDataSet(name);
     g_renderer->setData(name, data, nbytes);
+    g_stats.nDataSets++;
+    g_stats.nDataBytes += nbytes;
     free(data);
     return TCL_OK;