From 23c5e7d57e1e9216f4da3446656df2dc7202975d Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 6 Apr 2013 13:14:45 +0200 Subject: tagging ychat-0.1 --- sock.cpp | 196 +++++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 165 insertions(+), 31 deletions(-) mode change 100755 => 100644 sock.cpp (limited to 'sock.cpp') diff --git a/sock.cpp b/sock.cpp old mode 100755 new mode 100644 index 630962b..009396f --- a/sock.cpp +++ b/sock.cpp @@ -1,35 +1,56 @@ // class sock implementation. the multiplex socket implementation has been token from the // GNU C Library Examples and modified in order to fit in here ( POSIX threads etc. ). -#ifndef s_sock_CXX -#define s_sock_CXX +#ifndef SOCK_CXX +#define SOCK_CXX #include #include "sock.h" -#include "s_chat.h" -#include "s_conf.h" -#include "s_mutx.h" -#include "s_tool.h" +#include "CHAT.h" +#include "CONF.h" +#include "MUTX.h" +#include "TOOL.h" #include "chat.h" #include "user.h" using namespace std; -sock::sock() + +// the posix thread function. this one will called every time a new request socket +// was created succsessfull. in this function a new POSIX thread life begins. +// be carefull because of synchronization issues!!!! +void *sock::posix_thread_func( void *v_pointer ) { - this->b_run = true; - this->i_req = 0; - this->req_parser = new reqp(); - this->thrd_pool = new pool(); +#ifdef VERBOSE_ + pthread_mutex_lock ( &MUTX::get().mut_stdout ); + cout << "*posix_thread_func( void *v_pointer )" << endl; + pthread_mutex_unlock( &MUTX::get().mut_stdout ); +#endif + + // recasting the client thread object. + thrd *t = (thrd*) v_pointer; + + // start parsing the client request and sending response's back. + t-> run (); + + t->~thrd(); } -void -sock::chat_stream( int i_sock, user* p_user, map_string &map_params ) +void *sock::posix_thread_func_( void *v_pointer ) { +#ifdef VERBOSE_ + pthread_mutex_lock ( &MUTX::get().mut_stdout ); + cout << "*posix_thread_func_( void *v_pointer )" << endl; + pthread_mutex_unlock( &MUTX::get().mut_stdout ); +#endif + + user *p_user = (user*) v_pointer; + string s_msg( "" ); + int i_sock = p_user->get_sock(); pthread_mutex_lock ( &(p_user->mut_message) ); while( p_user->get_online() ) @@ -39,7 +60,6 @@ sock::chat_stream( int i_sock, user* p_user, map_string &map_params ) if ( 0 > send( i_sock, s_msg.c_str(), s_msg.size(), 0 ) ) p_user->set_online( false ); } - pthread_mutex_unlock( &(p_user->mut_message) ); // remove the user from its room. @@ -52,9 +72,63 @@ sock::chat_stream( int i_sock, user* p_user, map_string &map_params ) p_user->~user(); } +sock::sock() +{ +#ifdef VERBOSE + cout << "sock::sock()" << endl; +#endif + + this->b_run = true; + this->i_req = 0; + this->req_parser = new reqp(); +} + +void +#ifdef THRDMOD +sock::chat_stream( int i_sock, map_string &map_params ) +#else +sock::chat_stream( int i_sock, map_string &map_params, queue &thrd_pool ) +#endif +{ +#ifdef VERBOSE_ + pthread_mutex_lock ( &MUTX::get().mut_stdout ); + cout << "sock::chat_stream( " << i_sock << ", map_string& )" << endl; + pthread_mutex_unlock( &MUTX::get().mut_stdout ); +#endif + + user* p_user = CHAT::get().get_user( map_params["nick"] ); + p_user->set_sock( i_sock ); + +#ifdef THRDMOD + posix_thread_func_( (void*) p_user ); +#else + +#ifdef _VERBOSE + cout << THREAD2 << endl; +#endif + posix_thread_func_( (void*) p_user ); + + auto int i_fail = pthread_create( &thrd_pool.front(), NULL, posix_thread_func_, (void*) p_user ); + + // remove this thread from thread pool because its now in use. + thrd_pool.pop(); + + // check if the thread started correctly. + if ( i_fail ) + { + cerr << "Thrd: error with return code " << i_fail << endl; + } + +#endif +} + int sock::make_socket( uint16_t i_port ) { +#ifdef VERBOSE_ + cout << "sock::make_socket( " << i_port << " )" << endl; +#endif + int sock; struct sockaddr_in name; @@ -75,9 +149,6 @@ sock::make_socket( uint16_t i_port ) name.sin_family = AF_INET; name.sin_port = htons (i_port); name.sin_addr.s_addr = htonl (INADDR_ANY); - int optval=1; - - setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char*)&optval, sizeof(int)); if (bind (sock, (struct sockaddr *) &name, sizeof (name)) < 0) { @@ -94,13 +165,18 @@ sock::make_socket( uint16_t i_port ) } int -sock::read_write( thrd* p_thrd, int i_sock ) +sock::read_write( int i_sock ) { - char c_req[2048]; +#ifdef VERBOSE_ + pthread_mutex_lock ( &MUTX::get().mut_stdout ); + cout << "sock::read_write( " << i_sock << " )" << endl; + pthread_mutex_unlock( &MUTX::get().mut_stdout ); +#endif + char c_req[2048]; int i_bytes; i_bytes = read (i_sock, c_req, 2048); - + if (i_bytes < 0) { cerr << "Sock: read error " << endl; @@ -111,17 +187,20 @@ sock::read_write( thrd* p_thrd, int i_sock ) // stores the request params. map_string map_params; - // get the s_rep ( s_html response which will be send imediatly to the client + // get the s_rep ( HTML response which will be send imediatly to the client // and fill map_params with request values. - auto string s_temp=(string)c_req; - - string s_rep = req_parser->parse( p_thrd, string( c_req ), map_params ); + string s_rep = req_parser->parse( string( c_req ), map_params ); // send s_rep to the client. send( i_sock, s_rep.c_str(), s_rep.size(), 0 ); - // dont need those vals anymore. - map_params.clear(); + // prove if this is a request for a chat stream! + if ( map_params["event"] == "stream" ) +#ifdef THRDMOD + chat_stream( i_sock, map_params ); +#else + chat_stream( i_sock, map_params, thrd_pool ); +#endif return 0; } @@ -129,10 +208,36 @@ sock::read_write( thrd* p_thrd, int i_sock ) return -1; } +void +sock::refill_thrd_pool( ) +{ +#ifdef VERBOSE_ + pthread_mutex_lock ( &MUTX::get().mut_stdout ); + cout << "sock::refill_thrd_pool( )" << endl; + pthread_mutex_unlock( &MUTX::get().mut_stdout ); +#endif +#ifdef _VERBOSE + pthread_mutex_lock ( &MUTX::get().mut_stdout ); + cout << THRPOOL << i_thrd_pool_size << endl; + pthread_mutex_unlock( &MUTX::get().mut_stdout ); +#endif + + for (int i=0; irun( (void*) new thrd( i ) ); + // create a client thread object. this one will contain all data which is needed by a new posix + // thread in order to do its tasks. the thr_client pointer will be passed to the posix function + // there the life of a new thread begins. + thrd* thr_client = new thrd( i ); + + // if the thread pool is empty refill it. + if ( thrd_pool.empty() ) + refill_thrd_pool( ); + +#ifndef THRDMOD + posix_thread_func( (void*) thr_client ); + +#else +#ifdef _VERBOSE + cout << THREAD1 << endl; +#endif + + // creating a new posix thread. + auto int i_fail = pthread_create( &thrd_pool.front(), NULL, posix_thread_func, (void*) thr_client ); + + // remove this thread from thread pool because its now in use. + thrd_pool.pop(); + // check if the thread started correctly. + if ( i_fail ) + { + cerr << "Thrd: error with return code " << i_fail << endl; + close ( i ); + } + +#endif FD_CLR( i, &active_fd_set ); } } -- cgit v1.2.3