[netperf-dev] netperf4 commit notice r51 - trunk/src
raj at netperf.org
raj at netperf.org
Wed Jan 25 22:00:43 PST 2006
Author: raj
Date: 2006-01-25 22:00:39 -0800 (Wed, 25 Jan 2006)
New Revision: 51
Modified:
trunk/src/netlib.c
trunk/src/netlib.h
trunk/src/netperf.c
trunk/src/netsysstats_common.c
trunk/src/netsysstats_none.c
Log:
Still more include file wrapping, and make sure that sys_cpu_util_init in
netsysstats_none.c returns at least one in num_cpu so the _common code
doesn't get cranky. Still have some sort of issue with report_flags
being NULL at the end of the test.
Modified: trunk/src/netlib.c
===================================================================
--- trunk/src/netlib.c 2006-01-26 01:02:05 UTC (rev 50)
+++ trunk/src/netlib.c 2006-01-26 06:00:39 UTC (rev 51)
@@ -413,6 +413,167 @@
}
}
+char *
+npe_to_str(int npe_error) {
+ switch (npe_error) {
+ case NPE_SUCCESS:
+ return("NPE_SUCCESS");
+ break;
+ case NPE_COMMANDED_TO_EXIT_NETPERF:
+ return("NPE_COMMANDED_TO_EXIT_NETPERF");
+ break;
+ case NPE_TEST_SET_NOT_FOUND:
+ return("NPE_TEST_SET_NOT_FOUND");
+ break;
+ case NPE_BAD_TEST_RANGE:
+ return("NPE_BAD_TEST_RANGE");
+ break;
+ case NPE_BAD_TEST_ID:
+ return(" NPE_BAD_TEST_ID");
+ break;
+ case NPE_SYS_STATS_DROPPED:
+ return("NPE_SYS_STATS_DROPPED");
+ break;
+ case NPE_TEST_STATS_DROPPED:
+ return("NPE_TEST_STATS_DROPPED");
+ break;
+ case NPE_TEST_NOT_FOUND:
+ return("NPE_TEST_NOT_FOUND");
+ break;
+ case NPE_TEST_FOUND_IN_ERROR_STATE:
+ return("NPE_TEST_FOUND_IN_ERROR_STATE");
+ break;
+ case NPE_TEST_INITIALIZED_FAILED:
+ return("NPE_TEST_INITIALIZED_FAILED");
+ break;
+ case NPE_TEST_INIT_FAILED:
+ return("NPE_TEST_INIT_FAILED");
+ break;
+ case NPE_INIT_TEST_XMLCOPYNODE_FAILED:
+ return("NPE_INIT_TEST_XMLCOPYNODE_FAILED");
+ break;
+ case NPE_INIT_TEST_XMLNEWDOC_FAILED:
+ return(" NPE_INIT_TEST_XMLNEWDOC_FAILED");
+ break;
+ case NPE_EMPTY_MSG:
+ return("NPE_EMPTY_MSG");
+ break;
+ case NPE_UNEXPECTED_MSG:
+ return("NPE_UNEXPECTED_MSG");
+ break;
+ case NPE_ALREADY_CONNECTED:
+ return("NPE_ALREADY_CONNECTED");
+ break;
+ case NPE_BAD_VERSION:
+ return("NPE_BAD_VERSION");
+ break;
+ case NPE_XMLCOPYNODE_FAILED:
+ return("NPE_XMLCOPYNODE_FAILED");
+ break;
+ case NPE_PTHREAD_MUTEX_INIT_FAILED:
+ return("NPE_PTHREAD_MUTEX_INIT_FAILED");
+ break;
+ case NPE_PTHREAD_RWLOCK_INIT_FAILED:
+ return("NPE_PTHREAD_RWLOCK_INIT_FAILED");
+ break;
+ case NPE_PTHREAD_COND_WAIT_FAILED:
+ return("NPE_PTHREAD_COND_WAIT_FAILED");
+ break;
+ case NPE_PTHREAD_DETACH_FAILED:
+ return("NPE_PTHREAD_DETACH_FAILED");
+ break;
+ case NPE_PTHREAD_CREATE_FAILED:
+ return("NPE_PTHREAD_CREATE_FAILED");
+ break;
+ case NPE_DEPENDENCY_NOT_PRESENT:
+ return("NPE_DEPENDENCY_NOT_PRESENT");
+ break;
+ case NPE_DEPENDENCY_ERROR:
+ return("NPE_DEPENDENCY_ERROR");
+ break;
+ case NPE_UNKNOWN_FUNCTION_TYPE:
+ return("NPE_UNKNOWN_FUNCTION_TYPE");
+ break;
+ case NPE_FUNC_NAME_TOO_LONG:
+ return("NPE_FUNC_NAME_TOO_LONG");
+ break;
+ case NPE_FUNC_NOT_FOUND:
+ return("NPE_FUNC_NOT_FOUND");
+ break;
+ case NPE_LIBRARY_NOT_LOADED:
+ return("NPE_LIBRARY_NOT_LOADED");
+ break;
+ case NPE_ADD_TO_EVENT_LIST_FAILED:
+ return("NPE_ADD_TO_EVENT_LIST_FAILED");
+ break;
+ case NPE_CONNECT_FAILED:
+ return("NPE_CONNECT_FAILED");
+ break;
+ case NPE_MALLOC_FAILED6:
+ return("NPE_MALLOC_FAILED6");
+ break;
+ case NPE_MALLOC_FAILED5:
+ return("NPE_MALLOC_FAILED5");
+ break;
+ case NPE_MALLOC_FAILED4:
+ return("NPE_MALLOC_FAILED4");
+ break;
+ case NPE_MALLOC_FAILED3:
+ return("NPE_MALLOC_FAILED3");
+ break;
+ case NPE_MALLOC_FAILED2:
+ return("NPE_MALLOC_FAILED2");
+ break;
+ case NPE_MALLOC_FAILED1:
+ return("NPE_MALLOC_FAILED1");
+ break;
+ case NPE_REMOTE_CLOSE:
+ return("NPE_REMOTE_CLOSE");
+ break;
+ case NPE_SEND_VERSION_XMLNEWNODE_FAILED:
+ return("NPE_SEND_VERSION_XMLNEWNODE_FAILED");
+ break;
+ case NPE_SEND_VERSION_XMLSETPROP_FAILED:
+ return("NPE_SEND_VERSION_XMLSETPROP_FAILED");
+ break;
+ case NPE_SEND_CTL_MSG_XMLDOCDUMPMEMORY_FAILED:
+ return("NPE_SEND_CTL_MSG_XMLDOCDUMPMEMORY_FAILED");
+ break;
+ case NPE_SEND_CTL_MSG_XMLCOPYNODE_FAILED:
+ return("NPE_SEND_CTL_MSG_XMLCOPYNODE_FAILED");
+ break;
+ case NPE_SEND_CTL_MSG_XMLNEWNODE_FAILED:
+ return("NPE_SEND_CTL_MSG_XMLNEWNODE_FAILED");
+ break;
+ case NPE_SEND_CTL_MSG_XMLNEWDTD_FAILED:
+ return("NPE_SEND_CTL_MSG_XMLNEWDTD_FAILED");
+ break;
+ case NPE_SEND_CTL_MSG_XMLNEWDOC_FAILED:
+ return("NPE_SEND_CTL_MSG_XMLNEWDOC_FAILED");
+ break;
+ case NPE_SEND_CTL_MSG_FAILURE:
+ return("NPE_SEND_CTL_MSG_FAILURE");
+ break;
+ case NPE_SHASH_ADD_FAILED:
+ return("NPE_SHASH_ADD_FAILED");
+ break;
+ case NPE_XMLPARSEMEMORY_ERROR:
+ return("NPE_XMLPARSEMEMORY_ERROR");
+ break;
+ case NPE_NEG_MSG_BYTES:
+ return("NPE_NEG_MSG_BYTES");
+ break;
+ case NPE_TIMEOUT:
+ return("NPE_TIMEOUT");
+ break;
+ case NPE_SET_THREAD_LOCALITY_FAILED:
+ return("NPE_SET_THREAD_LOCALITY_FAILED");
+ break;
+ default:
+ return("Unmapped Error");
+ }
+}
+
int
add_test_to_hash(test_t *new_test)
{
Modified: trunk/src/netlib.h
===================================================================
--- trunk/src/netlib.h 2006-01-26 01:02:05 UTC (rev 50)
+++ trunk/src/netlib.h 2006-01-26 06:00:39 UTC (rev 51)
@@ -70,6 +70,7 @@
extern void report_servers_test_status(server_t *server);
extern GenReport get_report_function(xmlNodePtr cmd);
extern const char * netperf_error_name(int rc);
+extern char * npe_to_str(int npe_error);
extern int set_test_locality(test_t *test,
xmlChar *loc_type,
xmlChar *loc_value);
Modified: trunk/src/netperf.c
===================================================================
--- trunk/src/netperf.c 2006-01-26 01:02:05 UTC (rev 50)
+++ trunk/src/netperf.c 2006-01-26 06:00:39 UTC (rev 51)
@@ -1139,6 +1139,12 @@
while (test->state != TEST_IDLE) {
if (test->state == TEST_ERROR) {
rc = NPE_TEST_FOUND_IN_ERROR_STATE;
+ fprintf(where,
+ "%s found test %s %s in the error state\n",
+ __func__,
+ test->id,
+ test->test_name);
+ fflush(where);
break;
}
/* test is not yet initialized wait for it */
@@ -1168,7 +1174,10 @@
}
}
if (debug) {
- fprintf(where,"exiting wait_for_tests_to_initialize rc = %d\n",rc);
+ fprintf(where,
+ "exiting wait_for_tests_to_initialize rc = %d %s\n",
+ rc,
+ npe_to_str(rc));
fflush(where);
}
@@ -1360,7 +1369,8 @@
if (NULL == report_flags) {
fprintf(where,
- "Error: report_flags NULL in report_stats_command\n");
+ "Error: report_flags NULL in %s\n",
+ __func__);
fflush(where);
return(NPE_EMPTY_MSG);
}
Modified: trunk/src/netsysstats_common.c
===================================================================
--- trunk/src/netsysstats_common.c 2006-01-26 01:02:05 UTC (rev 50)
+++ trunk/src/netsysstats_common.c 2006-01-26 06:00:39 UTC (rev 51)
@@ -32,7 +32,9 @@
*/
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@ -59,7 +61,9 @@
#endif
#endif
+#ifdef HAVE_ERRNO_H
#include <errno.h>
+#endif
#include "netperf.h"
Modified: trunk/src/netsysstats_none.c
===================================================================
--- trunk/src/netsysstats_none.c 2006-01-26 01:02:05 UTC (rev 50)
+++ trunk/src/netsysstats_none.c 2006-01-26 06:00:39 UTC (rev 51)
@@ -43,8 +43,10 @@
sys_cpu_util_init(test_t *test)
{
+ netsysstat_data_t *tsd = GET_TEST_DATA(test);
+
NETPERF_DEBUG_ENTRY(test->debug,test->where);
-
+ tsd->num_cpus = 1;
NETPERF_DEBUG_EXIT(test->debug, test->where);
return NPE_SUCCESS;
}
More information about the netperf-dev
mailing list