[Brlcad-commits] CVS: brlcad/src/adrt/rise/master main.c,1.2,1.3 master.c,1.4,1.5 master.h,1.1,1.2

[Justin S. <tw...@us...>]

Update of /cvsroot/brlcad/brlcad/src/adrt/rise/master
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24062/rise/master

Modified Files:
	main.c master.c master.h 
Log Message:
Moved the g loader int adrt to a converter in brl-cad.  The converter creates
all the necessary files that adrt needs to use geometry.  Going to fix unpack
next so the program is usable again.


Index: main.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/adrt/rise/master/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -w -u -r1.2 -r1.3
--- main.c	17 Jun 2005 21:41:01 -0000	1.2
+++ main.c	1 Jul 2005 21:07:54 -0000	1.3
@@ -24,19 +24,16 @@
 static struct option longopts[] =
 {
 	{ "exec",	required_argument,	NULL, 'e' },
-	{ "geom",	required_argument,	NULL, 'g' },
-	{ "args",	required_argument,	NULL, 'a' },
 	{ "help",	no_argument,		NULL, 'h' },
 	{ "interval",	required_argument,	NULL, 'i' },
-	{ "obs_port",	required_argument,	NULL, 'O' },
-	{ "port",	required_argument,	NULL, 'P' },
+	{ "obs_port",	required_argument,	NULL, 'o' },
+	{ "port",	required_argument,	NULL, 'p' },
 	{ "version",	no_argument,		NULL, 'v' },
   	{ "list",	required_argument,	NULL, 'l' },
-  	{ "proj",	required_argument,	NULL, 'p' },
 };
 #endif
 
-static char shortopts[] = "e:a:g:i:hO:P:vl:p:";
+static char shortopts[] = "e:i:hvl:p:";
 
 
 static void finish(int sig) {
@@ -47,23 +44,20 @@
 
 static void help() {
   printf("%s\n", RISE_VER_DETAIL);
-  printf("%s\n", "usage: rise_master [options]\n\
-  -v\t\tdisplay version\n\
-  -h\t\tdisplay help\n\
-  -P\t\tport number\n\
-  -O\t\tobserver port number\n\
-  -e ...\tfile to execute that starts slaves\n\
-  -i ...\tinterval in minutes between each autosave dump\n\
-  -l ...\tfile containing list of slave hostnames to distribute work to\n\
-  -p ...\tproject directory\n\
-  -g ...\tlocation of geometry file\n\
-  -a ...\targuments to geometry file\n");
+  printf("%s\n", "usage: rise_master [options] [proj_env_file]\n\
+  -h\t\tdisplay help.\n\
+  -p\t\tset master port number.\n\
+  -o\t\tset observer port number.\n\
+  -i\t\tinterval in minutes between each autosave.\n\
+  -l\t\tfile containing list of slaves to use as compute nodes.\n\
+  -e\t\tscript to execute that starts slaves.\n\  
+  -v\t\tdisplay version info.\n");
 }
 
 
 int main(int argc, char **argv) {
   int port = 0, obs_port, c = 0, interval = 1;
-  char proj[64], exec[64], list[64], temp[64], geom[64], args[64];
+  char proj[64], exec[64], list[64], temp[64];
 
 
   signal(SIGINT, finish);
@@ -77,8 +71,6 @@
   list[0] = 0;
   exec[0] = 0;
   proj[0] = 0;
-  geom[0] = 0;
-  args[0] = 0;
   port = TN_MASTER_PORT;
   obs_port = RISE_OBSERVER_PORT;
 
@@ -93,21 +85,15 @@
 	)!= -1)
   {
 	  switch(c) {
-		  case 'O':
+		  case 'o':
 			  obs_port = atoi(optarg);
 			  break;
-		  case 'P':
+		  case 'p':
 			  port = atoi(optarg);
 			  break;
-		  case 'a':
-			  strncpy(args, optarg, 64);
-			  break;
 		  case 'e':
 			  strncpy(exec, optarg, 64);
 			  break;
-		  case 'g':
-			  strncpy(geom, optarg, 64);
-			  break;
 		  case 'i':
 			  strncpy(temp, optarg, 4);
 			  interval = atoi(temp);
@@ -117,9 +103,6 @@
 		  case 'l':
 			  strncpy(list, optarg, 64);
 			  break;
-		  case 'p':
-			  strncpy(proj, optarg, 64);
-			  break;
 		  case 'h':
 			  help();
 			  return EXIT_SUCCESS;
@@ -134,12 +117,10 @@
   argc -= optind;
   argv += optind;
 
+  strcpy(proj, argv[0]);
+
   if(proj[0]) {
-    if(!geom[0]) {
-      printf("must supply additional argument: -g /path/to/geometry/file\n");
-      return EXIT_FAILURE;
-    }
-    rise_master(port, obs_port, proj, geom, args, list, exec, interval);
+    rise_master(port, obs_port, proj, list, exec, interval);
   } else {
     help();
     return EXIT_FAILURE;

Index: master.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/adrt/rise/master/master.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -w -u -r1.4 -r1.5
--- master.c	25 Jun 2005 03:13:29 -0000	1.4
+++ master.c	1 Jul 2005 21:07:54 -0000	1.5
@@ -38,7 +38,7 @@
 } rise_master_socket_t;
 
 
-void rise_master(int port, int obs_port, char *proj, char *geom_file, char *args, char *list, char *exec, int interval);
+void rise_master(int port, int obs_port, char *proj, char *list, char *exec, int interval);
 void rise_master_result(void *res_buf, int res_len);
 void* rise_master_networking(void *ptr);
 
@@ -55,7 +55,7 @@
 common_db_t db;
 
 
-void rise_master(int port, int obs_port, char *proj, char *geom_file, char *args, char *list, char *exec, int interval) {
+void rise_master(int port, int obs_port, char *proj, char *list, char *exec, int interval) {
   int i, app_size;
   void *app_data;
   char image_name[16];
@@ -90,7 +90,7 @@
     printf("Preparing frame #%d of %d\n", i+1, db.anim.frame_num);
 
     /* Parse and pack the application data */
-    app_size = common_pack(&db, &app_data, proj, geom_file, args);
+    app_size = common_pack(&db, &app_data, proj);
     tienet_master_prep(app_data, app_size);
 
     /* Fill the work buffer */

Index: master.h
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/adrt/rise/master/master.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -w -u -r1.1 -r1.2
--- master.h	17 Jun 2005 15:09:29 -0000	1.1
+++ master.h	1 Jul 2005 21:07:54 -0000	1.2
@@ -2,7 +2,7 @@
 #define _RISE_MASTER_H
 
 
-extern	void	rise_master(int port, int obs_port, char *proj, char *geom_file, char *args, char *list, char *exec, int interval);
+extern	void	rise_master(int port, int obs_port, char *proj, char *list, char *exec, int interval);
 
 
 #endif