From 312fe18cb5f97143f3600b207e979bc559256b6f Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 6 Apr 2013 13:14:43 +0200 Subject: tagging yhttpd-0.7.0 --- src/sock/sock.cpp | 390 +++++++++++++++++++++++------------------------------- 1 file changed, 169 insertions(+), 221 deletions(-) (limited to 'src/sock/sock.cpp') diff --git a/src/sock/sock.cpp b/src/sock/sock.cpp index 802a980..7dba4b7 100755 --- a/src/sock/sock.cpp +++ b/src/sock/sock.cpp @@ -6,303 +6,251 @@ #include #include #include "sock.h" -#include "../chat/chat.h" -#include "../chat/user.h" using namespace std; sock::sock() { - this->b_run = true; - this->i_req = 0; - this->i_threads = 0; - this->req_parser = new reqp(); - this->thrd_pool = new pool(); -#ifdef LOGGING - - this->log_daemon = new logd( wrap::CONF->get_elem( "httpd.logging.accessfile" ), - - wrap::CONF->get_elem( "httpd.logging.accesslines" ) ); -#endif + this->b_run = true; + this->i_req = 0; + this->i_threads = 0; + this->req_parser = new reqp(); + this->thrd_pool = new pool(); + this->log_daemon = new logd( wrap::CONF->get_elem( "httpd.logging.accessfile" ), + wrap::CONF->get_elem( "httpd.logging.accesslines" ) ); + + pthread_mutex_init( &mut_threads, NULL ); } sock::~sock() -{} - -//<<* -void -sock::chat_stream( int i_sock, user *p_user, hashmap &map_params ) { - string s_msg( "\n" ); - - for ( int i = 0; i < PUSHSTR; i++ ) - send( i_sock, s_msg.c_str(), s_msg.size(), 0 ); - - pthread_mutex_t mutex; - pthread_mutex_init( &mutex, NULL ); - pthread_mutex_lock( &mutex ); - - do - { - s_msg = p_user->get_mess( ); - - if ( 0 > send( i_sock, s_msg.c_str(), s_msg.size(), 0 ) ) - { - p_user->set_online( false ); - break; - } - - pthread_cond_wait( &(p_user->cond_message), &mutex ); - } - while( p_user->get_online() ); - - pthread_mutex_destroy( &mutex ); - - // if there is still a message to send: - s_msg = p_user->get_mess( ); - - if ( ! s_msg.empty() ) - send( i_sock, s_msg.c_str(), s_msg.size(), 0 ); - - // remove the user from its room. - string s_user( p_user->get_name() ); - string s_user_lowercase( p_user->get_lowercase_name() ); - - p_user->get_room()->del_elem( s_user_lowercase ); - - // post the room that the user has left the chat. - s_msg = wrap::TIMR->get_time() + " " - + p_user->get_colored_bold_name() - + wrap::CONF->get_elem( "chat.msgs.userleaveschat" ) - + "
\n"; - - p_user->get_room()->msg_post( &s_msg ); - p_user->get_room()->reload_onlineframe(); - -#ifdef VERBOSE - - cout << REMUSER << s_user << endl; -#endif - - wrap::GCOL->add_user_to_garbage( p_user ); + pthread_mutex_destroy( &mut_threads ); } -//*>> + int sock::make_server_socket( int i_port ) { - size_t i_sock; - struct sockaddr_in name; + size_t sock; + struct sockaddr_in name; - // create the server socket. - i_sock = socket (PF_INET, SOCK_STREAM, 0); - if (i_sock < 0) - { - wrap::system_message( SOCKERR ); + // create the server socket. + sock = socket (PF_INET, SOCK_STREAM, 0); + if (sock < 0) + { + wrap::system_message( SOCKERR ); - if ( ++i_port > MAXPORT ) - exit(1); + if ( ++i_port > MAXPORT ) + exit(-1); - wrap::system_message( SOCKERR ); + wrap::system_message( SOCKERR ); - return make_server_socket( i_port ); - } + return make_server_socket( i_port ); + } - // give the server socket a name. - name.sin_family = AF_INET; - name.sin_port = htons(i_port); - name.sin_addr.s_addr = htonl(INADDR_ANY); - int i_optval = 1; + // give the server socket a name. + name.sin_family = AF_INET; + name.sin_port = htons (i_port); + name.sin_addr.s_addr = htonl (INADDR_ANY); + int optval=1; - setsockopt( i_sock, SOL_SOCKET, SO_REUSEADDR, (char*)&i_optval, sizeof(int) ); + setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char*)&optval, sizeof(int)); - if ( bind(i_sock, (struct sockaddr *) &name, sizeof (name)) < 0 ) - { + if (bind (sock, (struct sockaddr *) &name, sizeof (name)) < 0) + { - wrap::system_message( BINDERR ); + wrap::system_message( BINDERR ); - if ( ++i_port > MAXPORT ) - exit(1); + if ( ++i_port > MAXPORT ) + exit(-1); - wrap::system_message( string(SOCKERR) + tool::int2string(i_port) ); + wrap::system_message( string(SOCKERR) + tool::int2string(i_port) ); - // Rerun recursive. - return make_server_socket( i_port ); - } + return make_server_socket( i_port ); + } - wrap::system_message( SOCKCRT + string("localhost:") + tool::int2string(i_port) ); + wrap::system_message( SOCKCRT + string("localhost:") + tool::int2string(i_port) ); #ifdef NCURSES - - mvprintw( NCUR_PORT_X,NCUR_PORT_Y, "Port: %d ", i_port); - refresh(); + mvprintw( NCUR_PORT_X,NCUR_PORT_Y, "Port: %d ", i_port); + refresh(); #endif - return i_sock; + return sock; } int -sock::read_write( int* p_sock ) +sock::read_write( thrd* p_thrd, int i_sock ) { - int i_sock = *p_sock; - char c_req[READSOCK]; - int i_bytes = read(i_sock, c_req, READSOCK); - - if (i_bytes <= 0) - { - wrap::system_message( READERR ); - } - else - { - // stores the request params. - hashmap map_params; - - // get the s_rep ( s_html response which will be send imediatly to the client - struct sockaddr_in client; - size_t size = sizeof(client); - -#ifdef CYGWIN - - getpeername( i_sock, (struct sockaddr *)&client, (int*)&size); -#else + char c_req[READSOCK]; + int i_bytes = read (i_sock, c_req, READSOCK); - getpeername( i_sock, (struct sockaddr *)&client, &size); -#endif - - map_params["REMOTE_ADDR"] = inet_ntoa(client.sin_addr); - //map_params["REMOTE_PORT"] = ntohs(client.sin_port); + if (i_bytes <= 0) + { + wrap::system_message( READERR ); + } + else + { + // stores the request params. + map_string map_params; - string s_rep = req_parser->parse( i_sock, string( c_req ), map_params ); + // get the s_rep ( s_html response which will be send imediatly to the client + struct sockaddr_in client; + size_t size = sizeof(client); -#ifdef LOGGING + getpeername( i_sock, (struct sockaddr *)&client, &size); - log_daemon->log_access(map_params); -#endif + map_params["REMOTE_ADDR"] = inet_ntoa(client.sin_addr); + //map_params["REMOTE_PORT"] = ntohs(client.sin_port); - // send s_rep to the client. - send(i_sock, s_rep.c_str(), s_rep.size(), 0); + string s_rep = req_parser->parse( p_thrd, string( c_req ), map_params ); - // dont need those vals anymore. - map_params.clear(); + log_daemon->log_access(map_params); - shutdown( i_sock, 2 ); - close ( i_sock ); + // send s_rep to the client. + send( i_sock, s_rep.c_str(), s_rep.size(), 0 ); - return 0; - } + // dont need those vals anymore. + map_params.clear(); - shutdown( i_sock, 2 ); - close ( i_sock ); + return 0; + } - return 1; + return -1; } int sock::start() { - wrap::system_message( SOCKSRV ); + wrap::system_message( SOCKSRV ); #ifdef NCURSES - - print_hits(); - thrd_pool->print_pool_size(); + print_hits(); + print_threads(); + thrd_pool->print_pool_size(); #endif - int i_port = tool::string2int( wrap::CONF->get_elem( "httpd.serverport" ) ); - int i_sock, i; - fd_set active_fd_set, read_fd_set; - struct sockaddr_in clientname; - size_t size; - + auto int i_port = tool::string2int( wrap::CONF->get_elem( "httpd.serverport" ) ); - // create the server socket and set it up to accept connections. - i_sock = make_server_socket ( i_port ); + int sock; + fd_set active_fd_set, read_fd_set; + int i; + struct sockaddr_in clientname; + size_t size; - if (listen (i_sock, 1) < 0) - { - wrap::system_message( LISTERR ); - exit( EXIT_FAILURE ); - } - wrap::system_message( SOCKRDY ); + // create the server socket and set it up to accept connections. + sock = make_server_socket ( i_port ); - // initialize the set of active sockets. - FD_ZERO (&active_fd_set); - FD_SET (i_sock, &active_fd_set); - - while( b_run ) - { - // block until input arrives on one or more active sockets. - read_fd_set = active_fd_set; - if (select (FD_SETSIZE, &read_fd_set, NULL, NULL, NULL) < 0) + if (listen (sock, 1) < 0) { - wrap::system_message( SELCERR ); - + wrap::system_message( LISTERR ); exit( EXIT_FAILURE ); } - // service all the sockets with input pending. - for ( i = 0; i < FD_SETSIZE; i++ ) - if ( FD_ISSET (i, &read_fd_set) ) - { - if ( i == i_sock ) + wrap::system_message( SOCKRDY ); + + // initialize the set of active sockets. + FD_ZERO (&active_fd_set); + FD_SET (sock, &active_fd_set); + + while( b_run ) + { + // block until input arrives on one or more active sockets. + read_fd_set = active_fd_set; + if (select (FD_SETSIZE, &read_fd_set, NULL, NULL, NULL) < 0) { - // connection request on original socket. - ++i_req; + wrap::system_message( SELCERR ); -#ifdef NCURSES + exit( EXIT_FAILURE ); + } - print_hits(); + // service all the sockets with input pending. + for ( i = 0; i < FD_SETSIZE; i++ ) + if ( FD_ISSET (i, &read_fd_set) ) + { + if ( i == sock ) + { + // connection request on original socket. + i_req++; +#ifdef NCURSES + print_hits(); #endif + int new_sock; + size = sizeof (clientname); + new_sock = accept (sock, (struct sockaddr *) &clientname, &size); + + if (new_sock < 0) + { + wrap::system_message( ACCPERR ); + close ( new_sock ); + } + + else + { +#ifdef VERBOSE + wrap::system_message(NEWREQU + + tool::int2string(i_req) + " " + + string(inet_ntoa( clientname.sin_addr )) + ":" + + tool::int2string(ntohs ( clientname.sin_port )) + ); +#endif + FD_SET (new_sock, &active_fd_set); + } + } + + else + { + thrd_pool->run( (void*) new thrd( i ) ); + FD_CLR( i, &active_fd_set ); + } + } + } +} - int i_new_sock; - size = sizeof(clientname); -#ifdef CYGWIN - - i_new_sock = accept (i_sock, (struct sockaddr *) &clientname, (int*)&size); -#else +void +sock::increase_num_threads() +{ + pthread_mutex_lock( &mut_threads ); + i_threads++; + pthread_mutex_unlock( &mut_threads ); - i_new_sock = accept (i_sock, (struct sockaddr *) &clientname, &size); +#ifdef NCURSES + print_threads(); #endif +} - if (i_new_sock < 0) - { - wrap::system_message( ACCPERR ); - close(i_new_sock); - } - else - { -#ifdef VERBOSE - wrap::system_message(NEWREQU - + tool::int2string(i_req) + " " - + string(inet_ntoa( clientname.sin_addr )) + ":" - + tool::int2string(ntohs ( clientname.sin_port )) - ); -#endif +void +sock::decrease_num_threads() +{ + pthread_mutex_lock( &mut_threads ); + i_threads--; + pthread_mutex_unlock( &mut_threads ); - FD_SET (i_new_sock, &active_fd_set); - } - } - else - { - int *p_sock = new int; - *p_sock = i; - thrd_pool->run( (void*) p_sock ); - FD_CLR( i, &active_fd_set ); - } - } - } +#ifdef NCURSES + print_threads(); +#endif } #ifdef NCURSES +void +sock::print_threads() +{ + if ( wrap::NCUR->is_ready() ) + { + mvprintw( NCUR_POOL_RUNNING_X,NCUR_POOL_RUNNING_Y, "In use: %d ", i_threads); + refresh(); + } +} + void sock::print_hits() { - if ( wrap::NCUR->is_ready() ) - { - mvprintw( NCUR_HITS_X,NCUR_HITS_Y, "Hits: %d ", i_req); - refresh(); - } + if ( wrap::NCUR->is_ready() ) + { + mvprintw( NCUR_HITS_X,NCUR_HITS_Y, "Hits: %d ", i_req); + refresh(); + } } #endif -- cgit v1.2.3