From: Guilhem Lavaux Date: Mon, 9 Aug 1999 17:35:30 +0000 (+0000) Subject: Removed unnecessary lines from threadpsx X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/98781fa30e4a8cb7b244aba345a78a2a3c8f7f25 Removed unnecessary lines from threadpsx Renamed GSOCK_TRYAGAIN to GSOCK_WOULDBLOCK Added GSOCK_TIMEOUT Enabled the replacement code for timeout handling in gsocket.c Renamed some var in gsockunx & gsocket git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/gsocket.h b/include/wx/gsocket.h index 7190696fd0..938b6f0b77 100644 --- a/include/wx/gsocket.h +++ b/include/wx/gsocket.h @@ -12,6 +12,7 @@ #if wxUSE_SOCKETS +#include #include #if !defined(__cplusplus) @@ -49,7 +50,8 @@ typedef enum { GSOCK_INVSOCK, GSOCK_NOHOST, GSOCK_INVPORT, - GSOCK_TRYAGAIN, + GSOCK_WOULDBLOCK, + GSOCK_TIMEOUT, GSOCK_MEMERR } GSocketError; diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c index 9a575b233c..4521d220e8 100644 --- a/src/unix/gsocket.c +++ b/src/unix/gsocket.c @@ -90,7 +90,7 @@ GSocket *GSocket_new() socket->m_fd = -1; for (i=0;im_fbacks[i] = NULL; + socket->m_cbacks[i] = NULL; socket->m_iocalls[i] = FALSE; } socket->m_local = NULL; @@ -551,7 +551,7 @@ GSocketError GSocket_GetError(GSocket *socket) /* Callbacks */ /* - Only one fallback is possible for each event (INPUT, OUTPUT, CONNECTION) + Only one callback is possible for each event (INPUT, OUTPUT, CONNECTION) INPUT: The function is called when there is at least a byte in the input buffer OUTPUT: The function is called when the system is sure the next write call @@ -570,7 +570,7 @@ GSocketError GSocket_GetError(GSocket *socket) CONNECTION -> GSocket_Accept() */ void GSocket_SetCallback(GSocket *socket, GSocketEventFlags event, - GSocketCallback fallback, char *cdata) + GSocketCallback callback, char *cdata) { int count; @@ -580,7 +580,7 @@ void GSocket_SetCallback(GSocket *socket, GSocketEventFlags event, /* We test each flag and, if it is enabled, we enable the corresponding event */ if ((event & (1 << count)) != 0) { - socket->m_fbacks[count] = fallback; + socket->m_cbacks[count] = callback; socket->m_data[count] = cdata; _GSocket_Enable(socket, count); } @@ -588,7 +588,7 @@ void GSocket_SetCallback(GSocket *socket, GSocketEventFlags event, } /* - UnsetCallback will disables all fallbacks specified by "event". + UnsetCallback will disables all callbacks specified by "event". NOTE: event may be a combination of flags */ void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags event) @@ -600,16 +600,16 @@ void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags event) for (count=0;countm_fbacks[count] = NULL; + socket->m_cbacks[count] = NULL; } } } #define CALL_FALLBACK(socket, event) \ if (socket->m_iocalls[event] && \ - socket->m_fbacks[event]) {\ + socket->m_cbacks[event]) {\ _GSocket_Disable(socket, event); \ - socket->m_fbacks[event](socket, event, \ + socket->m_cbacks[event](socket, event, \ socket->m_data[event]); \ } @@ -623,48 +623,36 @@ if (socket->m_iocalls[event] && \ signal(SIGPIPE, old_handler); \ } -#if 0 -#ifndef CAN_USE_TIMEOUT - #define ENABLE_TIMEOUT(socket) \ { \ struct itimerval old_ival, new_ival; \ void (*old_timer_sig)(int); \ \ - new_ival.it_interval.tv_sec = socket->m_timeout / 1000; \ - new_ival.it_interval.tv_usec = (socket->m_timeout % 1000) * 1000; \ - setitimer(ITIMER_REAL, &new_ival, &old_ival); \ - old_timer_sig = signal(SIGALRM, SIG_DFL); + old_timer_sig = signal(SIGALRM, SIG_DFL); \ + siginterrupt(SIGALRM, 1); \ + new_ival.it_value.tv_sec = socket->m_timeout / 1000; \ + new_ival.it_value.tv_usec = (socket->m_timeout % 1000) * 1000; \ + new_ival.it_interval.tv_sec = 0; \ + new_ival.it_interval.tv_usec = 0; \ + setitimer(ITIMER_REAL, &new_ival, &old_ival); #define DISABLE_TIMEOUT(socket) \ signal(SIGALRM, old_timer_sig); \ + siginterrupt(SIGALRM, 0); \ setitimer(ITIMER_REAL, &old_ival, NULL); \ } -#else - -#define ENABLE_TIMEOUT(s) -#define DISABLE_TIMEOUT(s) - -#endif - -#endif - -/* Temporary */ -#define ENABLE_TIMEOUT(s) -#define DISABLE_TIMEOUT(s) - void _GSocket_Enable(GSocket *socket, GSocketEvent event) { socket->m_iocalls[event] = TRUE; - if (socket->m_fbacks[event]) + if (socket->m_cbacks[event]) _GSocket_Install_Callback(socket, event); } void _GSocket_Disable(GSocket *socket, GSocketEvent event) { socket->m_iocalls[event] = FALSE; - if (socket->m_fbacks[event]) + if (socket->m_cbacks[event]) _GSocket_Uninstall_Callback(socket, event); } @@ -683,7 +671,7 @@ int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size) return -1; } if (errno == EWOULDBLOCK) { - socket->m_error = GSOCK_TRYAGAIN; + socket->m_error = GSOCK_WOULDBLOCK; return -1; } return ret; @@ -707,7 +695,7 @@ int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size) return -1; } if (errno == EWOULDBLOCK) { - socket->m_error = GSOCK_TRYAGAIN; + socket->m_error = GSOCK_WOULDBLOCK; return -1; } @@ -739,7 +727,7 @@ int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size) return -1; } if (errno == EWOULDBLOCK) { - socket->m_error = GSOCK_TRYAGAIN; + socket->m_error = GSOCK_WOULDBLOCK; return -1; } return ret; @@ -773,7 +761,7 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size) return -1; } if (errno == EWOULDBLOCK) { - socket->m_error = GSOCK_TRYAGAIN; + socket->m_error = GSOCK_WOULDBLOCK; return -1; } diff --git a/src/unix/gsockunx.h b/src/unix/gsockunx.h index 7c0ce9a5a9..34bf8a6c82 100644 --- a/src/unix/gsockunx.h +++ b/src/unix/gsockunx.h @@ -29,7 +29,7 @@ struct _GSocket { unsigned long m_timeout; /* Callbacks */ - GSocketCallback m_fbacks[GSOCK_MAX_EVENT]; + GSocketCallback m_cbacks[GSOCK_MAX_EVENT]; char *m_data[GSOCK_MAX_EVENT]; /* IO calls associated */ diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp index eee36b4d3a..130ea38598 100644 --- a/src/unix/threadpsx.cpp +++ b/src/unix/threadpsx.cpp @@ -102,16 +102,7 @@ wxMutex::wxMutex() { p_internal = new wxMutexInternal; -#if 0 - /* I don't know where this function is supposed to exist, - and NP actually means non-portable, RR. */ - pthread_mutexattr_t attr_type; - pthread_mutexattr_settype( &attr_type, PTHREAD_MUTEX_FAST_NP ); - - pthread_mutex_init( &(p_internal->p_mutex), (const pthread_mutexattr_t*) &attr_type ); -#else pthread_mutex_init( &(p_internal->p_mutex), (const pthread_mutexattr_t*) NULL ); -#endif m_locked = 0; }