From f021ec45b944692cef51b19157e223a91419d739 Mon Sep 17 00:00:00 2001
From: Eduardo Silva <edsiper@gmail.com>
Date: Wed, 3 Mar 2010 14:20:07 -0300
Subject: [PATCH] Remove connections counter

---
 src/connection.c        | 14 +-------------
 src/include/scheduler.h | 12 +-----------
 src/request.c           | 11 -----------
 src/scheduler.c         | 30 ++----------------------------
 4 files changed, 4 insertions(+), 63 deletions(-)

diff --git a/src/connection.c b/src/connection.c
index 78f4cc7..ab1edb2 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -59,11 +59,6 @@ int mk_conn_read(int socket)
         mk_socket_set_nonblocking(socket);
 
         cr = mk_request_client_create(socket);
-
-        /* Update requests counter */
-        mk_sched_update_thread_status(NULL,
-                                      MK_SCHEDULER_ACTIVE_UP,
-                                      MK_SCHEDULER_CLOSED_DOWN);
     }
     else {
         /* If cr struct already exists, that could means that we 
@@ -71,9 +66,7 @@ int mk_conn_read(int socket)
          * applies we increase the thread status for active connections
          */
         if (cr->counter_connections > 1 && cr->body_length == 0) {
-            mk_sched_update_thread_status(NULL,
-                                          MK_SCHEDULER_ACTIVE_UP,
-                                          MK_SCHEDULER_CLOSED_NONE);
+            /* FIXME: KA Connection */
         }
     }
 
@@ -148,11 +141,6 @@ int mk_conn_write(int socket)
          * connection can continue working or we must 
          * close it.
          */
-
-        mk_sched_update_thread_status(sched,
-                                      MK_SCHEDULER_ACTIVE_DOWN,
-                                      MK_SCHEDULER_CLOSED_UP);
-
         if (ka < 0 || ret < 0) {
             mk_request_client_remove(socket);
             return -1;
diff --git a/src/include/scheduler.h b/src/include/scheduler.h
index d9c64ab..1c93bc2 100644
--- a/src/include/scheduler.h
+++ b/src/include/scheduler.h
@@ -22,19 +22,10 @@
 #ifndef MK_SCHEDULER_H
 #define MK_SCHEDULER_H
 
-#define MK_SCHEDULER_ACTIVE_NONE 0
-#define MK_SCHEDULER_ACTIVE_UP 1
-#define MK_SCHEDULER_ACTIVE_DOWN -1
-
-#define MK_SCHEDULER_CLOSED_NONE 0
-#define MK_SCHEDULER_CLOSED_UP 1
-#define MK_SCHEDULER_CLOSED_DOWN -1
-
 #define MK_SCHEDULER_CONN_AVAILABLE -1
 #define MK_SCHEDULER_CONN_PENDING 0
 #define MK_SCHEDULER_CONN_PROCESS 1
 
-
 struct sched_connection
 {
     int socket;
@@ -50,8 +41,7 @@ struct sched_list_node
     pthread_t tid;
     pid_t pid;
     int epoll_fd;
-    int active_requests;
-    int closed_requests;
+
     struct sched_connection *queue;
     struct client_request *request_handler;
     struct sched_list_node *next;
diff --git a/src/request.c b/src/request.c
index c743666..51d376e 100644
--- a/src/request.c
+++ b/src/request.c
@@ -879,11 +879,6 @@ struct client_request *mk_request_client_create(int socket)
     }
     mk_sched_set_request_index(request_index);
 
-
-    mk_sched_update_thread_status(NULL,
-                                  MK_SCHEDULER_ACTIVE_UP,
-                                  MK_SCHEDULER_CLOSED_NONE);
-
     return cr;
 }
 
@@ -936,12 +931,6 @@ struct client_request *mk_request_client_remove(int socket)
         cr = cr->next;
     }
 
-    /* No keep alive connection */
-    if (cr->counter_connections == 0) {
-        mk_sched_update_thread_status(NULL,
-                                      MK_SCHEDULER_ACTIVE_DOWN,
-                                      MK_SCHEDULER_CLOSED_UP);
-    }
     //mk_pointer_free(&cr->ip);
     mk_mem_free(cr->body);
     mk_mem_free(cr);
diff --git a/src/scheduler.c b/src/scheduler.c
index bf7d59b..0993747 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -193,32 +193,6 @@ struct sched_list_node *mk_sched_get_thread_conf()
     return NULL;
 }
 
-void mk_sched_update_thread_status(struct sched_list_node *sched,
-                                   int active, int closed)
-{
-    if (!sched) {
-        sched = mk_sched_get_thread_conf();
-    }
-
-    switch (active) {
-    case MK_SCHEDULER_ACTIVE_UP:
-        sched->active_requests++;
-        break;
-    case MK_SCHEDULER_ACTIVE_DOWN:
-        sched->active_requests--;
-        break;
-    }
-
-    switch (closed) {
-    case MK_SCHEDULER_CLOSED_UP:
-        sched->closed_requests++;
-        break;
-    case MK_SCHEDULER_CLOSED_DOWN:
-        sched->closed_requests--;
-        break;
-    }
-}
-
 int mk_sched_add_client(struct sched_list_node *sched, int remote_fd)
 {
     unsigned int i, ret;
@@ -335,11 +309,11 @@ int mk_sched_update_conn_status(struct sched_list_node *sched,
                                 int remote_fd, int status)
 {
     int i;
-
+    
     if (!sched) {
         return -1;
     }
-
+    
     for (i = 0; i < config->workers; i++) {
         if (sched->queue[i].socket == remote_fd) {
             sched->queue[i].status = status;
-- 
2.11.4.GIT