Changeset 2307 for branches/blt4/packages

Timestamp:

Jul 10, 2011 5:55:10 PM (13 years ago)

Author:

gah

Message:

update from trunk

Location:

branches/blt4/packages/vizservers

Files:

• nanoscale/server.c (modified) (8 diffs)
• nanovis/Command.cpp (modified) (1 diff)
• nanovis/ParticleSystem.cpp (modified) (1 diff)
• nanovis/Volume.h (modified) (1 diff)
• start_viz.sh.in (modified) (4 diffs)

branches/blt4/packages/vizservers/nanoscale/server.c

@@ -75 +75 @@
             _x > _y ? _x : _y; })
 
-#ifdef notdef
-static int 
-find_best_host(void)
-{
-    int h;
-    float best = load;
-    int index = -1;
-    //printf("My load is %f\n", best);
-    for(h=0; h<sizeof(host_array)/sizeof(host_array[0]); h++) {
-        if (host_array[h].in_addr.s_addr == 0)
-            continue;
-        //printf("%d I think load for %s is %f   ", h,
-        //       inet_ntoa(host_array[h].in_addr), host_array[h].load);
-        if (host_array[h].children <= children) {
-            if (host_array[h].load < best) {
-                //if ((random() % 100) < 75) {
-                index = h;
-                best = host_array[h].load;
-                //}
-                //printf(" Better\n");
-            } else {
-                //printf(" Worse\n");
-            }
-        }
-    }
-
-    //printf("I choose %d\n", index);
-    return index;
-}
-#endif
-
-static void 
-broadcast_load(void)
-{
-    int msg[2];
-    msg[0] = htonl(load);
-    msg[1] = htonl(children);
-    int status;
-    status = sendto(send_fd, &msg, sizeof(msg), 0, (struct sockaddr *)&send_addr,
-                    sizeof(send_addr));
-    if (status < 0) {
-        perror("sendto");
-    }
-}
 
 static void
@@ -140 +96 @@
            children, memory_in_use, load);
 
-#ifdef notdef
-    broadcast_load();
-#endif
 }
 
@@ -158 +111 @@
             return;
         }
-    }
-}
-
-static void 
-update_load_average(void)
-{
-    static unsigned int counter;
-
-    load = load / LOAD_DROP_OFF;
-    float newload = 0.0;
-    int c;
-    for(c=0; c < sizeof(child_array)/sizeof(child_array[0]); c++) {
-        if (child_array[c].pipefd != 0) {
-            newload += child_array[c].requests * child_array[c].memory;
-            child_array[c].requests = 0;
-        }
-    }
-    load = load + newload;
-
-    if ((counter++ % BROADCAST_INTERVAL) == 0) {
-        broadcast_load();
     }
 }
@@ -291 +223 @@
         server_command[0][0]=='\0') {
         int i;
-        fprintf(stderr, "nservices=%d, recv_port=%d, server_command[0]=%s\n", nservices, recv_port, server_command[0]);
         for (i = 0; i < argc; i++) {
             fprintf(stderr, "argv[%d]=(%s)\n", i, argv[i]);
@@ -399 +330 @@
     // We're ready to go.  Before going into the main loop,
     // broadcast a load announcement to other machines.
-#ifdef notdef
-    broadcast_load();
-#endif
     int maxfd = send_fd;
     FD_ZERO(&saved_rfds);
@@ -428 +356 @@
         if (status <= 0) {
             if (sigalarm_set) {
-                update_load_average();
                 sigalarm_set = 0;
             }
             continue;
         }
-      
       
         int accepted = 0;
@@ -537 +463 @@
                 int newmemory = ntohl(msg);
               
-#ifdef notdef
-                // Find the best host to create a new child on.
-                int index = find_best_host();
-              
-                // Only redirect if another host's load is significantly less
-                // than our own...
-                if (index != -1 &&
-                    (host_array[index].load < (LOAD_REDIRECT_FACTOR * load))) {
-                  
-                    // If we're redirecting to another machine, give that
-                    // machine an extra boost in our copy of the load
-                    // statistics.  This will keep us from sending the very
-                    // next job to it.  Eventually, the other machine will
-                    // broadcast its real load and we can make an informed
-                    // decision as to who redirect to again.
-                    host_array[index].load += newmemory * INITIAL_LOAD;
-                  
-                    // Redirect to another machine.
-                    printf("Redirecting to %s\n",
-                           inet_ntoa(host_array[index].in_addr));
-                    write(i, &host_array[index].in_addr.s_addr, 4);
-                    FD_CLR(i, &saved_rfds);
-                    clear_service_fd(i);
-                    close(i);
-                    continue;
-                }
-#endif 
                 memory_in_use += newmemory;
                 load += 2*INITIAL_LOAD;
-#ifdef notdef
-                broadcast_load();
-#endif
                 printf("Accepted new job with memory %d\n", newmemory);
                 //printf("My load is now %f\n", load);
@@ -654 +550 @@
                   
                     children++;
-                    broadcast_load();
                 }
               

branches/blt4/packages/vizservers/nanovis/Command.cpp

@@ -785 +785 @@
 
 static Rappture::CmdSpec cutplaneOps[] = {
-    {"position", 1, CutplanePositionOp, 4, 0, "bool axis ?indices?",},
-    {"state",    1, CutplaneStateOp,    4, 0, "relval axis ?indices?",},
+    {"position", 1, CutplanePositionOp, 4, 0, "relval axis ?indices?",},
+    {"state",    1, CutplaneStateOp,    4, 0, "bool axis ?indices?",},
 };
 static int nCutplaneOps = NumCmdSpecs(cutplaneOps);

branches/blt4/packages/vizservers/nanovis/ParticleSystem.cpp

@@ -13 +13 @@
 #include <GL/glaux.h>
 #else
+#ifdef notdef
 #include <opencv/cv.h>
 #include <opencv/highgui.h>
+#endif
 #endif
 

branches/blt4/packages/vizservers/nanovis/Volume.h

@@ -117 +117 @@
            float size, int n_component, float* data, double vmin, double vmax, 
            double nonzero_min);
-    ~Volume();
+    virtual ~Volume();
         
 public :

branches/blt4/packages/vizservers/start_viz.sh.in

@@ -12 +12 @@
 broadcast=`hostname -i | sed 's/\.[0-9]*$/.255/'`
 
-render_dir="@prefix@"
-vtk_lib_dir="@VTK_LIB_DIR@"
+exec_prefix="@exec_prefix@"
+bindir="@bindir@"
+libdir="@libdir@"
+. ${bindir}/rappture.env
+
 nanoscale_port=2000
 nanovis_port=2000
@@ -19 +22 @@
 pymol_port=2020
 
-# Build the name of the run directory. This is where nanoscale and the
-# visualization programs will reside.  The directory name is the same as the
-# render directory.
-dir="/tmp/`basename $render_dir`"
-
-# Get the versioned VTK library directory (e.g. "vtk-5.6")
-vtkdir="`basename $vtk_lib_dir`"
-
-PATH=${dir}/bin:$PATH
-LD_LIBRARY_PATH=${dir}/lib:${dir}/lib/${vtkdir}:$LD_LIBRARY_PATH
-PYMOL_PATH=${dir}/lib/pymol
+PYMOL_PATH=${libdir}/pymol
+# lspci is either in /sbin or /usr/sbin
+PATH=/sbin:/usr/sbin:${PATH}
 
 export PATH LD_LIBRARY_PATH PYMOL_PATH
@@ -39 +34 @@
 nvideo=`lspci | fgrep VGA | fgrep nVidia | wc -l`
 
-nanoscale="${dir}/bin/nanoscale -x ${nvideo} -b $nanoscale_port -s $broadcast"
-nanovis="${dir}/bin/nanovis -p ${dir}/lib/shaders:${dir}/lib/resources"
-vtkvis="${dir}/bin/vtkvis"
-pymolproxy="${dir}/bin/pymolproxy ${dir}/bin/pymol -p -q -i -x -X 0 -Y 0"
+nanoscale="${bindir}/nanoscale -x ${nvideo} -b $nanoscale_port -s $broadcast"
+nanovis="${bindir}/nanovis -p ${libdir}/shaders:${libdir}/resources"
+vtkvis="${bindir}/vtkvis"
+pymolproxy="${bindir}/pymolproxy ${bindir}/pymol -p -q -i -x -X 0 -Y 0"
 
-# Copy from render directory if the run copy doesn't already exist.
-# Otherwise use what's there.  This means that successive invocations
-# of nanoscale won't create their own run directories (only the first
-# one will).
-
-if test -d "$dir" ; then
-  echo "Reusing previously installed version from $render_dir"
-else 
-  echo "Copying rappture from $render_dir"
-  mkdir -p $dir
-  tar -C ${render_dir} -clf - . | tar -C $dir -xpf - 
-fi
-
-cd ${dir}
+cd /tmp
 
 # Don't let nanoscale and the visualization servers run away.
@@ -64 +46 @@
 ulimit -t $(expr ${minutes} \* 60 )
 
-echo "$nanoscale -l $nanovis_port -c \"$nanovis\" -l $pymol_port -c \"$pymolproxy\""
-$nanoscale -l $nanovis_port -c "$nanovis" -l $vtkvis_port -c "$vtkvis" -l $pymol_port -c "$pymolproxy"
+set -xv
+echo `ldd $vtkvis`
+exec $nanoscale \
+ -l $nanovis_port -c "$nanovis" \
+ -l $vtkvis_port  -c "$vtkvis" \
+ -l $pymol_port   -c "$pymolproxy"
 
+