Fix #862 - wrong waiting connection count stat.

conn.c

@@ -170,6 +170,7 @@ conn_close(conn c)
  cur_conn_ct--; /* stats */
 
  unbrake(NULL);
+ remove_waiting_conn(c);
  conn_remove(c);
  conn_free(c);
 }

conn.h

@@ -34,6 +34,7 @@
 /* CONN_TYPE_* are bit masks */
 #define CONN_TYPE_PRODUCER 1
 #define CONN_TYPE_WORKER 2
+#define CONN_TYPE_WAITING 4
 
 typedef struct conn *conn;
 

prot.c

@@ -61,11 +61,13 @@ reply_job(conn c, job j, const char *word)
  return reply(c, c->reply_buf, strlen(c->reply_buf), STATE_SENDJOB);
 }
 
-static conn
-next_waiting_conn()
+conn
+remove_waiting_conn(conn c)
 {
+ if (!(c->type & CONN_TYPE_WAITING)) return NULL;
+ c->type &= ~CONN_TYPE_WAITING;
  waiting_ct--;
- return conn_remove(wait_queue.next);
+ return conn_remove(c);
 }
 
 void
@@ -77,7 +79,7 @@ process_queue()
  j = pq_take(ready_q);
  if (!j) return;
  if (j->pri < URGENT_THRESHOLD) urgent_ct--;
- reserve_job(next_waiting_conn(), j);
+ reserve_job(remove_waiting_conn(wait_queue.next), j);
  }
 }
 
@@ -140,6 +142,7 @@ void
 enqueue_waiting_conn(conn c)
 {
  waiting_ct++;
+ c->type |= CONN_TYPE_WAITING;
  conn_insert(&wait_queue, conn_remove(c) ? : c);
 }
 

prot.h

@@ -21,6 +21,7 @@ void prot_init();
 void reply(conn c, char *line, int len, int state);
 void reply_job(conn c, job j, const char *word);
 
+conn remove_waiting_conn(conn c);
 void enqueue_waiting_conn(conn c);
 
 int enqueue_job(job j);

reserve.c

@@ -14,7 +14,6 @@ reserve_job(conn c, job j)
 {
  j->deadline = time(NULL) + RESERVATION_TIMEOUT;
  cur_reserved_ct++; /* stats */
- conn_remove(c);
  conn_insert(&running, c);
  j->state = JOB_STATE_RESERVED;
  job_insert(&c->reserved_jobs, j);