Changeset 3361

Timestamp:

Feb 26, 2013 1:42:53 AM (11 years ago)

Author:

ldelgass

Message:

Sync with trunk

Location:

branches/nanovis2

Files:

• . (modified) (1 prop)
• packages/vizservers/vtkvis/RpVtkDataSet.cpp (modified) (3 diffs)
• packages/vizservers/vtkvis/RpVtkRendererCmd.cpp (modified) (4 diffs)
• packages/vizservers/vtkvis/RpVtkRendererCmd.h (modified) (1 diff)
• packages/vizservers/vtkvis/Trace.cpp (modified) (2 diffs)
• packages/vizservers/vtkvis/Trace.h (modified) (2 diffs)

branches/nanovis2/packages/vizservers/vtkvis/RpVtkDataSet.cpp

@@ -356 +356 @@
 
     _dataSet = reader->GetOutput();
+    if (_dataSet == NULL)
+        return false;
 #ifndef USE_VTK6
     _dataSet->SetPipelineInformation(NULL);
@@ -362 +364 @@
         _dataSet->GetPointData()->GetScalars() != NULL &&
         _dataSet->GetPointData()->GetScalars()->GetLookupTable() != NULL) {
-        ERROR("No lookup table should be specified in DataSets");
+        USER_ERROR("No lookup table should be specified in VTK data sets");
     }
 
@@ -389 +391 @@
         _dataSet->GetPointData()->GetScalars() != NULL &&
         _dataSet->GetPointData()->GetScalars()->GetLookupTable() != NULL) {
-        ERROR("No lookup table should be specified in DataSets");
+        USER_ERROR("No lookup table should be specified in VTK data sets");
     }
 

branches/nanovis2/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -82 +82 @@
     int result;
 
-    TRACE("command: '%s'", Tcl_DStringValue(dsPtr));
+    TRACE("command %lu: '%s'", g_stats.nCommands+1, Tcl_DStringValue(dsPtr));
     lastCmdStatus = TCL_OK;
     result = Tcl_EvalEx(interp, Tcl_DStringValue(dsPtr), 
@@ -4070 +4070 @@
     }
     g_renderer->addDataSet(name);
-    g_renderer->setData(name, data, nbytes);
+    if (!g_renderer->setData(name, data, nbytes)) {
+        USER_ERROR("Failed to load data for dataset \"%s\"", name);
+        free(data);
+        return TCL_ERROR;
+    }
     g_stats.nDataSets++;
     g_stats.nDataBytes += nbytes;
@@ -9697 +9701 @@
                                          * and allow a new image to be
                                          * rendered. */
-            } else if (status != TCL_OK) {
+            } else { //if (status != TCL_OK) {
                 ret = 0;
                 if (handleError(interp, clientData, status, fdOut) < 0) {
@@ -9725 +9729 @@
     int nBytes;
 
-    string = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
-    TRACE("status=%d errorInfo=(%s)", status, string);
+    TRACE("Enter");
+
+    if (status != TCL_OK) {
+        string = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
+        nBytes = strlen(string);
+        if (nBytes > 0) {
+            TRACE("status=%d errorInfo=(%s)", status, string);
+
+            std::ostringstream oss;
+#ifdef OLD_ERRORS
+            oss << "VtkVis Server Error: " << string << "\n";
+            nBytes += 22;
+#else
+            oss << "nv>viserror -type internal_error -token " << g_stats.nCommands << " -bytes " << nBytes << "\n" << string;
+            nBytes = oss.str().length();
+#endif
+
+#ifdef USE_THREADS
+            QueueResponse(clientData, oss.str().c_str(), nBytes, Response::VOLATILE, Response::ERROR);
+#else
+            if (write(fdOut, oss.str().c_str(), nBytes) < 0) {
+                ERROR("write failed: %s", strerror(errno));
+                return -1;
+            }
+#endif
+        }
+    }
+
+    TRACE("Before user error");
+
+    string = getUserMessages();
     nBytes = strlen(string);
-
-    std::ostringstream oss;
+    if (nBytes > 0) {
+        TRACE("userError=(%s)", string);
+
+        std::ostringstream oss;
 #ifdef OLD_ERRORS
-    oss << "VtkVis Server Error: " << string << "\n";
-    nBytes += 22;
+        oss << "VtkVis Server Error: " << string << "\n";
+        nBytes += 22;
 #else
-    oss << "nv>viserror -type error -bytes " << nBytes << "\n" << string;
-    nBytes = oss.str().length();
+        oss << "nv>viserror -type error -token " << g_stats.nCommands << " -bytes " << nBytes << "\n" << string;
+        nBytes = oss.str().length();
 #endif
 
 #ifdef USE_THREADS
-    QueueResponse(clientData, oss.str().c_str(), nBytes, Response::VOLATILE, Response::ERROR);
+        QueueResponse(clientData, oss.str().c_str(), nBytes, Response::VOLATILE, Response::ERROR);
 #else
-    if (write(fdOut, oss.str().c_str(), nBytes) < 0) {
-        ERROR("write failed: %s", strerror(errno));
-        return -1;
-    }
+        if (write(fdOut, oss.str().c_str(), nBytes) < 0) {
+            ERROR("write failed: %s", strerror(errno));
+            return -1;
+        }
 #endif
+        clearUserMessages();
+    }
+
+    TRACE("Leave");
 
     return 0;

branches/nanovis2/packages/vizservers/vtkvis/RpVtkRendererCmd.h

@@ -11 +11 @@
 #include <cstdio>
 #include <tcl.h>
+
 #include "ReadBuffer.h"
 

branches/nanovis2/packages/vizservers/vtkvis/Trace.cpp

@@ -11 +11 @@
 #include <syslog.h>
 
+#include <string>
+#include <sstream>
+
 #include "Trace.h"
 
 using namespace Rappture::VtkVis;
+
+static std::ostringstream g_UserErrorString;
 
 #define MSG_LEN 2047
@@ -64 +69 @@
     syslog(priority, "%s", message);
 }
+
+/**
+ * \brief Write a user message to buffer
+ */
+void 
+Rappture::VtkVis::logUserMessage(const char* fmt, ...)
+{
+    char message[MSG_LEN + 1];
+    int length = 0;
+    va_list lst;
+
+    va_start(lst, fmt);
+
+    length += vsnprintf(message, MSG_LEN, fmt, lst);
+    message[MSG_LEN] = '\0';
+
+    g_UserErrorString << message << "\n";
+}
+
+const char *
+Rappture::VtkVis::getUserMessages()
+{
+    return g_UserErrorString.str().c_str();
+}
+
+void 
+Rappture::VtkVis::clearUserMessages()
+{
+    g_UserErrorString.str(std::string());
+}

branches/nanovis2/packages/vizservers/vtkvis/Trace.h

@@ -13 +13 @@
 namespace Rappture {
 namespace VtkVis {
+
+extern void logUserMessage(const char* format, ...);
+
+extern const char *getUserMessages();
+
+extern void clearUserMessages();
 
 extern void initLog();
@@ -30 +36 @@
 #define INFO(...)       Rappture::VtkVis::logMessage(LOG_INFO, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
 
+#define USER_ERROR(...) Rappture::VtkVis::logUserMessage(__VA_ARGS__)
+
 }
 }