Changeset 2403

Timestamp:

Aug 22, 2011, 9:03:55 AM (13 years ago)

Author:

gah

Message:

 

Location:

trunk

Files:

• gui/scripts/vtkviewer.tcl (modified) (5 diffs)
• packages/vizservers/nanoscale/server.c (modified) (17 diffs)

trunk/gui/scripts/vtkviewer.tcl

@@ -140 +140 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkViewer::constructor {hostlist args} {
-    if {[catch {info level -1} caller]} {
-        puts stderr "Enter constructor"
-    } else {
-        puts stderr "Enter constructor: $caller"
-    }
-
     # Rebuild event
     $_dispatcher register !rebuild
@@ -359 +353 @@
         set _height 500
     }
-    #puts stderr "screen size $_width $_height"
+    #puts stderr "DoResize screen size $_width $_height"
     set _start [clock clicks -milliseconds]
     SendCmd "screen size $_width $_height"
+
+    # Must reset camera to have object scaling to take effect.
+    SendCmd "camera reset all"
+    set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
+    $_arcball quaternion $q
+    SendCmd "camera orient $q" 
+    SendCmd "camera zoom $_view(zoom)"
     set _resizePending 0
 }
@@ -371 +372 @@
     $_arcball resize $w $h
     if { !$_resizePending } {
-        $_dispatcher event -after 400 !resize
         set _resizePending 1
+        $_dispatcher event -after 100 !resize
     }
 }
@@ -726 +727 @@
         if { $_start > 0 } {
             set finish [clock clicks -milliseconds]
-            puts stderr "round trip time [expr $finish -$_start] milliseconds"
+            #puts stderr "round trip time [expr $finish -$_start] milliseconds"
             set _start 0
         }
@@ -1325 +1326 @@
         3,0 $inner.lighting  -columnspan 4 -anchor w \
         4,0 $inner.edges -columnspan 4 -anchor w -pady 2 \
-        5,0 $inner.clear -anchor e -pady 2 \
+        6,0 $inner.clear -anchor e -pady 2 \
         6,1 $inner.opacity -columnspan 2 -pady 2 -fill x\
         6,3 $inner.opaque -anchor w -pady 2 

trunk/packages/vizservers/nanoscale/server.c

@@ -1 @@
-
 #include <stdio.h>
 #include <unistd.h>
@@ -77 +76 @@
 
 
-#include <syslog.h>
-#include <stdarg.h>
-
-#define ERROR(...)      LogMessage(LOG_ERR, __FILE__, __LINE__, __VA_ARGS__)
-#ifdef WANT_TRACE
-#define TRACE(...)      LogMessage(LOG_DEBUG, __FILE__, __LINE__, __VA_ARGS__)
-#else 
-#define TRACE(...) 
-#endif
-#define WARN(...)       LogMessage(LOG_WARNING, __FILE__, __LINE__, __VA_ARGS__)
-#define INFO(...)       LogMessage(LOG_INFO, __FILE__, __LINE__, __VA_ARGS__)
-
-void 
-LogMessage(int priority, const char *path, int lineNum, const char* fmt, ...)
-{
-#define MSG_LEN (2047)
-    char message[MSG_LEN+1];
-    const char *s;
-    int length;
-    va_list lst;
-
-    va_start(lst, fmt);
-    s = strrchr(path, '/');
-    if (s == NULL) {
-        s = path;
-    } else {
-        s++;
-    }
-    length = snprintf(message, MSG_LEN, "line %d of \"%s\": ", lineNum, s);
-    length += vsnprintf(message + length, MSG_LEN - length, fmt, lst);
-    message[MSG_LEN] = '\0';
-    syslog(priority, message, length);
-}
-
 static void
 close_child(int pipe_fd)
@@ -128 +93 @@
     }
   
-    INFO("processes=%d, memory=%d, load=%f\n", children, memory_in_use, load);
+    printf("processes=%d, memory=%d, load=%f\n",
+           children, memory_in_use, load);
 
 }
@@ -139 +105 @@
             child_array[c].requests += value;
 #ifdef DEBUGGING
-            INFO("Updating requests from pipefd %d to %f\n",
+            printf("Updating requests from pipefd %d to %f\n",
                    child_array[c].pipefd,
                    child_array[c].requests);
@@ -159 +125 @@
 help(const char *argv0)
 {
-    printf("Syntax: %s [-d] -b <broadcast port> -l <listen port> -s <subnet> -c 'command'\n",
+    fprintf(stderr,
+            "Syntax: %s [-d] -b <broadcast port> -l <listen port> -s <subnet> -c 'command'\n",
             argv0);
     exit(1);
@@ -216 +183 @@
             maxCards = strtoul(optarg, 0, 0);
             if ((maxCards < 1) || (maxCards > 10)) {
-                ERROR("bad number of max videocards specified\n");
+                fprintf(stderr, "bad number of max videocards specified\n");
                 return 1;
             }
@@ -230 +197 @@
 
             if (listen_port[nservices] == -1) {
-                ERROR("Must specify -l port before each -c command.\n");
+                fprintf(stderr,"Must specify -l port before each -c command.\n");
                 return 1;
             }
@@ -243 +210 @@
             send_addr.sin_addr.s_addr = htonl(inet_network(optarg));
             if (send_addr.sin_addr.s_addr == -1) {
-                ERROR("Invalid subnet broadcast address");
+                fprintf(stderr,"Invalid subnet broadcast address");
                 return 1;
             }
             break;
         default:
-            ERROR("Don't know what option '%c'.\n", c);
+            fprintf(stderr,"Don't know what option '%c'.\n", c);
             return 1;
         }
@@ -257 +224 @@
         int i;
         for (i = 0; i < argc; i++) {
-            INFO("argv[%d]=(%s)\n", i, argv[i]);
+            fprintf(stderr, "argv[%d]=(%s)\n", i, argv[i]);
         }
         help(argv[0]);
@@ -406 +373 @@
                 }
               
-                INFO("New connection from %s\n", inet_ntoa(newaddr.sin_addr));
+                printf("New connection from %s\n", inet_ntoa(newaddr.sin_addr));
                 FD_SET(newfd, &saved_rfds);
                 maxfd = max(maxfd, newfd);
@@ -428 +395 @@
             }
             if (status != 8) {
-                ERROR("Bogus message from %s\n", inet_ntoa(peer_addr.sin_addr));
+                fprintf(stderr,"Bogus message from %s\n",
+                        inet_ntoa(peer_addr.sin_addr));
                 continue;
             }
             float peer_load = ntohl(buffer[0]);
             int peer_procs = ntohl(buffer[1]);
+            //printf("Load for %s is %f (%d processes).\n",
+            //       inet_ntoa(peer_addr.sin_addr), peer_load, peer_procs);
             int h;
             int free_index=-1;
@@ -439 +409 @@
                 if (host_array[h].in_addr.s_addr == peer_addr.sin_addr.s_addr) {
                     if (host_array[h].children != peer_procs) {
-                        INFO("Load for %s is %f (%d processes).\n", inet_ntoa(peer_addr.sin_addr), peer_load, peer_procs);
+                        printf("Load for %s is %f (%d processes).\n",
+                               inet_ntoa(peer_addr.sin_addr), peer_load, peer_procs);
                     }
                     host_array[h].load = peer_load;
@@ -482 +453 @@
                 status = read(i, &msg, 4);
                 if (status != 4) {
-                    ERROR("Bad status on read (%d).", status);
+                    fprintf(stderr,"Bad status on read (%d).", status);
                     FD_CLR(i, &saved_rfds);
                     clear_service_fd(i);
@@ -494 +465 @@
                 memory_in_use += newmemory;
                 load += 2*INITIAL_LOAD;
-                INFO("Accepted new job with memory %d\n", newmemory);
+                printf("Accepted new job with memory %d\n", newmemory);
+                //printf("My load is now %f\n", load);
               
                 // accept the connection.
                 msg = 0;
                 if (write(i, &msg, 4) != 4) {
-                    ERROR("short write for hostname\n");
+                    fprintf(stderr, "short write for hostname\n");
                 }
               
@@ -535 +507 @@
                                 int fd;
 
-                                dup2(i, 0); // stdin
-                                dup2(i, 1); // stdout
-                                dup2(i, 2); // stderr
+                                dup2(i, 0);  // stdin
+                                dup2(i, 1);  // stdout
+                                dup2(i, 2);  // stderr
                                 dup2(pair[1],3);
                                 // read end of pipe moved, and left open to
@@ -549 +521 @@
                                     displayVar[11] = dispNum + '0';
                                 }
-                                fprintf(stderr, "command=%s\n", 
-                                        command_argv[n][0]);
-                                if (execvp(command_argv[n][0], command_argv[n]) < 1) {
-                                    extern int errno;
-
-                                    ERROR("can't execute \"%s\": %s\n", 
-                                          command_argv[n][0], strerror(errno));
-                                } else {
-                                    INFO("started command \"%s\": %s\n", 
-                                        command_argv[n][0], strerror(errno));
-                                }
+                                execvp(command_argv[n][0], command_argv[n]);
                             }
                             _exit(errno);
@@ -565 +527 @@
                     }
                     _exit(EINVAL);
+                  
                 } else {
                     int c;