Changeset ec0f79b5ee03bd254353c5cb634373649f79ebc2

Timestamp:

02/21/11 17:06:05 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[1a778bd1b1b6f321eff6ff69403dd1cd55d8ef1a]

git-author:

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

Message:

several warning (now error) fixes on Linux

Files:

• src/eventer/eventer_jobq.c (modified) (8 diffs)
• src/modules/external_proc.c (modified) (2 diffs)
• src/noit_capabilities_listener.c (modified) (1 diff)
• src/noit_check_log.c (modified) (3 diffs)
• src/noit_conf.c (modified) (1 diff)
• src/noit_http.c (modified) (1 diff)
• src/stratcon_jlog_streamer.c (modified) (3 diffs)

src/eventer/eventer_jobq.c

@@ -44 +44 @@
-#endif
-
+#define pthread_self_ptr() ((void *)pthread_self())
+
-static noit_atomic32_t threads_jobq_inited = 0;
-static pthread_key_t threads_jobq;
@@ -235 +237 @@
-  job->timeout_triggered = 1;
-  job->timeout_event = NULL;
-
+_ptr
-  if(job->inflight) {
-    eventer_job_t *jobcopy;
@@ -249 +251 @@
-        /* We need to cleanup... we haven't done it yet. */
-        noitL(eventer_deb, "[inline] %p jobq[%s] -> cleanup [%p]\n",
-
+_ptr
-        /* This is the real question... asynch cleanup is supposed to
-         * be called asynch -- we're going to call it synchronously
@@ -334 +336 @@
-    }
-    pthread_setspecific(jobq->activejob, job);
-
+
+
-
-    /* Mark our commencement */
@@ -346 +349 @@
-       * to pull the job off the queue.  We must be in bad shape here.
-       */
-
+
+
-      gettimeofday(&job->finish_time, NULL); /* We're done */
-      sub_timeval(job->finish_time, job->fd_event->whence, &diff);
-      sub_timeval(job->finish_time, job->create_time, &diff2);
-      noitL(eventer_deb, "%p jobq[%s] -> timeout before start [%p] -%0.6f (%0.6f)\n",
-
+_ptr
-            (float)diff.tv_sec + (float)diff.tv_usec/1000000.0,
-            (float)diff2.tv_sec + (float)diff2.tv_usec/1000000.0);
@@ -375 +379 @@
-      if(noit_atomic_cas32(&job->inflight, 1, 0) == 0) {
-        if(!job->timeout_triggered) {
-
+
+
-          /* Choose the right cancellation policy (or none) */
-          if(job->fd_event->mask & EVENTER_CANCEL_ASYNCH) {
@@ -406 +411 @@
-
-    job->inflight = 0;
-
+
+
-    /* No we know we won't have siglongjmp called on us */
-
@@ -418 +424 @@
-    if(noit_atomic_cas32(&job->has_cleanedup, 1, 0) == 0) {
-      /* We need to cleanup... we haven't done it yet. */
-
+
+
-      if(job->fd_event)
-        job->fd_event->callback(job->fd_event, EVENTER_ASYNCH_CLEANUP,

src/modules/external_proc.c

@@ -118 +118 @@
-  ps = noit_skiplist_find_compare(&active_procs, &pid, &iter, __proc_state_pid);
-  noitL(nldeb, "reaped pid %d (check: %lld) -> %x\n",
-ps?ps->check_no:-1
+(long long int)(ps?ps->check_no:-1)
-  if(ps) {
-    ps->status = status;
@@ -186 +186 @@
-  noitL(noit_error, "%d done procs to cleanup\n", done_procs.size);
-  while((ps = noit_skiplist_pop(&done_procs, NULL)) != NULL) {
-
+(long long int)
-    if(ps->cancelled == 0) {
-      assert_write(out_fd, &ps->check_no,

src/noit_capabilities_listener.c

@@ -90 +90 @@
-    gettimeofday(&now, NULL);
-    snprintf(vbuff, sizeof(vbuff), "%llu.%03d", (unsigned long long)now.tv_sec,
-now.tv_usec / 1000
+(int)(now.tv_usec / 1000)
-    xmlNewTextChild(root, NULL, (xmlChar *)"current_time", (xmlChar *)vbuff);
-

src/noit_check_log.c

@@ -195 +195 @@
-                         "M\t%lu.%03lu\t%s\t%s\t%c\t%lld\n",
-                         SECPART(&c->whence), MSECPART(&c->whence), uuid_str,
-
+
+
-          break;
-        case METRIC_UINT64:
@@ -201 +202 @@
-                         "M\t%lu.%03lu\t%s\t%s\t%c\t%llu\n",
-                         SECPART(&c->whence), MSECPART(&c->whence), uuid_str,
-
+
+
-          break;
-        case METRIC_DOUBLE:
@@ -246 +248 @@
-        rv = snprintf(b, l, "%u", *(m->metric_value.I)); break;
-      case METRIC_INT64:
-
+(long long int)
-      case METRIC_UINT64:
-
+
+
-      case METRIC_DOUBLE:
-        rv = snprintf(b, l, "%.12e", *(m->metric_value.n)); break;

src/noit_conf.c

@@ -381 +381 @@
-                             const char *path,
-                             noit_hash_table *table) {
-
+unsigned 
-  xmlXPathObjectPtr pobj = NULL;
-  xmlXPathContextPtr current_ctxt;

src/noit_http.c

@@ -610 +610 @@
-void
-noit_http_process_querystring(noit_http_request *req) {
-
+ = NULL
-  cp = strchr(req->uri_str, '?');
-  if(!cp) return;

src/stratcon_jlog_streamer.c

@@ -117 +117 @@
-                            &((struct sockaddr_in *)&addr6)->sin_addr,
-                            buff, sizeof(buff));
-
+
+
-      }
-      else if(addr6.sin6_family == AF_INET6) {
@@ -980 +981 @@
-} while(0)
-#define push_noit_m_u64(name, value) do { \
-
+(long long unsigned int)
-  stratcon_datastore_push(DS_OP_INSERT, \
-                          (struct sockaddr *)&self_stratcon_ip, \
@@ -1141 +1142 @@
-                              &((struct sockaddr_in *)&addr6)->sin_addr,
-                              buff, sizeof(buff));
-
+
+
-        }
-        else if(addr6.sin6_family == AF_INET6) {