[netperf-dev] netperf2 commit notice r260 - trunk/src

[raj at netperf.org]

Author: raj
Date: 2008-03-13 13:33:33 -0700 (Thu, 13 Mar 2008)
New Revision: 260

Modified:
   trunk/src/netsys_solaris.c
   trunk/src/nettest_bsd.h
Log:
longer cpu_model names thanks to intel itanium marketing people and some netsys_solaris.c cleanups

Modified: trunk/src/netsys_solaris.c
===================================================================
--- trunk/src/netsys_solaris.c	2008-03-13 00:40:07 UTC (rev 259)
+++ trunk/src/netsys_solaris.c	2008-03-13 20:33:33 UTC (rev 260)
@@ -3,6 +3,7 @@
 #endif
 
 #include <stdio.h>
+#include <errno.h>
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
@@ -120,14 +121,27 @@
   if (NULL == smbios_handle) {
     /* fall-back on sysinfo for the system model info, we don't really
        care why we didn't get a handle, just that we didn't get one */
+#if defined(NETPERF_STANDALONE_DEBUG)
+    printf("smbios_open returned NULL, error %d errno %d %s\n",
+	   error,errno,strerror(errno));
+#endif
     find_system_model_sysinfo(system_model);
     return;
   }
   ret = smbios_info_common(smbios_handle,256,&info);
   if (0 == ret) 
     *system_model = strdup(info.smbi_product);
-  else
-    *system_model = strdup("smbios_info_common");
+  else {
+    /* we ass-u-me that while there was smbios on the system it didn't
+       have the smbi_product information we seek, so once again we
+       fallback to sysinfo.  this is getting tiresome isn't it?-) raj
+       2008-03-12 */
+#if defined(NETPERF_STANDALONE_DEBUG)
+    printf("smbios_info_common returned %d errno %d %s\n",
+	   ret,errno,strerror(errno));
+#endif
+    find_system_model_sysinfo(system_model);
+  }
   smbios_close(smbios_handle);
 
 #else

Modified: trunk/src/nettest_bsd.h
===================================================================
--- trunk/src/nettest_bsd.h	2008-03-13 00:40:07 UTC (rev 259)
+++ trunk/src/nettest_bsd.h	2008-03-13 20:33:33 UTC (rev 260)
@@ -98,8 +98,12 @@
      full */
   uint32_t   cpu_frequency;  /* this should be megahertz */
   char       system_model[32];
-  char       cpu_model[64];  /* seems like an awful lot doesn't it */
-  /* 84 bytes left */
+  char       cpu_model[80];  /* seems like an awful lot doesn't
+				it. some clever person at Intel
+				decided to give Montecito processors a
+				name that long - and still didn't
+				include the 9NNN model number! */
+  /* 68 bytes left */
   
 };