Changeset 2551 for branches

Timestamp:

Sep 21, 2011, 7:06:23 PM (13 years ago)

Author:

gah

Message:

initial buffered read implementation

Location:

branches/vtkvis_threaded

Files:

• Makefile.in (modified) (1 diff)
• ReadBuffer.cpp (added)
• ReadBuffer.h (added)
• RpVtkRenderServer.cpp (modified) (7 diffs)
• RpVtkRenderServer.h (modified) (1 diff)
• RpVtkRendererCmd.cpp (modified) (8 diffs)
• RpVtkRendererCmd.h (modified) (1 diff)

branches/vtkvis_threaded/Makefile.in

@@ -84 +84 @@
                 ColorMap.cpp \
                 PPMWriter.cpp \
+                ReadBuffer.cpp \
                 RpContour2D.cpp \
                 RpContour3D.cpp \

branches/vtkvis_threaded/RpVtkRenderServer.cpp

@@ -22 +22 @@
 
 #include "Trace.h"
+#include "ReadBuffer.h"
 #include "RpVtkRenderServer.h"
 #include "RpVtkRendererCmd.h"
@@ -40 +41 @@
 FILE *Rappture::VtkVis::g_fLog = NULL; ///< Trace logging file handle
 Renderer *Rappture::VtkVis::g_renderer = NULL; ///< Main render worker
+ReadBuffer *Rappture::VtkVis::g_inBufPtr;
 
 #define ELAPSED_TIME(t1, t2) \
@@ -247 +249 @@
     vtkSmartPointer<vtkUnsignedCharArray> imgData = 
         vtkSmartPointer<vtkUnsignedCharArray>::New();
+    ReadBuffer inBuf(fileno(g_fIn), 1<<12);
+    g_inBufPtr = &inBuf;
     for (;;) {
         int ret;
 
-        ret = processCommands(interp, g_fIn, g_fOut);
+        ret = processCommands(interp, &inBuf, g_fOut);
         if (ret < 0)
             break;
@@ -260 +264 @@
             TRACE("No render required");
         }
-        if (feof(g_fIn))
+        if (inBuf.status() == ReadBuffer::ENDFILE)
             break;
     }    
@@ -340 +344 @@
     vtkSmartPointer<vtkUnsignedCharArray> imgData = 
         vtkSmartPointer<vtkUnsignedCharArray>::New();
+    ReadBuffer inBuf(fileno(g_fIn), 1<<12);
+    g_inBufPtr = &inBuf;
     while (1) {
-        ret = processCommands(interp, g_fIn, g_fOut);
+        ret = processCommands(interp, &inBuf, g_fOut);
         if (ret < 0)
             break;
@@ -353 +359 @@
         }
 
-        if (feof(g_fIn))
+        if (inBuf.status() == ReadBuffer::ENDFILE)
             break;
     }
@@ -371 +377 @@
     return 0;
 }
-

branches/vtkvis_threaded/RpVtkRenderServer.h

@@ -20 +20 @@
 extern FILE *g_fLog;
 extern Renderer *g_renderer;
+extern ReadBuffer *g_inBufPtr;
 
 }

branches/vtkvis_threaded/RpVtkRendererCmd.cpp

@@ -19 +19 @@
 #include "Trace.h"
 #include "CmdProc.h"
+#include "ReadBuffer.h"
 #include "RpVtkRendererCmd.h"
 #include "RpVtkRenderServer.h"
@@ -65 +66 @@
 #endif  /*USE_THREADS*/
 
-static size_t
-SocketRead(void *bytes, size_t len)
-{
-#ifdef notdef
-    size_t ofs = 0;
-    ssize_t bytesRead = 0;
-    while ((bytesRead = read(g_fdIn, bytes + ofs, len - ofs)) > 0) {
-        ofs += bytesRead;
-        if (ofs == len)
-            break;
-    }
-    TRACE("bytesRead: %lu", ofs);
-    return ofs;
-#else
-    size_t bytesRead = fread(bytes, 1, len, g_fIn);
-    TRACE("bytesRead: %lu", bytesRead);
-    return bytesRead;
-#endif
+static bool
+SocketRead(char *bytes, size_t len)
+{
+    ReadBuffer::BufferStatus status;
+    status = g_inBufPtr->FollowingData((unsigned char *)bytes, len);
+    TRACE("bytesRead: %lu", status);
+    return (status == ReadBuffer::OK);
 }
 
@@ -1688 +1678 @@
     }
     char *data = (char *)malloc(nbytes);
-    size_t bytesRead = SocketRead(data, nbytes);
-    if (bytesRead < (size_t)nbytes) {
+    if (!SocketRead(data, nbytes)) {
         free(data);
         return TCL_ERROR;
@@ -4767 +4756 @@
     }
     char *data = (char *)malloc(nbytes);
-    size_t bytesRead = SocketRead(data, nbytes);
-    if (bytesRead < (size_t)nbytes) {
+    if (!SocketRead(data, nbytes)) {
         free(data);
         return TCL_ERROR;
@@ -4816 +4804 @@
     }
     char *data = (char *)malloc(nbytes);
-    size_t bytesRead = SocketRead(data, nbytes);
-    if (bytesRead < (size_t)nbytes) {
+    if (!SocketRead(data, nbytes)) {
         free(data);
         return TCL_ERROR;
@@ -5364 +5351 @@
  */
 int
-Rappture::VtkVis::processCommands(Tcl_Interp *interp, FILE *fin, FILE *fout)
+Rappture::VtkVis::processCommands(Tcl_Interp *interp, ReadBuffer *inBufPtr, 
+                                  FILE *fout)
 {
     int status = TCL_OK;
-
-#define BUFFERSIZE   ((1<<16)-1)
-    char buffer[BUFFERSIZE+1];
 
     Tcl_DString command;
     Tcl_DStringInit(&command);
-
     fd_set readFds;
     struct timeval tv, *tvPtr;
 
     FD_ZERO(&readFds);
-    FD_SET(fileno(fin), &readFds);
+    FD_SET(inBufPtr->file(), &readFds);
     tvPtr = NULL;                       /* Initially there is no timeout. */
-    while (select(1, &readFds, NULL, NULL, tvPtr) > 0) {
-        if (fgets(buffer, BUFFERSIZE, fin) == NULL) {
-            /* Terminate the server if we can't
-             * communicate with the client
+    while ((inBufPtr->IsLineAvailable()) || 
+           ((select(1, &readFds, NULL, NULL, tvPtr) > 0))) {
+        size_t numBytes;
+        unsigned char *buffer;
+
+        if (inBufPtr->GetLine(&numBytes, &buffer) != ReadBuffer::OK) {
+            /* Terminate the server if we can't communicate with the client
              * anymore. */
-            if (feof(fin)) {
+            if (inBufPtr->status() == ReadBuffer::ENDFILE) {
                 INFO("Exiting server on EOF from client");
                 exit(0);
@@ -5394 +5381 @@
             }
         }
-        buffer[BUFFERSIZE] = '\0';
-        Tcl_DStringAppend(&command, buffer, -1);
+        Tcl_DStringAppend(&command, (char *)buffer, numBytes);
         if (Tcl_CommandComplete(Tcl_DStringValue(&command))) {
             status = ExecuteCommand(interp, &command);
@@ -5406 +5392 @@
         }
         tv.tv_sec = tv.tv_usec = 0L;
-        FD_SET(fileno(fin), &readFds);
+        FD_SET(inBufPtr->file(), &readFds);
         tvPtr = &tv;
     }

branches/vtkvis_threaded/RpVtkRendererCmd.h

@@ -11 +11 @@
 #include <cstdio>
 #include <tcl.h>
+#include "ReadBuffer.h"
 
 namespace Rappture {
 namespace VtkVis {
 
-extern int processCommands(Tcl_Interp *interp, FILE *fin, FILE *fout);
+extern int processCommands(Tcl_Interp *interp, ReadBuffer *inBufPtr, 
+        FILE *fout);
 extern void initTcl(Tcl_Interp *interp, ClientData clientData);
 extern void exitTcl(Tcl_Interp *interp);