github/wangyu-udp2raw
1
0
Fork 0
mirror of https://github.com/wangyu-/udp2raw.git synced 2025-01-19 22:39:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

debug_flag

Browse Source
This commit is contained in:
wangyu 2017-07-31 11:00:58 +08:00 committed by wangyu
parent 2fc8149116
commit 00bc3453e2
1 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
main.cpp
View File

@ -28,6 +28,7 @@ int epollfd=-1;
int timer_fd=-1; int timer_fd=-1;
int fail_time_counter=0; int fail_time_counter=0;
int epoll_trigger_counter=0; int epoll_trigger_counter=0;
int debug_flag=0;
char key_string[1000]= "secret key"; char key_string[1000]= "secret key";
char key[16],key2[16]; char key[16],key2[16];
@ -2478,6 +2479,9 @@ int server_event_loop()
set_timer(epollfd,timer_fd); set_timer(epollfd,timer_fd);
long int begin_time;
long int end_time;
while(1)//////////////////////// while(1)////////////////////////
{ {
@ -2494,15 +2498,16 @@ int server_event_loop()
//printf("%d %d %d %d\n",timer_fd,raw_recv_fd,raw_send_fd,n); //printf("%d %d %d %d\n",timer_fd,raw_recv_fd,raw_send_fd,n);
if ((events[idx].data.u64 ) == (uint64_t)timer_fd) if ((events[idx].data.u64 ) == (uint64_t)timer_fd)
{ {
if(debug_flag)begin_time=get_current_time();
conn_manager.clear_inactive();
uint64_t dummy; uint64_t dummy;
read(timer_fd, &dummy, 8); read(timer_fd, &dummy, 8);
current_time_rough=get_current_time(); current_time_rough=get_current_time();
if(debug_flag)
long int begin=get_current_time(); {
conn_manager.clear_inactive(); end_time=get_current_time()-begin_time;
long int end=get_current_time()-begin; mylog(log_debug,"conn_manager.clear_inactive(),%lld,%lld,%lld \n",begin_time,end_time,end_time-begin_time);
}
if(end>1)mylog(log_debug,"%lld,conn_manager.clear_inactive();,%lld \n",begin,end);
mylog(log_debug,"epoll_trigger_counter: %d \n",epoll_trigger_counter); mylog(log_debug,"epoll_trigger_counter: %d \n",epoll_trigger_counter);
epoll_trigger_counter=0; epoll_trigger_counter=0;
@ -2510,14 +2515,17 @@ int server_event_loop()
} }
else if (events[idx].data.u64 == (uint64_t)raw_recv_fd) else if (events[idx].data.u64 == (uint64_t)raw_recv_fd)
{ {
long int begin=get_current_time(); if(debug_flag)begin_time=get_current_time();
server_on_raw_recv_multi(); server_on_raw_recv_multi();
long int end=get_current_time()-begin; if(debug_flag)
if(end>1)mylog(log_debug,"%lld,server_on_raw_recv_multi(),%lld \n",begin,end); {
end_time=get_current_time()-begin_time;
mylog(log_debug,"conn_manager.clear_inactive(),%lld,%lld,%lld \n",begin_time,end_time,end_time-begin_time);
}
} }
else if ((events[idx].data.u64 >>32u) == 2u) else if ((events[idx].data.u64 >>32u) == 2u)
{ {
long int begin=get_current_time(); if(debug_flag)begin_time=get_current_time();
int fd=get_u64_l(events[idx].data.u64); int fd=get_u64_l(events[idx].data.u64);
uint64_t dummy; uint64_t dummy;
read(fd, &dummy, 8); read(fd, &dummy, 8);
@ -2543,14 +2551,17 @@ int server_event_loop()
//conn_info_t &conn_info=conn_manager.find(ip,port); //conn_info_t &conn_info=conn_manager.find(ip,port);
keep_connection_server_multi(*p_conn_info); keep_connection_server_multi(*p_conn_info);
long int end=get_current_time()-begin; if(debug_flag)
if(end>1)mylog(log_debug,"%lld,keep_connection_server_multi,%lld \n",begin,end); {
end_time=get_current_time()-begin_time;
mylog(log_debug,"conn_manager.clear_inactive(),%lld,%lld,%lld \n",begin_time,end_time,end_time-begin_time);
}
} }
else if ((events[idx].data.u64 >>32u) == 1u) else if ((events[idx].data.u64 >>32u) == 1u)
{ {
//uint32_t conv_id=events[n].data.u64>>32u; //uint32_t conv_id=events[n].data.u64>>32u;
long int begin=get_current_time(); if(debug_flag)begin_time=get_current_time();
int fd=int((events[idx].data.u64<<32u)>>32u); int fd=int((events[idx].data.u64<<32u)>>32u);
@ -2606,8 +2617,11 @@ int server_event_loop()
mylog(log_trace,"send_data_safer ,sent !!\n"); mylog(log_trace,"send_data_safer ,sent !!\n");
} }
long int end=get_current_time()-begin; if(debug_flag)
if(end>1) mylog(log_debug,"%lld,send_data_safer,%lld \n",begin,end); {
end_time=get_current_time()-begin_time;
mylog(log_debug,"conn_manager.clear_inactive(),%lld,%lld,%lld \n",begin_time,end_time,end_time-begin_time);
}
} }
else else
{ {
@ -2678,6 +2692,7 @@ void process_arg(int argc, char *argv[])
{"disable-color", no_argument, 0, 1}, {"disable-color", no_argument, 0, 1},
{"log-position", no_argument, 0, 1}, {"log-position", no_argument, 0, 1},
{"disable-bpf", no_argument, 0, 1}, {"disable-bpf", no_argument, 0, 1},
{"debug", no_argument, 0, 1},
{"sock-buf", required_argument, 0, 1}, {"sock-buf", required_argument, 0, 1},
{"seq-mode", required_argument, 0, 1}, {"seq-mode", required_argument, 0, 1},
{NULL, 0, 0, 0} {NULL, 0, 0, 0}
@ -2851,6 +2866,11 @@ void process_arg(int argc, char *argv[])
{ {
//enable_log_color=0; //enable_log_color=0;
} }
else if(strcmp(long_options[option_index].name,"debug")==0)
{
debug_flag=1;
//enable_log_color=0;
}
else if(strcmp(long_options[option_index].name,"log-position")==0) else if(strcmp(long_options[option_index].name,"log-position")==0)
{ {
enable_log_position=1; enable_log_position=1;