Changeset 37033 for trunk/Ohana/src/libohana/include/ohana.h

Timestamp:

Jul 17, 2014, 10:07:16 AM (12 years ago)

Author:

eugene

Message:

move INITTIME,MARKTIME to libohana; new parsing functions to deal with string-type FITS columns in ohana

File:

• trunk/Ohana/src/libohana/include/ohana.h (modified) (3 diffs)

trunk/Ohana/src/libohana/include/ohana.h

@@ -71 +71 @@
 # endif
 
+# define MARKTIME(MSG,...) {                    \
+    gettimeofday (&stopTimer, (void *) NULL);   \
+    float dtime = DTIME (stopTimer, startTimer);        \
+    fprintf (stderr, MSG, __VA_ARGS__); }
+
+# define INITTIME \
+  struct timeval startTimer, stopTimer; \
+  gettimeofday (&startTimer, (void *) NULL);
+
 #ifdef __GNUC__
 #define OHANA_FORMAT(style, fmt, varargs) __attribute__((format(style, fmt, varargs)))
@@ -252 +261 @@
 int     scan_line              PROTO((FILE *f, char *line)); 
 int     scan_line_maxlen       PROTO((FILE *f, char *line, int maxlen)); 
+char   *parse_nextword         PROTO((char *string));
+char   *parse_nextword_csv     PROTO((char *string));
 int     dparse                 PROTO((double *X, int NX, char *line));
 int     dparse_csv             PROTO((double *X, int NX, char *line));
 int     iparse                 PROTO((int *X, int NX, char *line));
 int     iparse_csv             PROTO((int *X, int NX, char *line));
+int     charparse_csv          PROTO((char *X, int NX, char *line));
+char   *ptrparse               PROTO((int NX, char *line));
+char   *ptrparse_csv           PROTO((int NX, char *line));
 int     charparse_csv          PROTO((char *X, int NX, char *line));
 int     charparse              PROTO((char *X, int NX, char *line));
@@ -266 +280 @@
 char   *strip_version          PROTO((char *input));
 char   *strsubs                PROTO((char *string, char *match, char *with));
+
+char   *getword                PROTO((char *string));
+char   *skipword               PROTO((char *string));
 
 /* in findexec.c */