casa-mp-base

From 976ec8ba8e70e3b5027f441de529f479c11c8507 Mon Sep 17 00:00:00 2001

From: Anthony Basile <blueness@gentoo.org>

Date: Sun, 23 Jan 2011 01:42:51 -0800

Subject: [PATCH] Patch to rename beanstalkd's dprintf to dbgprintf

​

---

 prot.c |   24 ++++++++++++------------

 util.h |    4 ++--

 2 files changed, 14 insertions(+), 14 deletions(-)

​

diff --git a/prot.c b/prot.c

index 481b0ed..8dd34ec 100644

--- a/prot.c

+++ b/prot.c

@@ -305,7 +305,7 @@ reply(conn c, const char *line, int len, int state)

     c->reply_len = len;

     c->reply_sent = 0;

     c->state = state;

-    dprintf("sending reply: %.*s", len, line);

+    dbgprintf("sending reply: %.*s", len, line);

 }

 #define reply_msg(c,m) reply((c),(m),CONSTSTRLEN(m),STATE_SENDWORD)

@@ -382,10 +382,10 @@ next_eligible_job(usec now)

     size_t i;

     job j = NULL, candidate;

-    dprintf("tubes.used = %zu\n", tubes.used);

+    dbgprintf("tubes.used = %zu\n", tubes.used);

     for (i = 0; i < tubes.used; i++) {

         t = tubes.items[i];

-        dprintf("for %s t->waiting.used=%zu t->ready.used=%d t->pause=%" PRIu64 "\n",

+        dbgprintf("for %s t->waiting.used=%zu t->ready.used=%d t->pause=%" PRIu64 "\n",

                 t->name, t->waiting.used, t->ready.used, t->pause);

         if (t->pause) {

             if (t->deadline_at > now) continue;

@@ -395,7 +395,7 @@ next_eligible_job(usec now)

             candidate = pq_peek(&t->ready);

             if (!j || job_pri_cmp(candidate, j) < 0) j = candidate;

         }

-        dprintf("i = %zu, tubes.used = %zu\n", i, tubes.used);

+        dbgprintf("i = %zu, tubes.used = %zu\n", i, tubes.used);

     }

     return j;

@@ -407,9 +407,9 @@ process_queue()

     job j;

     usec now = now_usec();

-    dprintf("processing queue\n");

+    dbgprintf("processing queue\n");

     while ((j = next_eligible_job(now))) {

-        dprintf("got eligible job %llu in %s\n", j->id, j->tube->name);

+        dbgprintf("got eligible job %llu in %s\n", j->id, j->tube->name);

         j = pq_take(&j->tube->ready);

         ready_ct--;

         if (j->pri < URGENT_THRESHOLD) {

@@ -462,7 +462,7 @@ set_main_delay_timeout()

     if (j && (!deadline_at || j->deadline_at < deadline_at)) deadline_at = j->deadline_at;

-    dprintf("deadline_at=%" PRIu64 "\n", deadline_at);

+    dbgprintf("deadline_at=%" PRIu64 "\n", deadline_at);

     set_main_timeout(deadline_at);

 }

@@ -1178,7 +1178,7 @@ dispatch_cmd(conn c)

     }

     type = which_cmd(c);

-    dprintf("got %s command: \"%s\"\n", op_names[(int) type], c->cmd);

+    dbgprintf("got %s command: \"%s\"\n", op_names[(int) type], c->cmd);

     switch (type) {

     case OP_PUT:

@@ -1578,10 +1578,10 @@ h_conn_timeout(conn c)

     }

     if (should_timeout) {

-        dprintf("conn_waiting(%p) = %d\n", c, conn_waiting(c));

+        dbgprintf("conn_waiting(%p) = %d\n", c, conn_waiting(c));

         return reply_msg(remove_waiting_conn(c), MSG_DEADLINE_SOON);

     } else if (conn_waiting(c) && c->pending_timeout >= 0) {

-        dprintf("conn_waiting(%p) = %d\n", c, conn_waiting(c));

+        dbgprintf("conn_waiting(%p) = %d\n", c, conn_waiting(c));

         c->pending_timeout = -1;

         return reply_msg(remove_waiting_conn(c), MSG_TIMED_OUT);

     }

@@ -1773,7 +1773,7 @@ h_delay()

     for (i = 0; i < tubes.used; i++) {

         t = tubes.items[i];