Skip to content

Commit 4792295

Browse files
Treece-BurgessTreece-Burgess
committed
papi framework: Do not allow events to be added without the component or pmu prefix names unless applicable
1 parent 8a9837a commit 4792295

12 files changed

+166
-129
lines changed

‎src/components/appio/tests/appio_test_fread_fwrite.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
int main(int argc, char** argv) {
2727
int EventSet = PAPI_NULL;
28-
const char* names[NUM_EVENTS] = {"READ_CALLS", "READ_BYTES","READ_USEC","READ_ERR", "READ_EOF", "WRITE_CALLS","WRITE_BYTES","WRITE_USEC"};
28+
const char* names[NUM_EVENTS] = {"appio:::READ_CALLS", "appio:::READ_BYTES", "appio:::READ_USEC", "appio:::READ_ERR", "appio:::READ_EOF", "appio:::WRITE_CALLS", "appio:::WRITE_BYTES", "appio:::WRITE_USEC"};
2929
long long values[NUM_EVENTS];
3030

3131
char *infile = "/etc/group";

‎src/components/appio/tests/appio_test_pthreads.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "papi_test.h"
2323

2424
#define NUM_EVENTS 6
25-
const char* names[NUM_EVENTS] = {"READ_CALLS", "READ_BYTES","READ_USEC","WRITE_CALLS","WRITE_BYTES","WRITE_USEC"};
25+
const char* names[NUM_EVENTS] = {"appio:::READ_CALLS", "appio:::READ_BYTES", "appio:::READ_USEC", "appio:::WRITE_CALLS", "appio:::WRITE_BYTES", "appio:::WRITE_USEC"};
2626

2727
#define NUM_INFILES 4
2828
static const char* files[NUM_INFILES] = {"/etc/passwd", "/etc/group", "/etc/protocols", "/etc/nsswitch.conf"};

‎src/components/appio/tests/appio_test_read_write.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
int main(int argc, char** argv) {
2525
int EventSet = PAPI_NULL;
26-
const char* names[NUM_EVENTS] = {"OPEN_CALLS", "OPEN_FDS", "READ_CALLS", "READ_BYTES", "READ_USEC", "READ_ERR", "READ_INTERRUPTED", "READ_WOULD_BLOCK", "WRITE_CALLS","WRITE_BYTES","WRITE_USEC","WRITE_WOULD_BLOCK"};
26+
const char* names[NUM_EVENTS] = {"appio:::OPEN_CALLS", "appio:::OPEN_FDS", "appio:::READ_CALLS", "appio:::READ_BYTES", "appio:::READ_USEC", "appio:::READ_ERR", "appio:::READ_INTERRUPTED", "appio:::READ_WOULD_BLOCK", "appio:::WRITE_CALLS", "appio:::WRITE_BYTES", "appio:::WRITE_USEC", "appio:::WRITE_WOULD_BLOCK"};
2727
long long values[NUM_EVENTS];
2828

2929
char *infile = "/etc/group";

‎src/components/appio/tests/appio_test_recv.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
main(int argc, char *argv[]) {
1717
int EventSet = PAPI_NULL;
18-
const char* names[NUM_EVENTS] = {"RECV_CALLS", "RECV_BYTES", "RECV_USEC", "RECV_ERR", "RECV_INTERRUPTED", "RECV_WOULD_BLOCK"};
18+
const char* names[NUM_EVENTS] = {"appio:::RECV_CALLS", "appio:::RECV_BYTES", "appio:::RECV_USEC", "appio:::RECV_ERR", "appio:::RECV_INTERRUPTED", "appio:::RECV_WOULD_BLOCK"};
1919
long long values[NUM_EVENTS];
2020

2121
/* Set TESTS_QUIET variable */

‎src/components/appio/tests/appio_test_seek.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
int main(int argc, char** argv) {
2424
int EventSet = PAPI_NULL;
25-
const char* names[NUM_EVENTS] = {"READ_CALLS", "READ_BYTES", "READ_BLOCK_SIZE", "READ_USEC", "SEEK_CALLS", "SEEK_USEC", "SEEK_ABS_STRIDE_SIZE"};
25+
const char* names[NUM_EVENTS] = {"appio:::READ_CALLS", "appio:::READ_BYTES", "appio:::READ_BLOCK_SIZE", "appio:::READ_USEC", "appio:::SEEK_CALLS", "appio:::SEEK_USEC", "appio:::SEEK_ABS_STRIDE_SIZE"};
2626
long long values[NUM_EVENTS];
2727

2828
char *infile = "/etc/group";

‎src/components/appio/tests/appio_test_select.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
int main(int argc, char** argv) {
2525
int EventSet = PAPI_NULL;
26-
const char* names[NUM_EVENTS] = {"SELECT_USEC"};
26+
const char* names[NUM_EVENTS] = {"appio:::SELECT_USEC"};
2727
long long values[NUM_EVENTS];
2828

2929
/* Set TESTS_QUIET variable */

‎src/components/appio/tests/appio_test_socket.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
main(int argc, char *argv[]) {
1717
int EventSet = PAPI_NULL;
18-
const char* names[NUM_EVENTS] = {"READ_CALLS", "READ_BYTES", "READ_USEC", "READ_WOULD_BLOCK", "SOCK_READ_CALLS", "SOCK_READ_BYTES", "SOCK_READ_USEC", "SOCK_READ_WOULD_BLOCK", "WRITE_BYTES", "WRITE_CALLS", "WRITE_WOULD_BLOCK", "WRITE_USEC", "SOCK_WRITE_BYTES", "SOCK_WRITE_CALLS", "SOCK_WRITE_USEC"};
18+
const char* names[NUM_EVENTS] = {"appio:::READ_CALLS", "appio:::READ_BYTES", "appio:::READ_USEC", "appio:::READ_WOULD_BLOCK", "appio:::SOCK_READ_CALLS", "appio:::SOCK_READ_BYTES", "appio:::SOCK_READ_USEC", "appio:::SOCK_READ_WOULD_BLOCK", "appio:::WRITE_BYTES", "appio:::WRITE_CALLS", "appio:::WRITE_WOULD_BLOCK", "appio:::WRITE_USEC", "appio:::SOCK_WRITE_BYTES", "appio:::SOCK_WRITE_CALLS", "appio:::SOCK_WRITE_USEC"};
1919
long long values[NUM_EVENTS];
2020

2121
/* Set TESTS_QUIET variable */

‎src/components/appio/tests/appio_values_by_name.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@ int main (int argc, char **argv)
3131
int i, retval;
3232
int EventSet = PAPI_NULL;
3333
char *event_name[NUM_EVENTS] = {
34-
"READ_BYTES",
35-
"READ_CALLS",
36-
"READ_USEC",
37-
"READ_EOF",
38-
"READ_SHORT",
39-
"READ_ERR",
40-
"WRITE_BYTES",
41-
"WRITE_CALLS",
42-
"WRITE_USEC",
43-
"WRITE_ERR",
44-
"WRITE_SHORT"
34+
"appio:::READ_BYTES",
35+
"appio:::READ_CALLS",
36+
"appio:::READ_USEC",
37+
"appio:::READ_EOF",
38+
"appio:::READ_SHORT",
39+
"appio:::READ_ERR",
40+
"appio:::WRITE_BYTES",
41+
"appio:::WRITE_CALLS",
42+
"appio:::WRITE_USEC",
43+
"appio:::WRITE_ERR",
44+
"appio:::WRITE_SHORT"
4545
};
4646
int event_code[NUM_EVENTS] = { 0, 0, 0, 0, 0, 0, 0, 0, 0};
4747
long long event_value[NUM_EVENTS];

‎src/components/example/tests/example_basic.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ int main (int argc, char **argv)
139139
"PAPI_create_eventset() failed\n", retval );
140140
}
141141

142-
retval = PAPI_event_name_to_code("EXAMPLE_ZERO", &code);
142+
retval = PAPI_event_name_to_code("example:::EXAMPLE_ZERO", &code);
143143
if ( retval != PAPI_OK ) {
144144
test_fail( __FILE__, __LINE__,
145145
"EXAMPLE_ZERO not found\n",retval );
@@ -191,7 +191,7 @@ int main (int argc, char **argv)
191191
"PAPI_create_eventset() failed\n", retval );
192192
}
193193

194-
retval = PAPI_event_name_to_code("EXAMPLE_CONSTANT", &code);
194+
retval = PAPI_event_name_to_code("example:::EXAMPLE_CONSTANT", &code);
195195
if ( retval != PAPI_OK ) {
196196
test_fail( __FILE__, __LINE__,
197197
"EXAMPLE_CONSTANT not found\n",retval );
@@ -244,7 +244,7 @@ int main (int argc, char **argv)
244244
"PAPI_create_eventset() failed\n", retval );
245245
}
246246

247-
retval = PAPI_event_name_to_code("EXAMPLE_AUTOINC", &code);
247+
retval = PAPI_event_name_to_code("example:::EXAMPLE_AUTOINC", &code);
248248
if ( retval != PAPI_OK ) {
249249
test_fail( __FILE__, __LINE__,
250250
"EXAMPLE_AUTOINC not found\n",retval );
@@ -370,7 +370,7 @@ int main (int argc, char **argv)
370370
"PAPI_create_eventset() failed\n", retval );
371371
}
372372

373-
retval = PAPI_event_name_to_code("EXAMPLE_CONSTANT", &code);
373+
retval = PAPI_event_name_to_code("example:::EXAMPLE_CONSTANT", &code);
374374
if ( retval != PAPI_OK ) {
375375
test_fail( __FILE__, __LINE__,
376376
"EXAMPLE_CONSTANT not found\n",retval );
@@ -382,7 +382,7 @@ int main (int argc, char **argv)
382382
"PAPI_add_events failed\n", retval );
383383
}
384384

385-
retval = PAPI_event_name_to_code("EXAMPLE_GLOBAL_AUTOINC", &code);
385+
retval = PAPI_event_name_to_code("example:::EXAMPLE_GLOBAL_AUTOINC", &code);
386386
if ( retval != PAPI_OK ) {
387387
test_fail( __FILE__, __LINE__,
388388
"EXAMPLE_GLOBAL_AUTOINC not found\n",retval );
@@ -394,7 +394,7 @@ int main (int argc, char **argv)
394394
"PAPI_add_events failed\n", retval );
395395
}
396396

397-
retval = PAPI_event_name_to_code("EXAMPLE_ZERO", &code);
397+
retval = PAPI_event_name_to_code("example:::EXAMPLE_ZERO", &code);
398398
if ( retval != PAPI_OK ) {
399399
test_fail( __FILE__, __LINE__,
400400
"EXAMPLE_ZERO not found\n",retval );
@@ -457,7 +457,7 @@ int main (int argc, char **argv)
457457
"PAPI_create_eventset() failed\n", retval );
458458
}
459459

460-
retval = PAPI_event_name_to_code("EXAMPLE_CONSTANT", &code);
460+
retval = PAPI_event_name_to_code("example:::EXAMPLE_CONSTANT", &code);
461461
if ( retval != PAPI_OK ) {
462462
test_fail( __FILE__, __LINE__,
463463
"EXAMPLE_CONSTANT not found\n",retval );
@@ -469,7 +469,7 @@ int main (int argc, char **argv)
469469
"PAPI_add_events failed\n", retval );
470470
}
471471

472-
retval = PAPI_event_name_to_code("EXAMPLE_GLOBAL_AUTOINC", &code);
472+
retval = PAPI_event_name_to_code("example:::EXAMPLE_GLOBAL_AUTOINC", &code);
473473
if ( retval != PAPI_OK ) {
474474
test_fail( __FILE__, __LINE__,
475475
"EXAMPLE_GLOBAL_AUTOINC not found\n",retval );
@@ -481,7 +481,7 @@ int main (int argc, char **argv)
481481
"PAPI_add_events failed\n", retval );
482482
}
483483

484-
retval = PAPI_event_name_to_code("EXAMPLE_ZERO", &code);
484+
retval = PAPI_event_name_to_code("example:::EXAMPLE_ZERO", &code);
485485
if ( retval != PAPI_OK ) {
486486
test_fail( __FILE__, __LINE__,
487487
"EXAMPLE_ZERO not found\n",retval );

‎src/components/example/tests/example_multiple_components.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ int main (int argc, char **argv)
8989
"PAPI_create_eventset() failed\n", retval );
9090
}
9191

92-
retval = PAPI_event_name_to_code("EXAMPLE_CONSTANT", &code);
92+
retval = PAPI_event_name_to_code("example:::EXAMPLE_CONSTANT", &code);
9393
if ( retval != PAPI_OK ) {
9494
test_fail( __FILE__, __LINE__,
9595
"EXAMPLE_ZERO not found\n",retval );

0 commit comments

Comments
 (0)