Changeset 33895

Timestamp:

May 22, 2012, 5:51:17 AM (14 years ago)

Author:

eugene

Message:

working on parallel resort

Location:

branches/eam_branches/ipp-20120405/Ohana/src/addstar/src

Files:

• resort_unthreaded.c (modified) (2 diffs)
• resort_unthreaded_catalogs.c (added)

branches/eam_branches/ipp-20120405/Ohana/src/addstar/src/resort_unthreaded.c

@@ -1 +1 @@
 # include "addstar.h"
+
+/* upgrade to parallel mode:
+   
+   setup up skylist and call resort_unthreaded_catalogs ()
+   
+   resort_unthreaded_catalogs has a parallel and serial version, etc.
+
+ */
 
 int resort_unthreaded (AddstarClientOptions *options, SkyTable *sky) {
@@ -44 +52 @@
   }
 
-  // XXX ALLOCATE catalog[Nthreads]
-
-  /* match stars to existing catalog data (or otherwise manipulate catalog data) */
-  Naverage = Nmeasure = 0;
-  for (i = 0; i < skylist[0].Nregions; i++) {
-
-    // XXX BLOCK here for an empty thread
-
-    // set the parameters which guide catalog open/load/create
-    catalog.filename  = skylist[0].filename[i];
-    catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
-    catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
-    catalog.catflags  = LOAD_AVES | LOAD_MEAS;
-    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-
-    // an error exit status here is a significant error (disk I/O or file access)
-    if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "w")) {
-      fprintf (stderr, "ERROR: failure to open/create catalog file %s\n", catalog.filename);
-      exit (2);
-    }
-
-    // Naves_disk == 0 implies an empty catalog file, skip empty catalogs
-    if (catalog.Naves_disk == 0) {
-      dvo_catalog_unlock (&catalog);
-      dvo_catalog_free (&catalog);
-      continue;
-    }
-
-    // this is an overloaded value to mean 'force sort'
-    if (options->nosort == 3) catalog.sorted = FALSE;
-
-    // XXX send these to a free thread
-
-    if (OLD_RESORT) { 
-      resort_catalog_old (&catalog);
-    } else {
-      resort_catalog (&catalog);
-    }
-
-    // XXX wait for completed threads
-
-    /* report total updated values */
-    Naverage += catalog.Naverage;
-    Nmeasure += catalog.Nmeasure;
-
-    // write out catalog, if appropriate
-    SetProtect (TRUE);
-    dvo_catalog_save (&catalog, VERBOSE);
-    SetProtect (FALSE);
-    dvo_catalog_unlock (&catalog);
-    dvo_catalog_free (&catalog);
-  }
+  resort_unthreaded_catalogs ()
 
   gettimeofday (&stop, NULL);