IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38618


Ignore:
Timestamp:
Jul 22, 2015, 5:57:47 PM (11 years ago)
Author:
eugene
Message:

protect the catalog I/O layer from signals which can be blocked (ie, allow kill to kill gracefully)

Location:
branches/eam_branches/ipp-20150625/Ohana/src/addstar/src
Files:
28 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/UpdateDatabase_Image.c

    r38471 r38618  
    7979        dvo_catalog_save (&catalog, VERBOSE);
    8080      }
    81       SetProtect (FALSE);
    8281    }
    8382    dvo_catalog_unlock (&catalog);
     83    SetProtect (FALSE);
     84
    8485    dvo_catalog_free (&catalog);
    8586  }

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/UpdateDatabase_Refcat.c

    r38471 r38618  
    6969        dvo_catalog_save (&catalog, VERBOSE);
    7070      }
    71       SetProtect (FALSE);
    7271    }
    7372    dvo_catalog_unlock (&catalog);
     73    SetProtect (FALSE);
     74
    7475    dvo_catalog_free (&catalog);
    7576    free (stars);

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/UpdateDatabase_Reflist.c

    r38471 r38618  
    6565        dvo_catalog_save (&catalog, VERBOSE);
    6666      }
    67       SetProtect (FALSE);
    6867    }
    6968    dvo_catalog_unlock (&catalog);
     69    SetProtect (FALSE);
     70
    7071    dvo_catalog_free (&catalog);
    7172  }

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/addstar.c

    r38593 r38618  
    179179        dvo_catalog_save (&catalog, VERBOSE);
    180180      }
    181       SetProtect (FALSE);
    182181    }
    183182    dvo_catalog_unlock (&catalog);
     183    SetProtect (FALSE);
    184184    dvo_catalog_free (&catalog);
    185185    if (VERBOSE) MARKTIME ("save cpt: %f sec\n", dtime); RESETTIME;

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/addstar_client.c

    r37116 r38618  
    1313
    1414  // get configuration info, args, lockfile (set CATDIR, HOST_ID, HOSTDIR, etc)
     15  SetSignals ();
    1516  options = ConfigInit (&argc, argv);
    1617  options = args_parallel_client (argc, argv, options);

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/addstarc.c

    r33963 r38618  
    1111
    1212  /* load config and options */
     13  SetSignals ();
    1314  options = ConfigInit (&argc, argv);
    1415  options = args_client (argc, argv, options);

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/addstard.c

    r27435 r38618  
    88  AddstarClientOptions options;
    99
     10  SetSignals ();
    1011  options = ConfigInit (&argc, argv);
    1112  args_server (argc, argv);

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/addstart.c

    r33963 r38618  
    88  DVO_DATA *dataset;
    99
     10  SetSignals ();
    1011  options = ConfigInit (&argc, argv);
    1112  args_server (argc, argv);

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/load2mass.c

    r25757 r38618  
    1212
    1313  // need to construct these options with args_load2mass...
     14  SetSignals ();
    1415  options = ConfigInit (&argc, argv);
    1516  options = args_load2mass (argc, argv, options);

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/load2mass_as_rawdata.c

    r38594 r38618  
    200200        find_matches_refstars (skylist[0].regions[0], newcat, &catalog, options);
    201201
    202         dvo_catalog_save (&catalog, VERBOSE);
    203         dvo_catalog_unlock (&catalog);
     202        SetProtect (TRUE);
     203        if (!dvo_catalog_save (&catalog, VERBOSE)) { fprintf (stderr, "ERROR: failed to save %s\n", catalog.filename); exit (1); }
     204        if (!dvo_catalog_unlock (&catalog)) { fprintf (stderr, "ERROR: failed to unlock %s\n", catalog.filename); exit (1); }
     205        SetProtect (FALSE);
    204206        dvo_catalog_free (&catalog);
    205207      }

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/loadICRF.c

    r37807 r38618  
    1616  AddstarClientOptions options;
    1717
     18  SetSignals ();
    1819  options = ConfigInit (&argc, argv);
    1920  options = args_loadICRF (&argc, argv, options); // XXX fix args after rest is done

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/loadICRF_catalog.c

    r38471 r38618  
    2222  find_matches_ICRF (region, stars, Nstars, &catalog, options);
    2323   
    24   dvo_catalog_save (&catalog, VERBOSE);
    25   dvo_catalog_unlock (&catalog);
     24  SetProtect (TRUE);
     25  if (!dvo_catalog_save (&catalog, VERBOSE)) { fprintf (stderr, "ERROR: failed to save %s\n", catalog.filename); exit (1); }
     26  if (!dvo_catalog_unlock (&catalog)) { fprintf (stderr, "ERROR: failed to unlock %s\n", catalog.filename); exit (1); }
     27  SetProtect (FALSE);
     28
    2629  dvo_catalog_free (&catalog);
    2730

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/loadICRF_client.c

    r37807 r38618  
    77
    88  // need to construct these options with args_loadICRF...
     9  SetSignals ();
    910  options = ConfigInit (&argc, argv);
    1011  options = args_loadICRF_client (&argc, argv, options);

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/loadgalphot.c

    r38553 r38618  
    1313
    1414  // need to construct these options with args_loadgalphot...
     15  SetSignals ();
    1516  options = ConfigInit (&argc, argv);
    1617  options = args_loadgalphot (argc, argv, options);

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/loadgalphot_catalog.c

    r38553 r38618  
    2222  find_matches_galphot (region, stars, Nstars, &catalog, options);
    2323   
    24   dvo_catalog_save (&catalog, VERBOSE);
    25   dvo_catalog_unlock (&catalog);
     24  SetProtect (TRUE);
     25  if (!dvo_catalog_save (&catalog, VERBOSE)) { fprintf (stderr, "ERROR: failed to save %s\n", catalog.filename); exit (1); }
     26  if (!dvo_catalog_unlock (&catalog)) { fprintf (stderr, "ERROR: failed to unlock %s\n", catalog.filename); exit (1); }
     27  SetProtect (FALSE);
     28
    2629  dvo_catalog_free (&catalog);
    2730

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/loadstarpar.c

    r37807 r38618  
    1717
    1818  // need to construct these options with args_loadstarpar...
     19  SetSignals ();
    1920  options = ConfigInit (&argc, argv);
    2021  options = args_loadstarpar (argc, argv, options);

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/loadstarpar_catalog.c

    r38471 r38618  
    2222  find_matches_starpar (region, stars, Nstars, &catalog, options);
    2323   
    24   dvo_catalog_save (&catalog, VERBOSE);
    25   dvo_catalog_unlock (&catalog);
     24  SetProtect (TRUE);
     25  if (!dvo_catalog_save (&catalog, VERBOSE)) { fprintf (stderr, "ERROR: failed to save %s\n", catalog.filename); exit (1); }
     26  if (!dvo_catalog_unlock (&catalog)) { fprintf (stderr, "ERROR: failed to unlock %s\n", catalog.filename); exit (1); }
     27  SetProtect (FALSE);
     28 
    2629  dvo_catalog_free (&catalog);
    2730

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/loadstarpar_client.c

    r37807 r38618  
    77
    88  // need to construct these options with args_loadstarpar...
     9  SetSignals ();
    910  options = ConfigInit (&argc, argv);
    1011  options = args_loadstarpar_client (argc, argv, options);

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/loadsupercos.c

    r38594 r38618  
    1919
    2020  // need to construct these options with args_loadWISE...
     21  SetSignals ();
    2122  options = ConfigInit (&argc, argv);
    2223  options = args_loadsupercos (&argc, argv, options);

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/loadsupercos_rawdata.c

    r38594 r38618  
    133133      find_matches_refstars (skylist[0].regions[0], newcat, &catalog, options);
    134134
    135       dvo_catalog_save (&catalog, VERBOSE);
    136       dvo_catalog_unlock (&catalog);
     135      SetProtect (TRUE);
     136      if (!dvo_catalog_save (&catalog, VERBOSE)) { fprintf (stderr, "ERROR: failed to save %s\n", catalog.filename); exit (1); }
     137      if (!dvo_catalog_unlock (&catalog)) { fprintf (stderr, "ERROR: failed to unlock %s\n", catalog.filename); exit (1); }
     138      SetProtect (FALSE);
     139
    137140      dvo_catalog_free (&catalog);
    138141    }

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/loadtycho.c

    r38467 r38618  
    2020
    2121  // need to construct these options with args_loadtycho...
     22  SetSignals ();
    2223  options = ConfigInit (&argc, argv);
    2324  options = args_loadtycho (&argc, argv, options);

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/loadtycho_rawdata.c

    r38594 r38618  
    159159      find_matches_closest_refstars(region, newcat, &catalog, options);
    160160
    161       dvo_catalog_save (&catalog, verbose);
    162       dvo_catalog_unlock (&catalog);
     161      SetProtect (TRUE);
     162      if (!dvo_catalog_save (&catalog, verbose)) { fprintf (stderr, "ERROR: failed to save %s\n", catalog.filename); exit (1); }
     163      if (!dvo_catalog_unlock (&catalog)) { fprintf (stderr, "ERROR: failed to unlock %s\n", catalog.filename); exit (1); }
     164      SetProtect (FALSE);
     165
    163166      dvo_catalog_free (&catalog);
    164167

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/loadwise.c

    r37807 r38618  
    2020
    2121  // need to construct these options with args_loadWISE...
     22  SetSignals ();
    2223  options = ConfigInit (&argc, argv);
    2324  options = args_loadwise (argc, argv, options);

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/loadwise_prelim_rawdata.c

    r38471 r38618  
    202202        // loadWISE_catalog (&catalog, stars, Nstars);
    203203
    204         dvo_catalog_save (&catalog, VERBOSE);
    205         dvo_catalog_unlock (&catalog);
     204        SetProtect (TRUE);
     205        if (!dvo_catalog_save (&catalog, VERBOSE)) { fprintf (stderr, "ERROR: failed to save %s\n", catalog.filename); exit (1); }
     206        if (!dvo_catalog_unlock (&catalog)) { fprintf (stderr, "ERROR: failed to unlock %s\n", catalog.filename); exit (1); }
     207        SetProtect (FALSE);
     208
    206209        dvo_catalog_free (&catalog);
    207210        // free (catalog.filename);

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/loadwise_rawdata.c

    r38594 r38618  
    213213        find_matches_refstars (skylist[0].regions[0], newcat, &catalog, options);
    214214
    215         dvo_catalog_save (&catalog, VERBOSE);
    216         dvo_catalog_unlock (&catalog);
     215        SetProtect (TRUE);
     216        if (!dvo_catalog_save (&catalog, VERBOSE)) { fprintf (stderr, "ERROR: failed to save %s\n", catalog.filename); exit (1); }
     217        if (!dvo_catalog_unlock (&catalog)) { fprintf (stderr, "ERROR: failed to unlock %s\n", catalog.filename); exit (1); }
     218        SetProtect (FALSE);
    217219        dvo_catalog_free (&catalog);
    218220      }

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/resort_threaded.c

    r38471 r38618  
    8686    // write out catalog, if appropriate
    8787    SetProtect (TRUE);
    88     dvo_catalog_save (&catalog, VERBOSE);
     88    if (!dvo_catalog_save (&catalog, VERBOSE)) { fprintf (stderr, "ERROR: failed to save %s\n", catalog.filename); exit (1); }
     89    if (!dvo_catalog_unlock (&catalog)) { fprintf (stderr, "ERROR: failed to unlock %s\n", catalog.filename); exit (1); }
    8990    SetProtect (FALSE);
    90     dvo_catalog_unlock (&catalog);
     91
    9192    dvo_catalog_free (&catalog);
    9293    threadData->state = TS_DONE;

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/resort_unthreaded.c

    r38471 r38618  
    5757    // write out catalog, if appropriate
    5858    SetProtect (TRUE);
    59     dvo_catalog_save (&catalog, VERBOSE);
     59    if (!dvo_catalog_save (&catalog, VERBOSE)) { fprintf (stderr, "ERROR: failed to save %s\n", catalog.filename); exit (1); }
     60    if (!dvo_catalog_unlock (&catalog)) { fprintf (stderr, "ERROR: failed to unlock %s\n", catalog.filename); exit (1); }
    6061    SetProtect (FALSE);
    61     dvo_catalog_unlock (&catalog);
     62
    6263    dvo_catalog_free (&catalog);
    6364  }

  • branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/sedstar.c

    r38471 r38618  
    1212
    1313  // need to construct these options with args_load2mass...
     14  SetSignals ();
    1415  options = ConfigInit (&argc, argv);
    1516  options = args_sedstar (argc, argv, options);
    … …  
    6465    SEDfitCatalog (&outcatalog, &incatalog, sedtable);
    6566   
    66     dvo_catalog_save (&outcatalog, VERBOSE);
    67     dvo_catalog_unlock (&outcatalog);
     67    SetProtect (TRUE);
     68    if (!dvo_catalog_save (&outcatalog, VERBOSE)) { fprintf (stderr, "ERROR: failed to save %s\n", outcatalog.filename); exit (1); }
     69    if (!dvo_catalog_unlock (&outcatalog)) { fprintf (stderr, "ERROR: failed to unlock %s\n", outcatalog.filename); exit (1); }
     70    SetProtect (FALSE);
    6871    dvo_catalog_free (&outcatalog);
    6972
Note: See TracChangeset for help on using the changeset viewer.