diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | runtime/srUtils.h | 13 | ||||
| -rw-r--r-- | tests/tcpflood.c | 4 |
3 files changed, 3 insertions, 15 deletions
@@ -11,6 +11,7 @@ Version 5.9.7 [V5-BETA], 2012-04-?? http://bugzilla.adiscon.com/show_bug.cgi?id=299 Thanks to Marcin M for bringing up this problem and Andre Lorbach for helping to reproduce and fix it. +- bugfix/tcpflood: sending small test files did not work correctly --------------------------------------------------------------------------- Version 5.9.6 [V5-BETA], 2012-04-12 - added configuration directives to customize queue light delay marks diff --git a/runtime/srUtils.h b/runtime/srUtils.h index 76d25eb2..3169fd94 100644 --- a/runtime/srUtils.h +++ b/runtime/srUtils.h @@ -93,19 +93,6 @@ int getSubString(uchar **ppSrc, char *pDst, size_t DstSize, char cSep); rsRetVal getFileSize(uchar *pszName, off_t *pSize); /* mutex operations */ -/* some macros to cancel-safe lock a mutex (it will automatically be released - * when the thread is cancelled. This needs to be done as macros because - * pthread_cleanup_push sometimes is a macro that can not be used inside a function. - * It's a bit ugly, but works well... rgerhards, 2008-01-20 - */ -#define DEFVARS_mutex_cancelsafeLock int iCancelStateSave -#define mutex_cancelsafe_lock(mut) \ - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &iCancelStateSave); \ - d_pthread_mutex_lock(mut); \ - pthread_cleanup_push(mutexCancelCleanup, mut); \ - pthread_setcancelstate(iCancelStateSave, NULL); -#define mutex_cancelsafe_unlock(mut) pthread_cleanup_pop(1) - /* some useful constants */ #define DEFVARS_mutexProtection\ int bLockedOpIsLocked=0 diff --git a/tests/tcpflood.c b/tests/tcpflood.c index 8a34f06f..f3a89c77 100644 --- a/tests/tcpflood.c +++ b/tests/tcpflood.c @@ -348,7 +348,7 @@ genMsg(char *buf, size_t maxBuf, int *pLenBuf, struct instdata *inst) do { done = 1; *pLenBuf = fread(buf, 1, 1024, dataFP); - if(feof(dataFP)) { + if(*pLenBuf == 0) { if(--numFileIterations > 0) { rewind(dataFP); done = 0; /* need new iteration */ @@ -662,7 +662,7 @@ runTests(void) int run; stats.totalRuntime = 0; - stats.minRuntime = (unsigned long long) 0xffffffffffffffffll; + stats.minRuntime = 0xffffffffllu; stats.maxRuntime = 0; stats.numRuns = numRuns; run = 1; |