Changeset 18967 for trunk/ppMerge/src/ppMergeArguments.c

Timestamp:

Aug 8, 2008, 8:17:12 AM (18 years ago)

Author:

Paul Price

Message:

Fixing following changes to psThread.

File:

• trunk/ppMerge/src/ppMergeArguments.c (modified) (2 diffs)

trunk/ppMerge/src/ppMergeArguments.c

@@ -174 +174 @@
     if ((argnum = psArgumentGet(argc, argv, "-threads"))) {
         psArgumentRemove(argnum, &argc, argv);
-        int nThreads = atoi(argv[argnum]);
+        int nThreads = atoi(argv[argnum]);
         psMetadataAddS32(config->arguments, PS_LIST_TAIL, "NTHREADS", 0, "number of warp threads", nThreads);
         psArgumentRemove(argnum, &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);
+        // 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);
     }
     ppMergeSetThreads();
@@ -379 +379 @@
 #endif
 
+    psFree(arguments);
     return true;