IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 36995


Ignore:
Timestamp:
Jul 10, 2014, 1:47:40 PM (12 years ago)
Author:
eugene
Message:

move INITTIME and MARKTIME to libohana

Location:
branches/eam_branches/ipp-20140610/Ohana/src
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20140610/Ohana/src/addstar/src/findskycell.c

    r36497 r36995  
    161161  exit (0);
    162162}
    163 
    164 # define MARKTIME(MSG,...) {                    \
    165     float dtime;                                \
    166     gettimeofday (&stop, (void *) NULL);        \
    167     dtime = DTIME (stop, start);                \
    168     fprintf (stderr, MSG, __VA_ARGS__); }
    169163
    170164int mktree (char *treefile, char *catdir) {
    … …  
    402396  }
    403397
    404   struct timeval start, stop;
    405   gettimeofday (&start, (void *) NULL);
     398  INITTIME;
    406399
    407400  int Npts = 10000000;

  • branches/eam_branches/ipp-20140610/Ohana/src/addstar/src/resort_catalog.c

    r36922 r36995  
    99  off_t *next_meas;
    1010  off_t Naves, Nmeas;
    11   double dtime;
    12   struct timeval start, stop;
    1311
    1412  if (catalog[0].sorted == TRUE) return;
    1513
    16   gettimeofday (&start, NULL);
     14  INITTIME;
    1715
    1816  /* internal counters */
    … …  
    2624  catalog[0].measure = sort_measure (catalog[0].average, Naves, catalog[0].measure, Nmeas, next_meas);
    2725
    28   gettimeofday (&stop, NULL);
    29   dtime = DTIME (stop, start);
    30   fprintf (stderr, "  match time %9.4f sec for %7lld measures, %6lld average\n", dtime, (long long) Nmeas, (long long) Naves);
     26  MARKTIME ("  match time %9.4f sec for %7lld measures, %6lld average\n", dtime, (long long) Nmeas, (long long) Naves);
    3127
    3228  return;
    3329}
    34 
    35 # define MARKTIME(MSG,...) {                    \
    36     float dtime;                                \
    37     gettimeofday (&stop, (void *) NULL);        \
    38     dtime = DTIME (stop, start); start = stop;  \
    39     fprintf (stderr, MSG, __VA_ARGS__); }
    40 
    41 // XXX : where is the time going?  perhaps the ALLOCATE?
    42 // XXX : I don't thnk his is getting the right answer yet.
    4330
    4431void resort_catalog (Catalog *catalog) {

  • branches/eam_branches/ipp-20140610/Ohana/src/checkastro/include/checkastro.h

    r36833 r36995  
    55# include <assert.h>
    66# include <pthread.h>
    7 
    8 # define MARKTIME(MSG,...) {                    \
    9     gettimeofday (&stopTimer, (void *) NULL);   \
    10     float dtime = DTIME (stopTimer, startTimer);        \
    11     fprintf (stderr, MSG, __VA_ARGS__); }
    12 
    13 # define INITTIME \
    14   struct timeval startTimer, stopTimer; \
    15   gettimeofday (&startTimer, (void *) NULL);
    167
    178// choose off_t or int depending on full-scale relphot analysis resources

  • branches/eam_branches/ipp-20140610/Ohana/src/delstar/include/delstar.h

    r36833 r36995  
    22# include <dvo.h>
    33# include <signal.h>
    4 
    5 # define MARKTIME(MSG,...) {                    \
    6     gettimeofday (&stopTimer, (void *) NULL);   \
    7     float dtime = DTIME (stopTimer, startTimer);        \
    8     fprintf (stderr, MSG, __VA_ARGS__); }
    9 
    10 # define INITTIME \
    11   struct timeval startTimer, stopTimer; \
    12   gettimeofday (&startTimer, (void *) NULL);
    134
    145// options for generating the IndexArray used to select images for deletion (delete_duplicate_images.c)

  • branches/eam_branches/ipp-20140610/Ohana/src/dvomerge/src/merge_catalogs_old.c

    r36904 r36995  
    11# include "dvomerge.h"
    22# define PSPS_ID TRUE
    3 
    4 # define MARKTIME(MSG,...) {                    \
    5     float dtime;                                \
    6     gettimeofday (&stop, (void *) NULL);        \
    7     dtime = DTIME (stop, start);                \
    8     fprintf (stderr, MSG, __VA_ARGS__);         \
    9     gettimeofday (&start, (void *) NULL);       \
    10   }
    113
    124# define IN_REGION(R,D) (                                       \
    … …  
    2921  Coords tcoords;
    3022 
    31   // struct timeval start, stop;
    32   // gettimeofday (&start, (void *) NULL);
     23  // INITTIME;
    3324
    3425  NsecfiltOut = output[0].Nsecfilt;

  • branches/eam_branches/ipp-20140610/Ohana/src/dvopsps/src/insert_detections_dvopsps.c

    r36188 r36995  
    22# define USE_MYSQL 1
    33// # define SAVE_REMOTE 1
    4 
    5 # define MARKTIME(MSG,...) {                    \
    6     float dtime;                                \
    7     gettimeofday (&stop, (void *) NULL);        \
    8     dtime = DTIME (stop, start);                \
    9     fprintf (stderr, MSG, __VA_ARGS__); }
    104
    115// we have two ways of writing to the mysql database:
    … …  
    245239  buffer.Nalloc = 0;
    246240
    247   struct timeval start, stop;
    248 
    249241  if (Ndetections == 0) return TRUE;
    250242
    … …  
    254246  int Ninsert = 0;
    255247
    256   gettimeofday (&start, (void *) NULL);
     248  INITTIME;
    257249  for (i = 0; i < Ndetections; i++) {
    258250

  • branches/eam_branches/ipp-20140610/Ohana/src/dvopsps/src/insert_detections_dvopsps_catalog.c

    r36905 r36995  
    11# include "dvopsps.h"
    22# define DEBUG 0
    3 
    4 # define MARKTIME(MSG,...) {                    \
    5     float dtime;                                \
    6     gettimeofday (&stop, (void *) NULL);        \
    7     dtime = DTIME (stop, start);                \
    8     fprintf (stderr, MSG, __VA_ARGS__); }
    93
    104int Ndetections = 0;
    … …  
    107101  off_t i, j;
    108102  int missingID = 0;
    109   struct timeval start, stop;
    110103
    111104  IOBuffer buffer;
    … …  
    117110  off_t found = 0;
    118111
    119   gettimeofday (&start, (void *) NULL);
     112  INITTIME;
    120113  insert_detections_mysql_init (&buffer);
    121114  int Ninsert = 0;

  • branches/eam_branches/ipp-20140610/Ohana/src/dvopsps/src/insert_objects_dvopsps_catalog.c

    r36979 r36995  
    22# define DEBUG 0
    33
    4 # define MARKTIME(MSG,...) {                    \
    5     float dtime;                                \
    6     gettimeofday (&stop, (void *) NULL);        \
    7     dtime = DTIME (stop, start);                \
    8     fprintf (stderr, MSG, __VA_ARGS__); }
    9 
    104int insert_objects_dvopsps_catalog (Catalog *catalog, char *basename, MYSQL *mysql) {
    115
    126  off_t i;
    137  int missingID = 0;
    14   struct timeval start, stop;
    158
    169  IOBuffer ave_buffer, sec_buffer;
    … …  
    3124  insert_objects_mysql_create_tables (cleanname, mysql);
    3225
    33   gettimeofday (&start, (void *) NULL);
     26  INITTIME;
    3427  insert_objects_mysql_init (&ave_buffer, &sec_buffer, cleanname);
    3528  int Ninsert = 0;

  • branches/eam_branches/ipp-20140610/Ohana/src/dvopsps/src/insert_skytable.c

    r35098 r36995  
    22# define DEBUG 1
    33# define USE_MYSQL 1
    4 
    5 # define MARKTIME(MSG,...) {                    \
    6     float dtime;                                \
    7     gettimeofday (&stop, (void *) NULL);        \
    8     dtime = DTIME (stop, start);                \
    9     fprintf (stderr, MSG, __VA_ARGS__); }
    104
    115// determine the relevant catalogs, launch parallel clients if desired
    … …  
    137
    148  off_t i;
    15   struct timeval start, stop;
    169  SkyTable *sky = NULL;
    1710
    … …  
    3427# endif
    3528
    36   gettimeofday (&start, (void *) NULL);
     29  INITTIME;
     30
    3731  insert_skytable_mysql_init (&buffer);
    3832  int Ninsert = 0;

  • branches/eam_branches/ipp-20140610/Ohana/src/photdbc/include/photdbc.h

    r36833 r36995  
    2727  double Dc;
    2828} SkyRegionCoords;
    29 
    30 # define MARKTIME(MSG,...) {                    \
    31     gettimeofday (&stopTimer, (void *) NULL);   \
    32     float dtime = DTIME (stopTimer, startTimer);        \
    33     fprintf (stderr, MSG, __VA_ARGS__); }
    34 
    35 # define INITTIME \
    36   struct timeval startTimer, stopTimer; \
    37   gettimeofday (&startTimer, (void *) NULL);
    3829
    3930int    PARALLEL;

  • branches/eam_branches/ipp-20140610/Ohana/src/relastro/include/relastro.h

    r36833 r36995  
    55# include <assert.h>
    66# include <pthread.h>
    7 
    8 # define MARKTIME(MSG,...) {                    \
    9     gettimeofday (&stopTimer, (void *) NULL);   \
    10     float dtime = DTIME (stopTimer, startTimer);        \
    11     fprintf (stderr, MSG, __VA_ARGS__); }
    12 
    13 # define INITTIME \
    14   struct timeval startTimer, stopTimer; \
    15   gettimeofday (&startTimer, (void *) NULL);
    167
    178// choose off_t or int depending on full-scale relphot analysis resources

  • branches/eam_branches/ipp-20140610/Ohana/src/relphot/include/relphot.h

    r36990 r36995  
    44# include <signal.h>
    55# include <pthread.h>
    6 
    7 # define MARKTIME(MSG,...) {                    \
    8     gettimeofday (&stopTimer, (void *) NULL);   \
    9     float dtime = DTIME (stopTimer, startTimer);        \
    10     fprintf (stderr, MSG, __VA_ARGS__); }
    11 
    12 # define INITTIME \
    13   struct timeval startTimer, stopTimer; \
    14   gettimeofday (&startTimer, (void *) NULL);
    156
    167/* # define GRID_V1 */
Note: See TracChangeset for help on using the changeset viewer.