Changeset 44ff3960c287fb9db5673a83f1165dfe9a8ae96e

Timestamp:

10/27/09 19:12:58 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1256670778 +0000

git-parent:

[a905d08014f72c334b467899569fc812d9e5ca7e]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1256670778 +0000

Message:

fixes on Solaris, fixes #203

Files:

• configure.in (modified) (1 diff)
• src/noit_defines.h (modified) (1 diff)
• src/stratcon_datastore.c (modified) (10 diffs)
• src/stratcon_iep.c (modified) (2 diffs)

configure.in

@@ -56 +56 @@
-        fi
-        if test "x$CC" != "xgcc" ; then
-D_POSIX_PTHREAD_SEMANTICS -
+
-        fi
-        PICFLAGS="-Kpic"

src/noit_defines.h

@@ -133 +133 @@
-}
-
+#if defined(__sun)
+#define portable_readdir_r(a,b,c) ((*c) = readdir_r(a,b))
+#else
+#define portable_readdir_r readdir_r
+#endif
-#include "noitedit/strlcpy.h"
-

src/stratcon_datastore.c

@@ -450 +450 @@
-  if(d->rv != PGRES_COMMAND_OK && \
-     d->rv != PGRES_TUPLES_OK) { \
-
-
+
+
+
-    PQclear(d->res); \
-    goto bad_row; \
@@ -477 +478 @@
-} while(0)
-
-int
-asynch_drive_iep(eventer_t e, int mask, void *closure,
-                                  struct timeval *now) {
+void *
+check_loadall(void *vsn) {
+storagenode_info *sn = vsn;
-  ds_single_detail *d;
-  int i, row_count = 0, good = 0;
-  char buff[1024];
-  conn_q *cq;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-  d = calloc(1, sizeof(*d));
-  GET_QUERY(check_loadall);
@@ -525 +532 @@
-    good++;
-  }
-
+
+
- bad_row:
-  free_params((ds_single_detail *)d);
-  free(d);
-  release_conn_q(cq);
+  return (void *)good;
+}
+static int
+stratcon_datastore_asynch_drive_iep(eventer_t e, int mask, void *closure,
+                                    struct timeval *now) {
+  storagenode_info self = { 0, NULL, NULL }, **sns = NULL;
+  pthread_t *jobs = NULL;
+  int nodes, i = 0, tcnt = 0;
+  if(!(mask & EVENTER_ASYNCH_WORK)) return 0;
+  if(mask & EVENTER_ASYNCH_CLEANUP) return 0;
+
+  pthread_mutex_lock(&storagenode_to_info_cache_lock);
+  nodes = storagenode_to_info_cache.size;
+  jobs = calloc(MAX(1,nodes), sizeof(*jobs));
+  sns = calloc(MAX(1,nodes), sizeof(*sns));
+  if(nodes == 0) sns[nodes++] = &self;
+  else {
+    noit_hash_iter iter = NOIT_HASH_ITER_ZERO;
+    const char *k;
+    void *v;
+    int klen;
+    while(noit_hash_next(&storagenode_to_info_cache,
+                         &iter, &k, &klen, &v)) {
+      sns[i++] = (storagenode_info *)v;
+    }
+  }
+  pthread_mutex_unlock(&storagenode_to_info_cache_lock);
+
+  for(i=0; i<nodes; i++) {
+    if(pthread_create(&jobs[i], NULL,
+                      stratcon_datastore_check_loadall, sns[i]) != 0) {
+      noitL(noit_error, "Failed to spawn thread: %s\n", strerror(errno));
+    }
+  }
+  for(i=0; i<nodes; i++) {
+    void *good;
+    pthread_join(jobs[i], &good);
+    tcnt += (int)(vpsized_int)good;
+  }
+  noitL(noit_error, "Loaded all %d check states.\n", tcnt);
-  return 0;
-}
@@ -839 +887 @@
-    if(PQstatus(cq->dbh) == CONNECTION_OK) return 0;
-    PQreset(cq->dbh);
+    if(PQstatus(cq->dbh) != CONNECTION_OK) {
+      noitL(noit_error, "Error reconnecting to database: '%s'\nError: %s\n",
+            dsn, PQerrorMessage(cq->dbh));
+      return -1;
+    }
-    if(stratcon_database_post_connect(cq)) return -1;
-    if(PQstatus(cq->dbh) == CONNECTION_OK) return 0;
@@ -848 +901 @@
-  cq->dbh = PQconnectdb(dsn);
-  if(!cq->dbh) return -1;
+  if(PQstatus(cq->dbh) != CONNECTION_OK) {
+    noitL(noit_error, "Error reconnecting to database: '%s'\nError: %s\n",
+          dsn, PQerrorMessage(cq->dbh));
+    return -1;
+  }
-  if(stratcon_database_post_connect(cq)) return -1;
-  if(PQstatus(cq->dbh) == CONNECTION_OK) return 0;
@@ -1156 +1214 @@
-    ij->remote_str = strdup(remote_str);
-    ij->remote_cn = strdup(remote_cn);
-strdup(fqdn)
+fqdn_in ? strdup(fqdn_in) : NULL
-    ij->storagenode_id = storagenode_id;
-    ij->filename = strdup(jpath);
@@ -1235 +1293 @@
-    uuidinfo->sid = sid;
-    uuidinfo->uuid_str = strdup(uuid_str);
+    uuidinfo->storagenode_id = storagenode_id;
-    uuidinfo->remote_cn = strdup(remote_cn);
-    noit_hash_store(&uuid_to_info_cache,
@@ -1298 +1357 @@
-  interim_journal_t *ij = NULL;
-  char uuid_str[UUID_STR_LEN+1], *cp;
-, *dsn
+ = NULL, *dsn = NULL
-  int storagenode_id = 0;
-  uuid_t checkid;
@@ -1482 +1541 @@
-  root = opendir(path);
-  if(!root) return;
-
-
+
+
+
+
-  entries = malloc(sizeof(*entries) * cnt);
-
+portable_
-    if(i < cnt) {
-      entries[i++] = strdup(entry->d_name);
@@ -1590 +1651 @@
-    uuidinfo->uuid_str = strdup(uuid_str);
-    uuidinfo->remote_cn = strdup(remote_cn);
+    uuidinfo->storagenode_id = storagenode_id;
-    uuidinfo->sid = sid;
-    noit_hash_store(&uuid_to_info_cache,

src/stratcon_iep.c

@@ -519 +519 @@
-  }
-  else {
-handler for
+connection, skipping line
-  }
-  return 0;
@@ -663 +663 @@
-                           &info->command)) {
-    noitL(noit_error, "No IEP start command provided.  You're on your own.\n");
-
-
+
-    return;
-  }