[netperf-dev] netperf2 commit notice r530 - trunk/src
raj at netperf.org
raj at netperf.org
Wed Feb 1 14:00:15 PST 2012
Author: raj
Date: 2012-02-01 14:00:15 -0800 (Wed, 01 Feb 2012)
New Revision: 530
Modified:
trunk/src/netdrv_solaris.c
trunk/src/netslot_linux.c
trunk/src/netslot_solaris.c
trunk/src/netslot_ux1131.c
trunk/src/netsys_hpux11i.c
trunk/src/netsys_linux.c
trunk/src/netsys_solaris.c
Log:
is our leg tired from this trailing whitespace kicking yet
Modified: trunk/src/netdrv_solaris.c
===================================================================
--- trunk/src/netdrv_solaris.c 2012-02-01 21:56:11 UTC (rev 529)
+++ trunk/src/netdrv_solaris.c 2012-02-01 22:00:15 UTC (rev 530)
@@ -29,7 +29,7 @@
/* on the off chance we managed to toast the entire string, we
should probably mention that somehow. raj 2008-03-19 */
- if (strlen(driver) == 0)
+ if (strlen(driver) == 0)
strncpy(driver,"NoAlpha",len);
strncpy(version,"Unavailable",len);
Modified: trunk/src/netslot_linux.c
===================================================================
--- trunk/src/netslot_linux.c 2012-02-01 21:56:11 UTC (rev 529)
+++ trunk/src/netslot_linux.c 2012-02-01 22:00:15 UTC (rev 530)
@@ -10,7 +10,7 @@
static int
find_slot(const char *fpath, const struct stat *sb,
- int tflag, struct FTW *ftwbuf)
+ int tflag, struct FTW *ftwbuf)
{
char slot_address[11];
int ret;
@@ -45,7 +45,7 @@
strcpy(interface_slot,"strcpy");
return 1;
}
-
+
this_tok = strtok(myfpath,"/");
while (strcmp(this_tok,"address")) {
last_tok = this_tok;
@@ -131,7 +131,7 @@
fclose(valfile);
return ret;
-
+
}
void
Modified: trunk/src/netslot_solaris.c
===================================================================
--- trunk/src/netslot_solaris.c 2012-02-01 21:56:11 UTC (rev 529)
+++ trunk/src/netslot_solaris.c 2012-02-01 22:00:15 UTC (rev 530)
@@ -27,14 +27,14 @@
static char *
set_interface_match(char *interface_name) {
-
+
int i;
char *nukeit;
strncpy(interface_match,interface_name,IFNAMSIZ);
interface_match[IFNAMSIZ-1] = 0;
-
+
/* strip away the logical interface information if present we "know"
thanks to the above that we will find a null character to get us
out of the loop */
@@ -89,7 +89,7 @@
pciex108e,abcd.108e.0.1
pci14e4,164c.12
-
+
are somewhat perplexing also. Can we ass-u-me that the id's will
always be presented as four character hex? Until we learn to the
contrary, that is what will be ass-u-me-d here and so we will
Modified: trunk/src/netslot_ux1131.c
===================================================================
--- trunk/src/netslot_ux1131.c 2012-02-01 21:56:11 UTC (rev 529)
+++ trunk/src/netslot_ux1131.c 2012-02-01 22:00:15 UTC (rev 530)
@@ -33,7 +33,7 @@
olar_io_slot_t slot_id;
olar_err_t oe;
char slot_str[MAX_SLOT_ID_LEN];
-
+
/* Open dev_config for libIO communication */
if ( io_init(O_RDONLY) == IO_ERROR ) {
return strdup("io_init");
@@ -76,7 +76,7 @@
/* we can give them the honest to goodness slot id as a string now,
so let us free that which we should free */
free(hw_str);
-
+
return strdup(slot_str);
}
Modified: trunk/src/netsys_hpux11i.c
===================================================================
--- trunk/src/netsys_hpux11i.c 2012-02-01 21:56:11 UTC (rev 529)
+++ trunk/src/netsys_hpux11i.c 2012-02-01 22:00:15 UTC (rev 530)
@@ -39,18 +39,18 @@
what other tools/platforms support, we shouldn't do a simple
integer divide - instead, we should do our division in floating
point and then round */
- *cpu_frequency = rint((double)processor_info.psp_cpu_frequency /
+ *cpu_frequency = rint((double)processor_info.psp_cpu_frequency /
1000000.0);
#else
/* older OSes were "known" to be on CPUs where the itick was
1to1 here */
- *cpu_frequency = rint(((double)processor_info.psp_iticksperclktick *
+ *cpu_frequency = rint(((double)processor_info.psp_iticksperclktick *
(double)sysconf(_SC_CLK_TCK)) / 1000000.0);
-#endif
+#endif
}
else
*cpu_frequency = -1;
*cpu_model = strdup("Unknown CPU Model");
}
-
+
Modified: trunk/src/netsys_linux.c
===================================================================
--- trunk/src/netsys_linux.c 2012-02-01 21:56:11 UTC (rev 529)
+++ trunk/src/netsys_linux.c 2012-02-01 22:00:15 UTC (rev 530)
@@ -78,7 +78,7 @@
return -1;
}
-static void
+static void
find_system_model(char **system_model) {
#if defined(HAVE_LIBSMBIOS)
#if defined(HAVE_SMBIOS_SYSTEMINFO_H)
Modified: trunk/src/netsys_solaris.c
===================================================================
--- trunk/src/netsys_solaris.c 2012-02-01 21:56:11 UTC (rev 529)
+++ trunk/src/netsys_solaris.c 2012-02-01 22:00:15 UTC (rev 530)
@@ -107,7 +107,7 @@
#if defined(HAVE_SYS_SMBIOS_H) && defined(HAVE_LIBSMBIOS)
#include <sys/smbios.h>
smbios_hdl_t *smbios_handle;
- smbios_info_t info;
+ smbios_info_t info;
int error;
int ret;
@@ -129,7 +129,7 @@
return;
}
ret = smbios_info_common(smbios_handle,256,&info);
- if (0 == ret)
+ if (0 == ret)
*system_model = strdup(info.smbi_product);
else {
/* we ass-u-me that while there was smbios on the system it didn't
@@ -176,4 +176,4 @@
frequency);
}
#endif
-
+
More information about the netperf-dev
mailing list