diff options
| author | sumedh <sumedh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-07-21 15:43:35 +0000 |
|---|---|---|
| committer | sumedh <sumedh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-07-21 15:43:35 +0000 |
| commit | 61a2afaa7ace9f5674c56d503534dcd0f1c35977 (patch) | |
| tree | 9302cb23cdefcb96ae63f1c3a8769c0a4fb9f62d /apps/JAWS/clients/WebSTONE | |
| parent | cf336600efc8156d4aa303213c4c467c89992f74 (diff) | |
| download | ATCD-61a2afaa7ace9f5674c56d503534dcd0f1c35977.tar.gz | |
Removed binary
Diffstat (limited to 'apps/JAWS/clients/WebSTONE')
| -rw-r--r-- | apps/JAWS/clients/WebSTONE/src/Makefile | 2 | ||||
| -rwxr-xr-x | apps/JAWS/clients/WebSTONE/src/genrand | bin | 172032 -> 0 bytes | |||
| -rw-r--r-- | apps/JAWS/clients/WebSTONE/src/webclient.c | 23 |
3 files changed, 9 insertions, 16 deletions
diff --git a/apps/JAWS/clients/WebSTONE/src/Makefile b/apps/JAWS/clients/WebSTONE/src/Makefile index 65bd8d83d0a..d57dfffcd8f 100644 --- a/apps/JAWS/clients/WebSTONE/src/Makefile +++ b/apps/JAWS/clients/WebSTONE/src/Makefile @@ -16,7 +16,7 @@ CC = cc LIBS = -lsocket -lm -lthread #-lm LDFLAGS = INCLUDES = $(DYNAMICINCLUDES) -CFLAGS = -g +CFLAGS = -fast CPPFLAGS = DEFS = -DHAVE_CONFIG_H $(DYNAMICDEFS) diff --git a/apps/JAWS/clients/WebSTONE/src/genrand b/apps/JAWS/clients/WebSTONE/src/genrand Binary files differdeleted file mode 100755 index a6315cfef6f..00000000000 --- a/apps/JAWS/clients/WebSTONE/src/genrand +++ /dev/null diff --git a/apps/JAWS/clients/WebSTONE/src/webclient.c b/apps/JAWS/clients/WebSTONE/src/webclient.c index 28d206bd5c6..881c9db0ae8 100644 --- a/apps/JAWS/clients/WebSTONE/src/webclient.c +++ b/apps/JAWS/clients/WebSTONE/src/webclient.c @@ -9,6 +9,8 @@ * * **************************************************************************/ +#include <thread.h> + #include <stdio.h> #ifdef WIN32 @@ -25,7 +27,6 @@ #include <string.h> #ifndef WIN32 -#include <thread.h> #include <netdb.h> #include <unistd.h> #endif /* WIN32 */ @@ -411,7 +412,7 @@ accumstats(rqst_timer_t *rqsttimer, page_stats_t *pagestats, stats_t *timestat) * returns the number of files retrieved */ static int -makeload(int maxcount, int pageval, rqst_timer_t *timerarray, stats_t *timestat, SOCKET mastersock, page_stats_t *page_stats) +makeload(int maxcount, int pageval, THREAD rqst_timer_t *timerarray, THREAD stats_t *timestat, THREAD SOCKET mastersock, THREAD page_stats_t *page_stats) { int cnt; int returnval; @@ -926,15 +927,15 @@ main(int argc, char *argv[]) void ClientThread(void *dummy) { - FILE *logfile; + THREAD FILE *logfile; - stats_t timestat; + THREAD stats_t timestat; - rqst_timer_t timerarray[MAXNUMOFFILES]; - SOCKET mastersock = BADSOCKET_VALUE; /* connection to webmaster */ + THREAD rqst_timer_t timerarray[MAXNUMOFFILES]; + THREAD SOCKET mastersock = BADSOCKET_VALUE; /* connection to webmaster */ - page_stats_t *page_stats; /* actually a dynamic array */ + THREAD page_stats_t *page_stats; /* actually a dynamic array */ int loopcnt = 0; int filecnt; @@ -985,11 +986,7 @@ void ClientThread(void *dummy) /* Initialize random number generator */ junk = getpid (); -#ifndef WIN32 rand_r(&junk); -#else - junk = rand (); -#endif /* ! WIN32 */ D_PRINTF( "Random seed: %d\n", junk ); for (i=0; i < MAXNUMOFFILES; i++) @@ -1074,11 +1071,7 @@ void ClientThread(void *dummy) D_PRINTF( "Running in timed mode\n" ); /* random number between 0 and totalweight-1 */ junk = getpid (); -#ifndef WIN32 ran_number = (rand_r(&junk) % total_weight); -#else - ran_number = (RANDOM() % total_weight); -#endif D_PRINTF( "random %ld\n", ran_number ); /* loop through pages, find correct one |