Changeset 31159 for trunk/pswarp/src/pswarpArguments.c

Timestamp:

Apr 4, 2011, 1:17:18 PM (15 years ago)

Author:

eugene

Message:

minor updates from eam branch

Location:

trunk/pswarp

Files:

• . (modified) (1 prop)
• src/pswarpArguments.c (modified) (2 diffs)

trunk/pswarp

@@ -18 +18 @@
 pswarp.pc
 Doxyfile
+a.out.dSYM

@@ -18 +18 @@
 pswarp.pc
 Doxyfile
+a.out.dSYM

trunk/pswarp/src/pswarpArguments.c

@@ -42 +42 @@
     }
 
+    // generic arguments (version, dumpconfig)
+    PS_ARGUMENTS_GENERIC( pswarp, config, argc, argv );
+
+    // thread arguments
+    PS_ARGUMENTS_THREADS( pswarp, config, argc, argv )
+
     // save the following additional recipe values based on command-line options
     // these options override the PSWARP recipe values loaded from recipe files
@@ -76 +82 @@
     }
 
-    // Number of threads
-    if ((N = psArgumentGet(argc, argv, "-threads"))) {
-        psArgumentRemove(N, &argc, argv);
-        int nThreads = atoi(argv[N]);
-        psMetadataAddS32(config->arguments, PS_LIST_TAIL, "NTHREADS", 0, "number of warp threads", nThreads);
-        psArgumentRemove(N, &argc, argv);
-
-        // create the thread pool with number of desired threads, supplying our thread launcher function
-        // XXX need to determine the number of threads from the config data
-        psThreadPoolInit (nThreads);
-    }
     pswarpSetThreads();
-
-    if ((N = psArgumentGet(argc, argv, "-dumpconfig"))) {
-        psArgumentRemove(N, &argc, argv);
-        psMetadataAddStr(config->arguments, PS_LIST_TAIL, "DUMP_CONFIG", PS_META_REPLACE,
-                         "Filename for configuration dump", argv[N]);
-        psArgumentRemove(N, &argc, argv);
-    }
-
 
     pmConfigFileSetsMD (config->arguments, &argc, argv, "INPUT", "-file", "-list");

@@ -18 +18 @@
 pswarp.pc
 Doxyfile
+a.out.dSYM