diff options
Diffstat (limited to 'src/time/timr.cpp')
| -rwxr-xr-x | src/time/timr.cpp | 165 |
1 files changed, 84 insertions, 81 deletions
diff --git a/src/time/timr.cpp b/src/time/timr.cpp index 12b5972..9e1522f 100755 --- a/src/time/timr.cpp +++ b/src/time/timr.cpp @@ -15,7 +15,7 @@ timr::timr() pthread_mutex_init( &mut_s_uptime, NULL); pthread_mutex_init( &mut_i_offset, NULL); - i_time_offset = tool::string2int( wrap::CONF->get_elem("chat.timeoffset") ); + i_time_offset = tool::string2int( wrap::CONF->get_elem("chat.timeoffset") ); wrap::system_message( TIMEROF + tool::int2string( i_time_offset ) ); s_time = "00:00:00"; @@ -32,56 +32,58 @@ timr::~timr() bool timr::get_timer_active() const { - return b_timer_active; + return b_timer_active; } int -timr::get_offset() +timr::get_offset() { - pthread_mutex_lock ( &mut_i_offset ); - int i_ret_val = i_time_offset; - pthread_mutex_unlock( &mut_i_offset ); - return i_ret_val; + pthread_mutex_lock ( &mut_i_offset ); + int i_ret_val = i_time_offset; + pthread_mutex_unlock( &mut_i_offset ); + return i_ret_val; } void timr::start( void *v_ptr ) { - wrap::system_message( TIMERTH ); + wrap::system_message( TIMERTH ); #ifdef NCURSES - print_time( ); + + print_time( ); #endif - time_t clock_start; - time_t clock_now; + time_t clock_start; + time_t clock_now; - time( &clock_start ); - tm time_start = *localtime( &clock_start ); - tm time_now; + time( &clock_start ); + tm time_start = *localtime( &clock_start ); + tm time_now; - while ( get_timer_active() ) - { - // sleep a second! - usleep( 1000000 ); + while ( get_timer_active() ) + { + // sleep a second! + usleep( 1000000 ); - // get the current time! - time( &clock_now ); + // get the current time! + time( &clock_now ); - time_now = *localtime( &clock_now ); + time_now = *localtime( &clock_now ); - // set the current time && the current ychat uptime! - set_time( difftime( clock_now, clock_start ), - time_now.tm_sec, time_now.tm_min, time_now.tm_hour ); + // set the current time && the current ychat uptime! + set_time( difftime( clock_now, clock_start ), + time_now.tm_sec, time_now.tm_min, time_now.tm_hour ); #ifdef NCURSES - if (wrap::NCUR->is_ready()) + + if (wrap::NCUR->is_ready()) print_time( ); -#endif +#endif - // run every minute: - if ( time_now.tm_sec == 0 ) - { + // run every minute: + if ( time_now.tm_sec == 0 ) + { #ifdef SERVMSG cout << TIMERUP << get_uptime() << endl; #endif @@ -93,43 +95,44 @@ timr::start( void *v_ptr ) wrap::CHAT->check_timeout( p_timeout_settings ); delete p_timeout_settings; - string s_ping = "<!-- PING! //-->\n"; + string s_ping = "<!-- PING! //-->\n"; wrap::CHAT->msg_post( &s_ping ); #ifdef DATABASE // Disconnecting idle database conenction wrap::DATA->check_data_con_timeout(); #endif - //*>> - - // run every ten minutes: + //*>> + // Run every ten minutes: if ( time_now.tm_min % 10 == 0 ) { - // run every hour - if ( time_now.tm_hour % 60 == 0 ) - { - wrap::GCOL->remove_garbage(); //<< - - // run every day - if (time_now.tm_min == 0 || time_now.tm_min == 60 ) - if (time_now.tm_hour == 0 || time_now.tm_hour == 24) - wrap::STAT->update_rusage_history(); - } + + wrap::SOCK->clean_ipcache(); + // Run every hour + if ( time_now.tm_min % 60 == 0 ) + { + wrap::GCOL->remove_garbage(); //<< + + // Run every day + if (time_now.tm_min == 0 || time_now.tm_min == 60 ) + if (time_now.tm_hour == 0 || time_now.tm_hour == 24) + wrap::STAT->update_rusage_history(); + } } - } } + } } #ifdef NCURSES void timr::print_time( ) { - if ( !wrap::NCUR->is_ready() ) - return; + if ( !wrap::NCUR->is_ready() ) + return; - mvprintw( NCUR_TIME_X, NCUR_TIME_Y, "Time: %s ", get_time().c_str()); - mvprintw( NCUR_UPTIME_X, NCUR_UPTIME_Y, "Uptime: %s ", get_uptime().c_str()); - refresh(); + mvprintw( NCUR_TIME_X, NCUR_TIME_Y, "Time: %s ", get_time().c_str()); + mvprintw( NCUR_UPTIME_X, NCUR_UPTIME_Y, "Uptime: %s ", get_uptime().c_str()); + refresh(); } #endif @@ -137,55 +140,55 @@ void timr::set_time( double d_uptime, int i_cur_seconds, int i_cur_minutes, int i_cur_hours ) { - int i_hours = (int) d_uptime / 3600; - int i_minutes = (int) d_uptime / 60; + int i_hours = (int) d_uptime / 3600; + int i_minutes = (int) d_uptime / 60; + + while ( i_minutes >= 60 ) + i_minutes -= 60; - while ( i_minutes >= 60 ) - i_minutes -= 60; + while ( d_uptime >= 60 ) + d_uptime -= 60; - while ( d_uptime >= 60 ) - d_uptime -= 60; + // Calculate offset time + i_cur_hours += get_offset(); - // Calculate offset time - i_cur_hours += get_offset(); + for ( int i = 24-i_cur_hours; i < 0; i = 24-i_cur_hours ) + i_cur_hours =- i; - for ( int i = 24-i_cur_hours; i < 0; i = 24-i_cur_hours ) - i_cur_hours =- i; + if (i_cur_hours == 24) + i_cur_hours = 0; - if (i_cur_hours == 24) - i_cur_hours = 0; - - pthread_mutex_lock ( &mut_s_time ); - s_time = add_zero_to_front( tool::int2string( i_cur_hours ) ) + ":" + - add_zero_to_front( tool::int2string( i_cur_minutes ) ) + ":" + - add_zero_to_front( tool::int2string( i_cur_seconds ) ); - pthread_mutex_unlock( &mut_s_time ); + pthread_mutex_lock ( &mut_s_time ); + s_time = add_zero_to_front( tool::int2string( i_cur_hours ) ) + ":" + + add_zero_to_front( tool::int2string( i_cur_minutes ) ) + ":" + + add_zero_to_front( tool::int2string( i_cur_seconds ) ); + pthread_mutex_unlock( &mut_s_time ); - pthread_mutex_lock ( &mut_s_uptime ); - s_uptime = add_zero_to_front( tool::int2string( i_hours ) ) + ":" + - add_zero_to_front( tool::int2string( i_minutes ) ) + ":" + - add_zero_to_front( tool::int2string( (int) d_uptime ) ); - pthread_mutex_unlock( &mut_s_uptime ); + pthread_mutex_lock ( &mut_s_uptime ); + s_uptime = add_zero_to_front( tool::int2string( i_hours ) ) + ":" + + add_zero_to_front( tool::int2string( i_minutes ) ) + ":" + + add_zero_to_front( tool::int2string( (int) d_uptime ) ); + pthread_mutex_unlock( &mut_s_uptime ); } string timr::add_zero_to_front( string s_time ) { - if ( s_time.length() == 1 ) - { - string s_new = "0" + s_time; - return s_new; - } + if ( s_time.length() == 1 ) + { + string s_new = "0" + s_time; + return s_new; + } - return s_time; + return s_time; } double timr::get_time_diff( time_t &clock_diff ) { - time_t clock_now; - time( &clock_now ); + time_t clock_now; + time( &clock_now ); - return difftime(clock_now, clock_diff); + return difftime(clock_now, clock_diff); } #endif |