bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2025-02-24 02:55:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

slicedmap - replace usleep with poll, remove SPLICE_F_MOVE

Browse Source 
use poll instead of usleep (to get rid of potential blocking in future)
remove SPLICE_F_MOVE
This commit is contained in:
z3APA3A 2018-04-22 23:23:22 +03:00
parent fd588949c9
commit b3abf80a50
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/sockmap.c
View File

@ -110,26 +110,18 @@ int splicemap(struct clientparam * param, int timeo){
res = so._poll(fds, 2, timeo*1000); res = so._poll(fds, 2, timeo*1000);
if(res < 0){ if(res < 0){
if(errno != EAGAIN && errno != EINTR) RETURN(91); if(errno != EAGAIN && errno != EINTR) RETURN(91);
if(errno == EINTR) usleep(SLEEPTIME); if(errno == EINTR) so._poll(NULL, 0, 1);
continue; continue;
} }
if(res < 1){ if(res < 1){
RETURN(92); RETURN(92);
} }
if( (fds[0].revents & (POLLERR|POLLNVAL if( (fds[0].revents & (POLLERR|POLLNVAL|POLLHUP)) && !(fds[0].revents & POLLIN)) {
#ifndef WITH_WSAPOLL
|POLLHUP
#endif
)) && !(fds[0].revents & POLLIN)) {
fds[0].revents = 0; fds[0].revents = 0;
stop = 1; stop = 1;
param->res = 90; param->res = 90;
} }
if( (fds[1].revents & (POLLERR|POLLNVAL if( (fds[1].revents & (POLLERR|POLLNVAL|POLLHUP)) && !(fds[1].revents & POLLIN)){
#ifndef WITH_WSAPOLL
|POLLHUP
#endif
)) && !(fds[1].revents & POLLIN)){
fds[1].revents = 0; fds[1].revents = 0;
stop = 1; stop = 1;
param->res = 90; param->res = 90;
@ -145,14 +137,14 @@ int splicemap(struct clientparam * param, int timeo){
#if DEBUGLEVEL > 2 #if DEBUGLEVEL > 2
(*param->srv->logfunc)(param, "splice: spliced send to client"); (*param->srv->logfunc)(param, "splice: spliced send to client");
#endif #endif
res = splice(pipesrv[0], NULL, param->clisock, NULL, MIN(MAXSPLICE, insrvpipe), SPLICE_F_NONBLOCK | SPLICE_F_MORE | SPLICE_F_MOVE); res = splice(pipesrv[0], NULL, param->clisock, NULL, MIN(MAXSPLICE, insrvpipe), SPLICE_F_NONBLOCK | SPLICE_F_MOVE);
} }
if(res < 0) { if(res < 0) {
#if DEBUGLEVEL > 2 #if DEBUGLEVEL > 2
(*param->srv->logfunc)(param, "splice: send to client error"); (*param->srv->logfunc)(param, "splice: send to client error");
#endif #endif
if(errno != EAGAIN && errno != EINTR) RETURN(96); if(errno != EAGAIN && errno != EINTR) RETURN(96);
if(errno == EINTR) usleep(SLEEPTIME); if(errno == EINTR) so._poll(NULL, 0, 1);
continue; continue;
} }
if(res){ if(res){
@ -189,14 +181,14 @@ int splicemap(struct clientparam * param, int timeo){
#if DEBUGLEVEL > 2 #if DEBUGLEVEL > 2
(*param->srv->logfunc)(param, "splice: spliced send to server"); (*param->srv->logfunc)(param, "splice: spliced send to server");
#endif #endif
res = splice(pipecli[0], NULL, param->remsock, NULL, MIN(MAXSPLICE, inclipipe), SPLICE_F_NONBLOCK | SPLICE_F_MORE | SPLICE_F_MOVE); res = splice(pipecli[0], NULL, param->remsock, NULL, MIN(MAXSPLICE, inclipipe), SPLICE_F_NONBLOCK | SPLICE_F_MOVE);
} }
if(res < 0) { if(res < 0) {
#if DEBUGLEVEL > 2 #if DEBUGLEVEL > 2
(*param->srv->logfunc)(param, "splice: send to server error"); (*param->srv->logfunc)(param, "splice: send to server error");
#endif #endif
if(errno != EAGAIN && errno != EINTR) RETURN(97); if(errno != EAGAIN && errno != EINTR) RETURN(97);
if(errno == EINTR) usleep(SLEEPTIME); if(errno == EINTR) so._poll(NULL, 0, 1);
continue; continue;
} }
if(res){ if(res){
@ -232,10 +224,10 @@ int splicemap(struct clientparam * param, int timeo){
#if DEBUGLEVEL > 2 #if DEBUGLEVEL > 2
(*param->srv->logfunc)(param, "splice: recv from client"); (*param->srv->logfunc)(param, "splice: recv from client");
#endif #endif
res = splice(param->clisock, NULL, pipecli[1], NULL, rfromclient, SPLICE_F_NONBLOCK | SPLICE_F_MORE | SPLICE_F_MOVE); res = splice(param->clisock, NULL, pipecli[1], NULL, rfromclient, SPLICE_F_NONBLOCK | SPLICE_F_MOVE);
if (res < 0){ if (res < 0){
if(errno != EAGAIN && errno != EINTR) RETURN(94); if(errno != EAGAIN && errno != EINTR) RETURN(94);
if(errno == EINTR) usleep(SLEEPTIME); if(errno == EINTR) so._poll(NULL, 0, 1);
continue; continue;
} }
if (res==0) { if (res==0) {
@ -254,10 +246,10 @@ int splicemap(struct clientparam * param, int timeo){
#if DEBUGLEVEL > 2 #if DEBUGLEVEL > 2
(*param->srv->logfunc)(param, "splice: recv from server"); (*param->srv->logfunc)(param, "splice: recv from server");
#endif #endif
res = splice(param->remsock, NULL, pipesrv[1], NULL, rfromserver, SPLICE_F_NONBLOCK | SPLICE_F_MORE | SPLICE_F_MOVE); res = splice(param->remsock, NULL, pipesrv[1], NULL, rfromserver, SPLICE_F_NONBLOCK | SPLICE_F_MOVE);
if (res < 0){ if (res < 0){
if(errno != EAGAIN && errno != EINTR) RETURN(93); if(errno != EAGAIN && errno != EINTR) RETURN(93);
if(errno == EINTR) usleep(SLEEPTIME); if(errno == EINTR) so._poll(NULL, 0, 1);
continue; continue;
} }
if (res==0) { if (res==0) {
@ -276,7 +268,7 @@ int splicemap(struct clientparam * param, int timeo){
} }
if(sleeptime > 0) { if(sleeptime > 0) {
if(sleeptime > (timeo * 1000)){RETURN (95);} if(sleeptime > (timeo * 1000)){RETURN (95);}
usleep(sleeptime * SLEEPTIME); so._poll(NULL, 0, sleeptime);
sleeptime = 0; sleeptime = 0;
} }
} }