From ed634bc556af8997b9d2d5bf7334073731936365 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 6 Apr 2013 13:14:45 +0200 Subject: tagging ychat-0.2 --- sock.cpp | 172 ++++++++------------------------------------------------------- 1 file changed, 21 insertions(+), 151 deletions(-) mode change 100644 => 100755 sock.cpp (limited to 'sock.cpp') diff --git a/sock.cpp b/sock.cpp old mode 100644 new mode 100755 index 009396f..c996ff5 --- a/sock.cpp +++ b/sock.cpp @@ -17,40 +17,22 @@ using namespace std; - -// 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 ) +sock::sock() { -#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(); + this->b_run = true; + this->i_req = 0; + this->req_parser = new reqp(); + this->thrd_pool = new pool(); } -void *sock::posix_thread_func_( void *v_pointer ) +void +sock::chat_stream( int i_sock, map_string &map_params ) { -#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; + user* p_user = CHAT::get().get_user( map_params["nick"] ); + p_user->set_sock( i_sock ); string s_msg( "" ); - int i_sock = p_user->get_sock(); pthread_mutex_lock ( &(p_user->mut_message) ); while( p_user->get_online() ) @@ -60,6 +42,7 @@ void *sock::posix_thread_func_( void *v_pointer ) 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. @@ -72,63 +55,9 @@ void *sock::posix_thread_func_( void *v_pointer ) 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; @@ -149,6 +78,9 @@ 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) { @@ -165,18 +97,13 @@ sock::make_socket( uint16_t i_port ) } int -sock::read_write( int i_sock ) +sock::read_write( thrd* p_thrd, int i_sock ) { -#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; @@ -189,18 +116,16 @@ sock::read_write( int i_sock ) // get the s_rep ( HTML response which will be send imediatly to the client // and fill map_params with request values. - string s_rep = req_parser->parse( string( c_req ), map_params ); + auto string s_temp=(string)c_req; + + string s_rep = req_parser->parse( p_thrd, string( c_req ), map_params ); // send s_rep to the client. send( i_sock, s_rep.c_str(), s_rep.size(), 0 ); // 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; } @@ -208,36 +133,10 @@ sock::read_write( 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 ) ); FD_CLR( i, &active_fd_set ); } } -- cgit v1.2.3