Update of /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/src/event_log_process In directory sc8-pr-cvs1:/tmp/cvs-serv2652/src/event_log_process Modified Files: el_001.c el_002.c el_003.c el_004.c el_005.c el_006.c el_007.c el_008.c el_009.c Log Message: Applied patches from Kevin Gao. Index: el_001.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/src/event_log_process/el_001.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- el_001.c 2 Jul 2003 18:43:41 -0000 1.1 +++ el_001.c 14 Aug 2003 15:19:23 -0000 1.2 @@ -25,7 +25,7 @@ val = saHpiEventLogInfoGet(session_id, SAHPI_DOMAIN_CONTROLLER_ID, &info); if (val != SA_OK) { - printf(" Does not conform the expected behaviors!\n"); + printf(" Does not conform the expected behaviors!(Domain)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; } @@ -44,7 +44,7 @@ if (rpt_entry.ResourceCapabilities & SAHPI_CAPABILITY_SEL) { val = saHpiEventLogInfoGet(session_id, resource_id, &info); if (val != SA_OK) { - printf(" Does not conform the expected behaviors!\n"); + printf(" Does not conform the expected behaviors!(Resource)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; } Index: el_002.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/src/event_log_process/el_002.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- el_002.c 2 Jul 2003 18:43:41 -0000 1.1 +++ el_002.c 14 Aug 2003 15:19:23 -0000 1.2 @@ -35,7 +35,7 @@ &prev_entry_id, &next_entry_id, &eventlog_entry, &rdr, &rpt_entry1); if (val != SA_OK) { printf(" Does not conform the expected behaviors!\n"); - printf(" Retrieve the next event log entry failed!\n"); + printf(" Retrieve the next event log entry failed!(Domain)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; goto out; @@ -68,7 +68,7 @@ &rdr, &rpt_entry1); if (val != SA_OK) { printf(" Does not conform the expected behaviors!\n"); - printf(" Retrieve the next event log entry failed!\n"); + printf(" Retrieve the next event log entry failed!(Domain)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; goto out; Index: el_003.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/src/event_log_process/el_003.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- el_003.c 6 Aug 2003 18:30:21 -0000 1.3 +++ el_003.c 14 Aug 2003 15:19:23 -0000 1.4 @@ -36,7 +36,7 @@ &rdr, &rpt_entry1); if (val != SA_OK) { printf(" Does not conform the expected behaviors!\n"); - printf(" Retrieve the prev event log entry failed!\n"); + printf(" Retrieve the prev event log entry failed!(Domain)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; goto out; @@ -69,7 +69,7 @@ &rdr, &rpt_entry1); if (val != SA_OK) { printf(" Does not conform the expected behaviors!\n"); - printf(" Retrieve the prev event log entry failed!\n"); + printf(" Retrieve the prev event log entry failed!(Resource)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; goto out; Index: el_004.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/src/event_log_process/el_004.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- el_004.c 15 Jul 2003 21:03:30 -0000 1.2 +++ el_004.c 14 Aug 2003 15:19:23 -0000 1.3 @@ -18,71 +18,86 @@ #include <hpitest.h> #define TEST_STR "Event log test str" -#define TEST_ENTRY_ID 2 int process_domain_eventlog(SaHpiSessionIdT session_id) { -#if 0 SaHpiSelEntryIdT prev_entry_id; SaHpiSelEntryIdT next_entry_id; SaHpiSelEntryT entry_get, entry_add; SaHpiRdrT rdr; - SaHpiRptEntryT rpt_entry1; -#endif - SaHpiSelEntryT entry_add; - SaErrorT val; + SaHpiRptEntryT rpt_entry; + SaHpiBoolT enable_old; + SaErrorT val; int ret = HPI_TEST_PASS; -#if 0 - val = saHpiEventLogEntryGet(session_id, SAHPI_DOMAIN_CONTROLLER_ID, - SAHPI_NEWEST_ENTRY, &prev_entry_id, &next_entry_id, - &entry_add, &rdr, &rpt_entry1); + /* In order to make sure that the entry we add is the + * newest entry in eventlog, we should disable the + * event log state */ + val = saHpiEventLogStateGet(session_id, SAHPI_DOMAIN_CONTROLLER_ID, + &enable_old); if (val != SA_OK) { - printf(" Function \"saHpiEventLogEntryGet\" works abnormally\n"); - printf(" Cannot retrieve the newest event log entry!\n"); + printf(" Funcition \"saHpiEventLogStateGet\" works abnormally!\n"); + printf(" Cannot get the event log state info!(Domain)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; goto out; } -#endif - /* We need to wait until the function saHpiEventLogEntryAdd has clear - * sytax.*/ - memset(&entry_add, 0, sizeof(entry_add)); - entry_add.EntryId = TEST_ENTRY_ID; - entry_add.Timestamp = SAHPI_TIME_UNSPECIFIED; + + val = saHpiEventLogStateSet(session_id, SAHPI_DOMAIN_CONTROLLER_ID, + SAHPI_FALSE); + if (val != SA_OK) { + printf(" Funcition \"saHpiEventLogStateSet\" works abnormally!\n"); + printf(" Set event log state to TRUE failed!(Domain)\n"); + printf(" Return value: %s\n", get_error_string(val)); + ret = HPI_TEST_FAIL; + goto out1; + } + entry_add.Event.Source = SAHPI_UNSPECIFIED_RESOURCE_ID; entry_add.Event.EventType = SAHPI_ET_USER; entry_add.Event.Timestamp = SAHPI_TIME_UNSPECIFIED; entry_add.Event.Severity = SAHPI_OK; memcpy(entry_add.Event.EventDataUnion.UserEvent.UserEventData, - TEST_STR, sizeof(TEST_STR)); - val = saHpiEventLogEntryAdd(session_id, SAHPI_DOMAIN_CONTROLLER_ID, - &entry_add); + TEST_STR, sizeof(TEST_STR)); + + val = saHpiEventLogEntryAdd(session_id, + SAHPI_DOMAIN_CONTROLLER_ID, &entry_add); if (val != SA_OK) { printf(" Does not conform the expected behaviors!\n"); - printf(" Add entry the the system event log failed!\n"); + printf(" Add entry the the system event log failed!(Domain)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; - goto out; + goto out1; } -#if 0 - val = saHpiEventLogEntryGet(session_id, SAHPI_DOMAIN_CONTROLLER_ID, - entry_add.EntryId, &prev_entry_id, &next_entry_id, - &entry_get, &rdr, &rpt_entry1); + + val = saHpiEventLogEntryGet(session_id, + SAHPI_DOMAIN_CONTROLLER_ID, + SAHPI_NEWEST_ENTRY, &prev_entry_id, + &next_entry_id, &entry_get, &rdr, &rpt_entry); if (val != SA_OK) { printf(" Function \"saHpiEventLogEntryGet\" works abnormally\n"); - printf(" Cannot retrieve the specified event log entry!\n"); + printf(" Cannot retrieve the specified event log entry!(Domain)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; - goto out; + goto out1; } - if (memcmp(&entry_add, &entry_get, sizeof(entry_add))) { + if (memcmp(&entry_add.Event, &entry_get.Event, + sizeof(entry_add.Event))) { printf(" Does not conform the expected behaviors!\n"); - printf(" Add event log entry function is invalid!\n"); + printf(" Add event log entry function is invalid!(Domain)\n"); ret = HPI_TEST_FAIL; } -#endif +out1: + val = saHpiEventLogStateSet(session_id, SAHPI_DOMAIN_CONTROLLER_ID, + enable_old); + if (val != SA_OK) { + printf(" Does not conform the expected behaviors!\n"); + printf(" Set old event log state value failed!(Domain)\n"); + printf(" Return value: %s\n", get_error_string(val)); + ret = HPI_TEST_FAIL; + } + out: return ret; } @@ -95,24 +110,35 @@ SaHpiSelEntryT entry_get, entry_add; SaHpiRdrT rdr; SaHpiRptEntryT rpt_entry1; + SaHpiBoolT enable_old; SaErrorT val; int ret = HPI_TEST_PASS; -/* I suppose that the function saHpiEventLogEntryAdd() will set rpt_entry_add - * to then event log entry specified by its EntryId. If there is a entry used - * the same ID, the function will override it with new entry we set. */ if (rpt_entry.ResourceCapabilities & SAHPI_CAPABILITY_SEL) { - val = saHpiEventLogEntryGet(session_id, resource_id, - SAHPI_NEWEST_ENTRY, &prev_entry_id, - &next_entry_id, &entry_add, &rdr, &rpt_entry1); + /* In order to make sure that the entry we add is the + * newest entry in eventlog, we should disable the + * event log state */ + val = saHpiEventLogStateGet(session_id, resource_id, + &enable_old); if (val != SA_OK) { - printf(" Function \"saHpiEventLogEntryGet\" works abnormally\n"); - printf(" Cannot retrieve the newest event log entry!\n"); + printf(" Funcition \"saHpiEventLogStateGet\" works abnormally!\n"); + printf(" Cannot get the event log state info!(Resource)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; goto out; } + val = saHpiEventLogStateSet(session_id, resource_id, + SAHPI_FALSE); + if (val != SA_OK) { + printf(" Does not conform the expected behaviors!\n"); + printf(" Set event log state to TRUE failed!(Resource)\n"); + printf(" Return value: %s\n", get_error_string(val)); + ret = HPI_TEST_FAIL; + goto out1; + } + + entry_add.Timestamp = SAHPI_TIME_UNSPECIFIED; entry_add.Event.Source = SAHPI_UNSPECIFIED_RESOURCE_ID; entry_add.Event.EventType = SAHPI_ET_USER; @@ -120,32 +146,44 @@ entry_add.Event.Severity = SAHPI_OK; memcpy(entry_add.Event.EventDataUnion.UserEvent.UserEventData, TEST_STR, sizeof(TEST_STR)); + val = saHpiEventLogEntryAdd(session_id, resource_id, &entry_add); if (val != SA_OK) { printf(" Does not conform the expected behaviors!\n"); - printf(" Add entry the the system event log failed!\n"); + printf(" Add entry the the system event log failed!(Resource)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; - goto out; + goto out1; } val = saHpiEventLogEntryGet(session_id, resource_id, - entry_add.EntryId, &prev_entry_id, + SAHPI_NEWEST_ENTRY, &prev_entry_id, &next_entry_id, &entry_get, &rdr, &rpt_entry1); if (val != SA_OK) { printf(" Function \"saHpiEventLogEntryGet\" works abnormally\n"); - printf(" Cannot retrieve the specified event log entry!\n"); + printf(" Cannot retrieve the specified event log entry!(Resource)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; - goto out; + goto out1; } - - if (memcmp(&entry_add, &entry_get, sizeof(entry_add))) { + + if (memcmp(&entry_add.Event, &entry_get.Event, + sizeof(entry_add.Event))) { printf(" Does not conform the expected behaviors!\n"); - printf(" Add event log entry function is invalid!\n"); + printf(" Add event log entry function is invalid!(Resource)\n"); ret = HPI_TEST_FAIL; } + +out1: + val = saHpiEventLogStateSet(session_id, resource_id, + enable_old); + if (val != SA_OK) { + printf(" Does not conform the expected behaviors!\n"); + printf(" Set old event log state value failed!(Resource)\n"); + printf(" Return value: %s\n", get_error_string(val)); + ret = HPI_TEST_FAIL; + } } out: Index: el_005.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/src/event_log_process/el_005.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- el_005.c 2 Jul 2003 18:43:41 -0000 1.1 +++ el_005.c 14 Aug 2003 15:19:23 -0000 1.2 @@ -27,7 +27,7 @@ SAHPI_OLDEST_ENTRY); if (val != SA_OK && val != SA_ERR_HPI_INVALID_CMD) { printf(" Does not conform the expected behaviors!\n"); - printf(" Delete entry the the system event log failed!\n"); + printf(" Delete entry the the system event log failed!(Domain)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; } @@ -48,7 +48,7 @@ SAHPI_OLDEST_ENTRY); if (val != SA_OK && val != SA_ERR_HPI_INVALID_CMD) { printf(" Does not conform the expected behaviors!\n"); - printf(" Delete entry the the system event log failed!\n"); + printf(" Delete entry the the system event log failed!(Resource)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; } Index: el_006.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/src/event_log_process/el_006.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- el_006.c 2 Jul 2003 18:43:41 -0000 1.1 +++ el_006.c 14 Aug 2003 15:19:23 -0000 1.2 @@ -27,7 +27,7 @@ SAHPI_NEWEST_ENTRY); if (val != SA_OK && val != SA_ERR_HPI_INVALID_CMD) { printf(" Does not conform the expected behaviors!\n"); - printf(" Delete entry the the system event log failed!\n"); + printf(" Delete entry the the system event log failed!(Domain)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; } @@ -48,7 +48,7 @@ SAHPI_NEWEST_ENTRY); if (val != SA_OK && val != SA_ERR_HPI_INVALID_CMD) { printf(" Does not conform the expected behaviors!\n"); - printf(" Delete entry the the system event log failed!\n"); + printf(" Delete entry the the system event log failed!(Resource)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; } Index: el_007.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/src/event_log_process/el_007.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- el_007.c 2 Jul 2003 18:43:41 -0000 1.1 +++ el_007.c 14 Aug 2003 15:19:23 -0000 1.2 @@ -24,7 +24,7 @@ val = saHpiEventLogClear(session_id, SAHPI_DOMAIN_CONTROLLER_ID); if (val != SA_OK && val != SA_ERR_HPI_INVALID_CMD) { printf(" Does not conform the expected behaviors!\n"); - printf(" Clear the specified event log failed!\n"); + printf(" Clear the specified event log failed!(Domain)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; } @@ -42,7 +42,7 @@ val = saHpiEventLogClear(session_id, resource_id); if (val != SA_OK && val != SA_ERR_HPI_INVALID_CMD) { printf(" Does not conform the expected behaviors!\n"); - printf(" Clear the specified event log failed!\n"); + printf(" Clear the specified event log failed!(Resource)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; } Index: el_008.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/src/event_log_process/el_008.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- el_008.c 2 Jul 2003 18:43:41 -0000 1.1 +++ el_008.c 14 Aug 2003 15:19:23 -0000 1.2 @@ -26,7 +26,7 @@ &enable_old); if (val != SA_OK) { printf(" Funcition \"saHpiEventLogStateGet\" works abnormally!\n"); - printf(" Cannot get the event log state info!\n"); + printf(" Cannot get the event log state info!(Domain)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; goto out; @@ -36,7 +36,7 @@ SAHPI_TRUE); if (val != SA_OK) { printf(" Does not conform the expected behaviors!\n"); - printf(" Set event log state to TRUE failed!\n"); + printf(" Set event log state to TRUE failed!(Domain)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; goto out; @@ -46,7 +46,7 @@ &enable_new); if (val != SA_OK) { printf(" Funcition \"saHpiEventLogStateGet\" works abnormally!\n"); - printf(" Cannot get the event log state info!\n"); + printf(" Cannot get the event log state info!(Domain)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; goto out1; @@ -54,7 +54,7 @@ if (enable_new != SAHPI_TRUE) { printf(" Does not conform the expected behaviors!\n"); - printf(" Set event log state function is invalid!\n"); + printf(" Set event log state function is invalid!(Domain)\n"); ret = HPI_TEST_FAIL; } @@ -63,7 +63,7 @@ enable_old); if (val != SA_OK) { printf(" Does not conform the expected behaviors!\n"); - printf(" Set old event log state value failed!\n"); + printf(" Set old event log state value failed!(Domain)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; } @@ -84,7 +84,7 @@ &enable_old); if (val != SA_OK) { printf(" Funcition \"saHpiEventLogStateGet\" works abnormally!\n"); - printf(" Cannot get the event log state info!\n"); + printf(" Cannot get the event log state info!(Resource)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; goto out; @@ -94,7 +94,7 @@ SAHPI_TRUE); if (val != SA_OK) { printf(" Does not conform the expected behaviors!\n"); - printf(" Set event log state to TRUE failed!\n"); + printf(" Set event log state to TRUE failed!(Resource)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; goto out; @@ -104,7 +104,7 @@ &enable_new); if (val != SA_OK) { printf(" Funcition \"saHpiEventLogStateGet\" works abnormally!\n"); - printf(" Cannot get the event log state info!\n"); + printf(" Cannot get the event log state info!(Resource)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; goto out1; @@ -112,7 +112,7 @@ if (enable_new != SAHPI_TRUE) { printf(" Does not conform the expected behaviors!\n"); - printf(" Set event log state function is invalid!\n"); + printf(" Set event log state function is invalid!(Resource)\n"); ret = HPI_TEST_FAIL; } @@ -121,7 +121,7 @@ enable_old); if (val != SA_OK) { printf(" Does not conform the expected behaviors!\n"); - printf(" Set old event log state value failed!\n"); + printf(" Set old event log state value failed!(Resource)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; } Index: el_009.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/src/event_log_process/el_009.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- el_009.c 2 Jul 2003 18:43:41 -0000 1.1 +++ el_009.c 14 Aug 2003 15:19:23 -0000 1.2 @@ -26,7 +26,7 @@ &enable_old); if (val != SA_OK) { printf(" Funcition \"saHpiEventLogStateGet\" works abnormally!\n"); - printf(" Cannot get the event log state info!\n"); + printf(" Cannot get the event log state info!(Domain)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; goto out; @@ -36,7 +36,7 @@ SAHPI_FALSE); if (val != SA_OK) { printf(" Does not conform the expected behaviors!\n"); - printf(" Set event log state to TRUE failed!\n"); + printf(" Set event log state to TRUE failed!(Domain)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; goto out; @@ -46,7 +46,7 @@ &enable_new); if (val != SA_OK) { printf(" Funcition \"saHpiEventLogStateGet\" works abnormally!\n"); - printf(" Cannot get the event log state info!\n"); + printf(" Cannot get the event log state info!(Domain)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; goto out1; @@ -54,7 +54,7 @@ if (enable_new != SAHPI_FALSE) { printf(" Does not conform the expected behaviors!\n"); - printf(" Set event log state function is invalid!\n"); + printf(" Set event log state function is invalid!(Domain)\n"); ret = HPI_TEST_FAIL; } @@ -63,7 +63,7 @@ enable_old); if (val != SA_OK) { printf(" Does not conform the expected behaviors!\n"); - printf(" Set old event log state value failed!\n"); + printf(" Set old event log state value failed!(Domain)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; } @@ -84,7 +84,7 @@ &enable_old); if (val != SA_OK) { printf(" Funcition \"saHpiEventLogStateGet\" works abnormally!\n"); - printf(" Cannot get the event log state info!\n"); + printf(" Cannot get the event log state info!(Resource)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; goto out; @@ -94,7 +94,7 @@ SAHPI_FALSE); if (val != SA_OK) { printf(" Does not conform the expected behaviors!\n"); - printf(" Set event log state to TRUE failed!\n"); + printf(" Set event log state to TRUE failed!(Resource)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; goto out; @@ -104,7 +104,7 @@ &enable_new); if (val != SA_OK) { printf(" Funcition \"saHpiEventLogStateGet\" works abnormally!\n"); - printf(" Cannot get the event log state info!\n"); + printf(" Cannot get the event log state info!(Resource)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; goto out1; @@ -112,7 +112,7 @@ if (enable_new != SAHPI_FALSE) { printf(" Does not conform the expected behaviors!\n"); - printf(" Set event log state function is invalid!\n"); + printf(" Set event log state function is invalid!(Resource)\n"); ret = HPI_TEST_FAIL; } @@ -121,7 +121,7 @@ enable_old); if (val != SA_OK) { printf(" Does not conform the expected behaviors!\n"); - printf(" Set old event log state value failed!\n"); + printf(" Set old event log state value failed!(Resource)\n"); printf(" Return value: %s\n", get_error_string(val)); ret = HPI_TEST_FAIL; } |