[netperf-dev] netperf2 commit notice r289 - in trunk: . src
raj at netperf.org
raj at netperf.org
Thu Aug 14 13:38:32 PDT 2008
Author: raj
Date: 2008-08-14 13:38:31 -0700 (Thu, 14 Aug 2008)
New Revision: 289
Modified:
trunk/AUTHORS
trunk/Release_Notes
trunk/src/netlib.c
trunk/src/netserver.c
trunk/src/netsh.c
trunk/src/nettest_bsd.c
Log:
msdos changes from gisle vanem
Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS 2008-08-05 23:32:50 UTC (rev 288)
+++ trunk/AUTHORS 2008-08-14 20:38:31 UTC (rev 289)
@@ -227,4 +227,4 @@
is very long.
Gisle Vanem
-MingW cleanups.
\ No newline at end of file
+MingW cnd MSDOS (djgpp) leanups.
Modified: trunk/Release_Notes
===================================================================
--- trunk/Release_Notes 2008-08-05 23:32:50 UTC (rev 288)
+++ trunk/Release_Notes 2008-08-14 20:38:31 UTC (rev 289)
@@ -2,7 +2,8 @@
Things changed in this release:
-*) Compilation cleanups for MingW courtesy of Gisle Vanem.
+*) Compilation cleanups for MingW cnd MSDOS (djgpp) ourtesy of Gisle
+ Vanem.
*) Changes to enable compilation and building of netperf for
VMware. Kudos to the person who did the first port, I will be happy
Modified: trunk/src/netlib.c
===================================================================
--- trunk/src/netlib.c 2008-08-05 23:32:50 UTC (rev 288)
+++ trunk/src/netlib.c 2008-08-14 20:38:31 UTC (rev 289)
@@ -78,7 +78,7 @@
#ifndef WIN32
/* at some point, I would like to get rid of all these "sys/" */
/* includes where appropriate. if you have a system that requires */
- /* them, speak now, or your system may not comile later revisions of */
+ /* them, speak now, or your system may not compile later revisions of */
/* netperf. raj 1/96 */
#include <unistd.h>
#include <sys/stat.h>
Modified: trunk/src/netserver.c
===================================================================
--- trunk/src/netserver.c 2008-08-05 23:32:50 UTC (rev 288)
+++ trunk/src/netserver.c 2008-08-14 20:38:31 UTC (rev 289)
@@ -87,9 +87,9 @@
#include <errno.h>
#include <signal.h>
#endif
-#if !defined(WIN32) && !defined(__VMS)
+#if !defined(WIN32) && !defined(__VMS) && !defined(MSDOS)
#include <sys/ipc.h>
-#endif /* !defined(WIN32) && !defined(__VMS) */
+#endif /* !defined(WIN32) && !defined(__VMS) && !defined(MSDOS) */
#include <fcntl.h>
#ifdef WIN32
#include <time.h>
@@ -225,7 +225,7 @@
if (!debug)
{
fclose(where);
-#if !defined(WIN32) && !defined(MPE) && !defined(__VMS)
+#if !defined(WIN32) && !defined(MPE) && !defined(__VMS) && !defined(MSDOS)
/* For Unix: reopen the debug write file descriptor to "/dev/null" */
/* and redirect stdout to it. */
fflush (stdout);
@@ -245,7 +245,7 @@
perror ("netserver: duplicate /dev/null write file descr. to stdout");
exit (1);
}
-#endif /* !WIN32 !MPE !__VMS */
+#endif /* !WIN32 !MPE !__VMS !MSDOS */
}
break;
@@ -496,10 +496,10 @@
int error;
int not_listening;
-#if !defined(WIN32) && !defined(MPE) && !defined(__VMS)
+#if !defined(WIN32) && !defined(MPE) && !defined(__VMS) && !defined(MSDOS)
FILE *rd_null_fp; /* Used to redirect from "/dev/null". */
FILE *wr_null_fp; /* Used to redirect to "/dev/null". */
-#endif /* !WIN32 !MPE !__VMS */
+#endif /* !WIN32 !MPE !__VMS !MDOS */
if (debug) {
fprintf(stderr,
@@ -614,7 +614,7 @@
setpgrp();
*/
-#if !defined(WIN32) && !defined(MPE) && !defined(__VMS) && !defined(VMWARE_UW)
+#if !defined(WIN32) && !defined(MPE) && !defined(__VMS) && !defined(VMWARE_UW) && !defined(MSDOS)
/* Flush the standard I/O file descriptors before forking. */
fflush (stdin);
fflush (stdout);
@@ -691,7 +691,7 @@
signal(SIGCLD, SIG_IGN);
-#endif /* !WIN32 !MPE !__VMS */
+#endif /* !WIN32 !MPE !__VMS !MSDOS */
for (;;)
{
@@ -702,7 +702,7 @@
printf("server_control: accept failed errno %d\n",errno);
exit(1);
}
-#if defined(MPE) || defined(__VMS) || defined(VMWARE_UW)
+#if defined(MPE) || defined(__VMS) || defined(VMWARE_UW) || defined(MSDOS)
/*
* Since we cannot fork this process , we cant fire any threads
* as they all share the same global data . So we better allow
@@ -804,16 +804,16 @@
#endif /* DONT_WAIT */
break;
}
-#endif /* !WIN32 !MPE !__VMS */
+#endif /* !WIN32 !MPE !__VMS !MSDOS */
} /*for*/
-#if !defined(WIN32) && !defined(MPE) && !defined(__VMS) && !defined(VMWARE_UW)
+#if !defined(WIN32) && !defined(MPE) && !defined(__VMS) && !defined(VMWARE_UW) && !defined(MSDOS)
break; /*case 0*/
default:
exit (0);
}
-#endif /* !WIN32 !MPE !__VMS */
+#endif /* !WIN32 !MPE !__VMS !MSDOS */
}
#ifdef WIN32
@@ -901,6 +901,9 @@
case 'd':
/* we want to set the debug file name sometime */
debug++;
+#ifdef MSDOS
+ dbug_init();
+#endif
break;
case 'L':
not_inetd = 1;
Modified: trunk/src/netsh.c
===================================================================
--- trunk/src/netsh.c 2008-08-05 23:32:50 UTC (rev 288)
+++ trunk/src/netsh.c 2008-08-14 20:38:31 UTC (rev 289)
@@ -17,9 +17,9 @@
#include <sys/types.h>
#ifndef WIN32
#include <unistd.h>
-#ifndef __VMS
+#if !defined(__VMS) && !defined(MSDOS)
#include <sys/ipc.h>
-#endif /* __VMS */
+#endif /* __VMS/MSDOS */
#endif /* WIN32 */
#include <fcntl.h>
#ifndef WIN32
@@ -640,6 +640,9 @@
break;
case 'd':
debug++;
+#ifdef MSDOS
+ dbug_init();
+#endif
break;
case 'D':
#if (defined WANT_DEMO)
Modified: trunk/src/nettest_bsd.c
===================================================================
--- trunk/src/nettest_bsd.c 2008-08-05 23:32:50 UTC (rev 288)
+++ trunk/src/nettest_bsd.c 2008-08-14 20:38:31 UTC (rev 289)
@@ -101,9 +101,9 @@
#endif
#ifndef WIN32
-#if !defined(__VMS)
+#if !defined(__VMS) && !defined(MSDOS)
#include <sys/ipc.h>
-#endif /* !defined(__VMS) */
+#endif /* !__VMS && !MSDOS */
#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
More information about the netperf-dev
mailing list