tagging ychat-0.7.0ychat-0.7.0

1 files changed, 21 insertions, 18 deletions

diff --git a/src/sock/sock.h b/src/sock/sock.h
index 7023be5..6f3419e 100755
--- a/src/sock/sock.h
+++ b/src/sock/sock.h
@@ -3,19 +3,18 @@
 #ifndef SOCK_H
 #define SOCK_H
 
+
 #include <queue>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
-
 #include "../thrd/pool.h"
+#include "../thrd/thrd.h"
 #include "../reqp.h"
 #include "../chat/user.h"
-#ifdef LOGGING
 #include "../logd.h"
-#endif
 
 using namespace std;
 
@@ -23,46 +22,50 @@ class sock
 {
 private:
     // total number of server requests.
-    unsigned long long i_req;
+    unsigned long long int i_req;
 
     bool  b_run;      // true while socket manager is running.
-    reqp *req_parser; // parses the http requests from clients.
-    pool *thrd_pool;  // the thread pool.
-#ifdef LOGGING
-    logd *log_daemon; // the log daemon
-#endif
-    char *c_buffer;   // char buffer!
-    int   i_threads;  // total amount of threads inside the thread pool.
+    reqp* req_parser; // parses the http requests from clients.
+    pool* thrd_pool;  // the thread pool.
+    logd* log_daemon; // the log daemon
+    char* c_buffer;   // char buffer!
 
+    int   i_threads;     // total amount of threads inside the thread pool.
+    pthread_mutex_t mut_threads;
     pthread_mutex_t mut_hits;
 
+
 public:
     // creates a server socket.
-    int make_server_socket( int i_port );
+    int make_server_socket( int port );
 
     // small inline methods:
     bool get_run() const
     {
         return b_run;
     }
-
     bool set_run( bool b_run )
     {
         this->b_run = b_run;
     }
 
-    sock( ); 
+    // public methods.
+    explicit sock( ); // simple constructor.
     ~sock( );
-
-    int read_write( int* p_sock );
-    int start();
+    virtual int  read_write( thrd* p_thrd, int filedes   );
+    virtual int  start();
 
     // the chat stream there all the chat messages will sent through.
-    static void chat_stream( int i_sock, user* p_user, map<string,string> &map_params ); //<<
+    static void chat_stream( int i_sock, user* p_user, map_string &map_params ); //<<
 
+    void increase_num_threads();
+    void decrease_num_threads();
 #ifdef NCURSES
+
+    void print_threads();
     void print_hits();
 #endif
+
 };
 
 #endif