kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: struct timeval uses unsigned types on at least one platform (QNX). Alot of the time logic assumes a signed type. Switch to using a signed representation that is converted to the native representation only for system calls.

This commit is contained in:
Brad King 2005-05-10 16:36:49 -04:00
parent efcb43a88f
commit a4aefb4faa
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Source/kwsys/ProcessUNIX.c
View File

@ -73,7 +73,16 @@ do.
/* The maximum amount to read from a pipe at a time. */ /* The maximum amount to read from a pipe at a time. */
#define KWSYSPE_PIPE_BUFFER_SIZE 1024 #define KWSYSPE_PIPE_BUFFER_SIZE 1024
typedef struct timeval kwsysProcessTime; /* Keep track of times using a signed representation. Switch to the
native (possibly unsigned) representation only when calling native
functions. */
typedef struct timeval kwsysProcessTimeNative;
typedef struct kwsysProcessTime_s kwsysProcessTime;
struct kwsysProcessTime_s
{
long tv_sec;
long tv_usec;
};
typedef struct kwsysProcessCreateInformation_s typedef struct kwsysProcessCreateInformation_s
{ {
@ -94,7 +103,7 @@ static int kwsysProcessSetupOutputPipeFile(int* p, const char* name);
static int kwsysProcessGetTimeoutTime(kwsysProcess* cp, double* userTimeout, static int kwsysProcessGetTimeoutTime(kwsysProcess* cp, double* userTimeout,
kwsysProcessTime* timeoutTime); kwsysProcessTime* timeoutTime);
static int kwsysProcessGetTimeoutLeft(kwsysProcessTime* timeoutTime, static int kwsysProcessGetTimeoutLeft(kwsysProcessTime* timeoutTime,
kwsysProcessTime* timeoutLength); kwsysProcessTimeNative* timeoutLength);
static kwsysProcessTime kwsysProcessTimeGetCurrent(void); static kwsysProcessTime kwsysProcessTimeGetCurrent(void);
static double kwsysProcessTimeToDouble(kwsysProcessTime t); static double kwsysProcessTimeToDouble(kwsysProcessTime t);
static kwsysProcessTime kwsysProcessTimeFromDouble(double d); static kwsysProcessTime kwsysProcessTimeFromDouble(double d);
@ -762,8 +771,8 @@ int kwsysProcess_WaitForData(kwsysProcess* cp, char** data, int* length,
{ {
int i; int i;
int max = -1; int max = -1;
kwsysProcessTime* timeout = 0; kwsysProcessTimeNative* timeout = 0;
kwsysProcessTime timeoutLength; kwsysProcessTimeNative timeoutLength;
kwsysProcessTime timeoutTime; kwsysProcessTime timeoutTime;
kwsysProcessTime userStartTime = {0, 0}; kwsysProcessTime userStartTime = {0, 0};
int user = 0; int user = 0;
@ -1473,7 +1482,7 @@ static int kwsysProcessGetTimeoutTime(kwsysProcess* cp, double* userTimeout,
/* Get the length of time before the given timeout time arrives. /* Get the length of time before the given timeout time arrives.
Returns 1 if the time has already arrived, and 0 otherwise. */ Returns 1 if the time has already arrived, and 0 otherwise. */
static int kwsysProcessGetTimeoutLeft(kwsysProcessTime* timeoutTime, static int kwsysProcessGetTimeoutLeft(kwsysProcessTime* timeoutTime,
kwsysProcessTime* timeoutLength) kwsysProcessTimeNative* timeoutLength)
{ {
if(timeoutTime->tv_sec < 0) if(timeoutTime->tv_sec < 0)
{ {
@ -1484,8 +1493,9 @@ static int kwsysProcessGetTimeoutLeft(kwsysProcessTime* timeoutTime,
{ {
/* Calculate the remaining time. */ /* Calculate the remaining time. */
kwsysProcessTime currentTime = kwsysProcessTimeGetCurrent(); kwsysProcessTime currentTime = kwsysProcessTimeGetCurrent();
*timeoutLength = kwsysProcessTimeSubtract(*timeoutTime, currentTime); kwsysProcessTime timeLeft = kwsysProcessTimeSubtract(*timeoutTime,
if(timeoutLength->tv_sec < 0) currentTime);
if(timeLeft.tv_sec < 0)
{ {
/* Timeout has already expired. */ /* Timeout has already expired. */
return 1; return 1;
@ -1493,6 +1503,8 @@ static int kwsysProcessGetTimeoutLeft(kwsysProcessTime* timeoutTime,
else else
{ {
/* There is some time left. */ /* There is some time left. */
timeoutLength->tv_sec = timeLeft.tv_sec;
timeoutLength->tv_usec = timeLeft.tv_usec;
return 0; return 0;
} }
} }
@ -1502,7 +1514,10 @@ static int kwsysProcessGetTimeoutLeft(kwsysProcessTime* timeoutTime,
static kwsysProcessTime kwsysProcessTimeGetCurrent(void) static kwsysProcessTime kwsysProcessTimeGetCurrent(void)
{ {
kwsysProcessTime current; kwsysProcessTime current;
gettimeofday(&current, 0); kwsysProcessTimeNative current_native;
gettimeofday(&current_native, 0);
current.tv_sec = (long)current_native.tv_sec;
current.tv_usec = (long)current_native.tv_usec;
return current; return current;
} }