[netperf-dev] netperf2 commit notice r364 - in trunk: . src

[raj at netperf.org]

Author: raj
Date: 2010-10-27 09:13:13 -0700 (Wed, 27 Oct 2010)
New Revision: 364

Modified:
   trunk/AUTHORS
   trunk/Release_Notes
   trunk/src/netserver.c
Log:
massage and apply a DEBUG_LOG_FILE patch for Android from Josselin Costanzi

Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS	2010-10-23 01:12:20 UTC (rev 363)
+++ trunk/AUTHORS	2010-10-27 16:13:13 UTC (rev 364)
@@ -250,3 +250,6 @@
 
 Frank Schuster
 Discovering that FreeBSD 8.X also does not need an SCTP library
+
+Josselin Costanzi
+DEBUG_LOG_FILE patch for Android
\ No newline at end of file

Modified: trunk/Release_Notes
===================================================================
--- trunk/Release_Notes	2010-10-23 01:12:20 UTC (rev 363)
+++ trunk/Release_Notes	2010-10-27 16:13:13 UTC (rev 364)
@@ -1,5 +1,8 @@
 These are the Release Notes for post-revision 2.4.5 of netperf:
 
+*) Massage and include a DEBUG_LOG_FILE patch for Android from
+   Josselin Costanzi
+
 *) Add intial attempt to report Slot ID on HP-UX 11.31.
 
 *) Add global -s option to cause omni tests to pause between

Modified: trunk/src/netserver.c
===================================================================
--- trunk/src/netserver.c	2010-10-23 01:12:20 UTC (rev 363)
+++ trunk/src/netserver.c	2010-10-27 16:13:13 UTC (rev 364)
@@ -141,11 +141,13 @@
 #include "netsh.h"
 
 #ifndef DEBUG_LOG_FILE
-#ifndef WIN32
+#if defined(WIN32)
+#define DEBUG_LOG_FILE "c:\\temp\\netperf.debug"
+#elif defined(ANDROID)
+#define DEBUG_LOG_FILE "/data/tmp/netperf.debug"
+#else
 #define DEBUG_LOG_FILE "/tmp/netperf.debug"
-#else
-#define DEBUG_LOG_FILE "c:\\temp\\netperf.debug"
-#endif  /* WIN32 */
+#endif
 #endif /* DEBUG_LOG_FILE */
 
  /* some global variables */