comparison audioDB.h @ 370:2d5c3f8e8c22

Merge gcc-4.3-cleanups branch (-r629:642, but I consider that branch as
having served its purpose) onto the trunk.

Now compiles cleanly even with a fairly picky gcc.  I await version 4.4
with bated breath.

 #define O2_ERR_KEYNOTFOUND (0xFFFFFF00)
 
 // Macros
 #define O2_ACTION(a) (strcmp(command,a)==0)
 
-#define ALIGN_UP(x,w) ((x) + ((1<<w)-1) & ~((1<<w)-1))
+#define ALIGN_UP(x,w) (((x) + ((1<<w)-1)) & ~((1<<w)-1))
 #define ALIGN_DOWN(x,w) ((x) & ~((1<<w)-1))
 
-#define ALIGN_PAGE_UP(x) ((x) + (getpagesize()-1) & ~(getpagesize()-1))
+#define ALIGN_PAGE_UP(x) (((x) + (getpagesize()-1)) & ~(getpagesize()-1))
 #define ALIGN_PAGE_DOWN(x) ((x) & ~(getpagesize()-1))
 
 #define ENSURE_STRING(x) ((x) ? (x) : "")
 
 #define CHECKED_MMAP(type, var, start, length) \
   { void *tmp = mmap(0, length, (PROT_READ | (forWrite ? PROT_WRITE : 0)), MAP_SHARED, dbfid, (start)); \
     if(tmp == (void *) -1) { \
       error("mmap error for db table", #var, "mmap"); \
     } \
     var = (type) tmp; \
+  }
+
+#define CHECKED_READ(fd, buf, count) \
+  { size_t tmpcount = count; \
+    ssize_t tmp = read(fd, buf, tmpcount); \
+    if(tmp == -1) { \
+      error("read error", "", "read"); \
+    } else if((size_t) tmp != tmpcount) {	\
+      error("short read", ""); \
+    } \
+  }
+
+#define CHECKED_WRITE(fd, buf, count) \
+  { size_t tmpcount = count; \
+    ssize_t tmp = write(fd, buf, tmpcount); \
+    if(tmp == -1) { \
+      error("write error", "", "write"); \
+    } else if((size_t) tmp != tmpcount) {	\
+      error("short write", ""); \
+    } \
   }
 
 #define VERB_LOG(vv, ...) \
   if(verbosity > vv) { \
     fprintf(stderr, __VA_ARGS__); \

   // LISZT parameters
   unsigned lisztOffset;
   unsigned lisztLength;
 
   //for lib / API
+  int apierrortemp;
   unsigned UseApiError;
 
   // private methods
   void error(const char* a, const char* b = "", const char *sysFunc = 0);
   void sequence_sum(double *buffer, int length, int seqlen);

   void insertPowerData(unsigned n, int powerfd, double *powerdata);
   unsigned getKeyPos(char* key);
   void prefix_name(char** const name, const char* prefix);
 
  public:
-  audioDB(const unsigned argc, const char *const argv[]);
-  audioDB(const unsigned argc, const char *const argv[], adb__queryResponse *adbQueryResponse);
-  audioDB(const unsigned argc, const char *const argv[], adb__statusResponse *adbStatusResponse);
-  audioDB(const unsigned argc, const char *const argv[], adb__lisztResponse *adbLisztResponse);
-  audioDB(const unsigned argc, char* const argv[], int * apierror);
-  audioDB(const unsigned argc, char* const argv[], cppstatusptr stat, int * apierror);
-  audioDB(const unsigned argc, char* const argv[],adb__queryResponse *adbQueryResponse, int * apierror);
+  audioDB(const unsigned argc, const char *argv[]);
+  audioDB(const unsigned argc, const char *argv[], adb__queryResponse *adbQueryResponse);
+  audioDB(const unsigned argc, const char *argv[], adb__statusResponse *adbStatusResponse);
+  audioDB(const unsigned argc, const char *argv[], adb__lisztResponse *adbLisztResponse);
+  audioDB(const unsigned argc, const char *argv[], int * apierror);
+  audioDB(const unsigned argc, const char *argv[], cppstatusptr stat, int * apierror);
+  audioDB(const unsigned argc, const char *argv[],adb__queryResponse *adbQueryResponse, int * apierror);
 
 
   void cleanup();
   ~audioDB();
-  int processArgs(const unsigned argc, const char* const argv[]);
+  int processArgs(const unsigned argc, const char* argv[]);
   void get_lock(int fd, bool exclusive);
   void release_lock(int fd);
   void create(const char* dbName);
   bool enough_per_file_space_free();
   bool enough_data_space_free(off_t size);

   LSH* index_allocate(char* indexName, bool load_hashTables);
   void init_track_aux_data(Uns32T trackID, double* fvp, double** sNormpp,double** snPtrp, double** sPowerp, double** spPtrp);
   
   // Web Services
   void startServer();
-
-  int apierrortemp;
 
   void ws_status(const char*dbName, char* hostport);
   void ws_query(const char*dbName, const char *featureFileName, const char* hostport);
   void ws_query_by_key(const char*dbName, const char *trackKey, const char* featureFileName, const char* hostport);
   void ws_liszt(const char* dbName, char* hostport);

     relative_threshold(0.0),			\
     reporter(0),                                \
     exact_evaluation_queue(0),                  \
     lisztOffset(0),                             \
     lisztLength(0),                             \
+    apierrortemp(0),                            \
+    UseApiError(0),                             \
     lsh(0),					\
     lsh_in_core(false),				\
     lsh_use_u_functions(false),                 \
     lsh_exact(false),                           \
     WS_load_index(false),                       \

     lsh_param_m(0),				\
     lsh_param_N(0),				\
     lsh_param_b(0),				\
     lsh_param_ncols(0),                         \
     lsh_n_point_bits(0),                        \
-    vv(0),          \
-    apierrortemp(0)
+    vv(0)
 #endif