Skip to content

Commit aa5c7d7

Browse files
wkliaowkliao
committed
make __darshan_disabled a local variable
1 parent e89c29e commit aa5c7d7

File tree

12 files changed

+238
-188
lines changed

12 files changed

+238
-188
lines changed

‎darshan-runtime/lib/darshan-core-init-finalize.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,14 @@
2020
#include "darshan.h"
2121
#include "darshan-dynamic.h"
2222

23-
static int __darshan_disabled;
24-
2523
#ifdef HAVE_MPI
2624
DARSHAN_FORWARD_DECL(PMPI_Finalize, int, ());
2725
DARSHAN_FORWARD_DECL(PMPI_Init, int, (int *argc, char ***argv));
2826
DARSHAN_FORWARD_DECL(PMPI_Init_thread, int, (int *argc, char ***argv, int required, int *provided));
2927

3028
int DARSHAN_DECL(MPI_Init)(int *argc, char ***argv)
3129
{
32-
int ret;
30+
int ret, __darshan_disabled;
3331

3432
MAP_OR_FAIL(PMPI_Init);
3533
(void)__darshan_disabled;
@@ -56,7 +54,7 @@ DARSHAN_WRAPPER_MAP(PMPI_Init, int, (int *argc, char ***argv), MPI_Init)
5654

5755
int DARSHAN_DECL(MPI_Init_thread)(int *argc, char ***argv, int required, int *provided)
5856
{
59-
int ret;
57+
int ret, __darshan_disabled;
6058

6159
MAP_OR_FAIL(PMPI_Init_thread);
6260
(void)__darshan_disabled;
@@ -83,7 +81,7 @@ DARSHAN_WRAPPER_MAP(PMPI_Init_thread, int, (int *argc, char ***argv, int require
8381

8482
int DARSHAN_DECL(MPI_Finalize)(void)
8583
{
86-
int ret;
84+
int ret, __darshan_disabled;
8785

8886
MAP_OR_FAIL(PMPI_Finalize);
8987
(void)__darshan_disabled;
@@ -121,6 +119,8 @@ __attribute__((destructor)) void serial_finalize(void)
121119
void (*__real__exit)(int status) __attribute__ ((noreturn)) = NULL;
122120
void _exit(int status)
123121
{
122+
int __darshan_disabled;
123+
124124
MAP_OR_FAIL(_exit);
125125
(void)__darshan_disabled;
126126

‎darshan-runtime/lib/darshan-core.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@
5252
#include <lustre/lustre_user.h>
5353
#endif
5454

55-
static int __darshan_disabled;
56-
5755
extern char* __progname;
5856
extern char* __progname_full;
5957
struct darshan_core_runtime *__darshan_core = NULL;
@@ -2754,6 +2752,7 @@ extern int __real_vfprintf(FILE *stream, const char *format, va_list);
27542752
void darshan_core_fprintf(
27552753
FILE *stream, const char *format, ...)
27562754
{
2755+
int __darshan_disabled;
27572756
va_list ap;
27582757

27592758
MAP_OR_FAIL(vfprintf);

‎darshan-runtime/lib/darshan-daos.c‎

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
#include <daos_obj.h>
3535
#include <daos_array.h>
3636

37-
static int __darshan_disabled;
38-
3937
/* container access routines intercepted for maintaining pool/container UUIDs */
4038
DARSHAN_FORWARD_DECL(daos_cont_open, int, (daos_handle_t poh, const char *cont, unsigned int flags, daos_handle_t *coh, daos_cont_info_t *info, daos_event_t *ev));
4139
DARSHAN_FORWARD_DECL(daos_cont_global2local, int, (daos_handle_t poh, d_iov_t glob, daos_handle_t *coh));
@@ -495,7 +493,7 @@ int darshan_daos_contopen_comp_cb(void *arg, daos_event_t *ev, int ret)
495493
int DARSHAN_DECL(daos_cont_open)(daos_handle_t poh, const char *cont, unsigned int flags,
496494
daos_handle_t *coh, daos_cont_info_t *info, daos_event_t *ev)
497495
{
498-
int ret;
496+
int ret, __darshan_disabled;
499497

500498
MAP_OR_FAIL(daos_cont_open);
501499

@@ -525,7 +523,7 @@ int DARSHAN_DECL(daos_cont_open)(daos_handle_t poh, const char *cont, unsigned i
525523

526524
int DARSHAN_DECL(daos_cont_global2local)(daos_handle_t poh, d_iov_t glob, daos_handle_t *coh)
527525
{
528-
int ret;
526+
int ret, __darshan_disabled;
529527

530528
MAP_OR_FAIL(daos_cont_global2local);
531529

@@ -540,7 +538,7 @@ int DARSHAN_DECL(daos_cont_global2local)(daos_handle_t poh, d_iov_t glob, daos_h
540538

541539
int DARSHAN_DECL(daos_cont_close)(daos_handle_t coh, daos_event_t *ev)
542540
{
543-
int ret;
541+
int ret, __darshan_disabled;
544542
struct daos_poolcont_info *poolcont_info;
545543

546544
MAP_OR_FAIL(daos_cont_close);
@@ -566,7 +564,7 @@ int DARSHAN_DECL(daos_cont_close)(daos_handle_t coh, daos_event_t *ev)
566564

567565
int DARSHAN_DECL(daos_obj_open)(daos_handle_t coh, daos_obj_id_t oid, unsigned int mode, daos_handle_t *oh, daos_event_t *ev)
568566
{
569-
int ret;
567+
int ret, __darshan_disabled;
570568
double tm1, tm2;
571569

572570
MAP_OR_FAIL(daos_obj_open);
@@ -620,7 +618,7 @@ int DARSHAN_DECL(daos_obj_fetch)(daos_handle_t oh, daos_handle_t th, uint64_t fl
620618
daos_key_t *dkey, unsigned int nr, daos_iod_t *iods, d_sg_list_t *sgls,
621619
daos_iom_t *ioms, daos_event_t *ev)
622620
{
623-
int ret;
621+
int ret, __darshan_disabled;
624622
double tm1, tm2;
625623
daos_size_t fetch_sz;
626624

@@ -661,7 +659,7 @@ int DARSHAN_DECL(daos_obj_update)(daos_handle_t oh, daos_handle_t th, uint64_t f
661659
daos_key_t *dkey, unsigned int nr, daos_iod_t *iods, d_sg_list_t *sgls,
662660
daos_event_t *ev)
663661
{
664-
int ret;
662+
int ret, __darshan_disabled;
665663
double tm1, tm2;
666664
daos_size_t update_sz;
667665

@@ -701,7 +699,7 @@ int DARSHAN_DECL(daos_obj_update)(daos_handle_t oh, daos_handle_t th, uint64_t f
701699
int DARSHAN_DECL(daos_obj_punch)(daos_handle_t oh, daos_handle_t th, uint64_t flags,
702700
daos_event_t *ev)
703701
{
704-
int ret;
702+
int ret, __darshan_disabled;
705703
double tm1, tm2;
706704
struct daos_object_record_ref *rec_ref;
707705

@@ -746,7 +744,7 @@ int DARSHAN_DECL(daos_obj_punch)(daos_handle_t oh, daos_handle_t th, uint64_t fl
746744
int DARSHAN_DECL(daos_obj_punch_dkeys)(daos_handle_t oh, daos_handle_t th, uint64_t flags,
747745
unsigned int nr, daos_key_t *dkeys, daos_event_t *ev)
748746
{
749-
int ret;
747+
int ret, __darshan_disabled;
750748
double tm1, tm2;
751749
struct daos_object_record_ref *rec_ref;
752750

@@ -791,7 +789,7 @@ int DARSHAN_DECL(daos_obj_punch_dkeys)(daos_handle_t oh, daos_handle_t th, uint6
791789
int DARSHAN_DECL(daos_obj_punch_akeys)(daos_handle_t oh, daos_handle_t th, uint64_t flags,
792790
daos_key_t *dkey, unsigned int nr, daos_key_t *akeys, daos_event_t *ev)
793791
{
794-
int ret;
792+
int ret, __darshan_disabled;
795793
double tm1, tm2;
796794
struct daos_object_record_ref *rec_ref;
797795

@@ -837,7 +835,7 @@ int DARSHAN_DECL(daos_obj_punch_akeys)(daos_handle_t oh, daos_handle_t th, uint6
837835
int DARSHAN_DECL(daos_obj_list_dkey)(daos_handle_t oh, daos_handle_t th, uint32_t *nr,
838836
daos_key_desc_t *kds, d_sg_list_t *sgl, daos_anchor_t *anchor, daos_event_t *ev)
839837
{
840-
int ret;
838+
int ret, __darshan_disabled;
841839
double tm1, tm2;
842840
struct daos_object_record_ref *rec_ref;
843841

@@ -883,7 +881,7 @@ int DARSHAN_DECL(daos_obj_list_akey)(daos_handle_t oh, daos_handle_t th,
883881
daos_key_t *dkey, uint32_t *nr, daos_key_desc_t *kds, d_sg_list_t *sgl,
884882
daos_anchor_t *anchor, daos_event_t *ev)
885883
{
886-
int ret;
884+
int ret, __darshan_disabled;
887885
double tm1, tm2;
888886
struct daos_object_record_ref *rec_ref;
889887

@@ -930,7 +928,7 @@ int DARSHAN_DECL(daos_obj_list_recx)(daos_handle_t oh, daos_handle_t th,
930928
daos_recx_t *recxs, daos_epoch_range_t *eprs, daos_anchor_t *anchor,
931929
bool incr_order, daos_event_t *ev)
932930
{
933-
int ret;
931+
int ret, __darshan_disabled;
934932
double tm1, tm2;
935933
struct daos_object_record_ref *rec_ref;
936934

@@ -975,7 +973,7 @@ int DARSHAN_DECL(daos_obj_list_recx)(daos_handle_t oh, daos_handle_t th,
975973

976974
int DARSHAN_DECL(daos_obj_close)(daos_handle_t oh, daos_event_t *ev)
977975
{
978-
int ret;
976+
int ret, __darshan_disabled;
979977
double tm1, tm2;
980978

981979
MAP_OR_FAIL(daos_obj_close);
@@ -1013,7 +1011,7 @@ int DARSHAN_DECL(daos_array_create)(daos_handle_t coh, daos_obj_id_t oid,
10131011
daos_handle_t th, daos_size_t cell_size, daos_size_t chunk_size,
10141012
daos_handle_t *oh, daos_event_t *ev)
10151013
{
1016-
int ret;
1014+
int ret, __darshan_disabled;
10171015
double tm1, tm2;
10181016

10191017
MAP_OR_FAIL(daos_array_create);
@@ -1055,7 +1053,7 @@ int DARSHAN_DECL(daos_array_open)(daos_handle_t coh, daos_obj_id_t oid,
10551053
daos_handle_t th, unsigned int mode, daos_size_t *cell_size, daos_size_t *chunk_size,
10561054
daos_handle_t *oh, daos_event_t *ev)
10571055
{
1058-
int ret;
1056+
int ret, __darshan_disabled;
10591057
double tm1, tm2;
10601058

10611059
MAP_OR_FAIL(daos_array_open);
@@ -1095,7 +1093,7 @@ int DARSHAN_DECL(daos_array_open)(daos_handle_t coh, daos_obj_id_t oid,
10951093

10961094
int DARSHAN_DECL(daos_array_open_with_attr)(daos_handle_t coh, daos_obj_id_t oid, daos_handle_t th, unsigned int mode, daos_size_t cell_size, daos_size_t chunk_size, daos_handle_t *oh, daos_event_t *ev)
10971095
{
1098-
int ret;
1096+
int ret, __darshan_disabled;
10991097
double tm1, tm2;
11001098

11011099
MAP_OR_FAIL(daos_array_open_with_attr);
@@ -1147,7 +1145,7 @@ int DARSHAN_DECL(daos_array_open_with_attr)(daos_handle_t coh, daos_obj_id_t oid
11471145
int DARSHAN_DECL(daos_array_read)(daos_handle_t oh, daos_handle_t th,
11481146
daos_array_iod_t *iod, d_sg_list_t *sgl, daos_event_t *ev)
11491147
{
1150-
int ret;
1148+
int ret, __darshan_disabled;
11511149
double tm1, tm2;
11521150
daos_size_t read_sz;
11531151

@@ -1187,7 +1185,7 @@ int DARSHAN_DECL(daos_array_read)(daos_handle_t oh, daos_handle_t th,
11871185
int DARSHAN_DECL(daos_array_write)(daos_handle_t oh, daos_handle_t th,
11881186
daos_array_iod_t *iod, d_sg_list_t *sgl, daos_event_t *ev)
11891187
{
1190-
int ret;
1188+
int ret, __darshan_disabled;
11911189
double tm1, tm2;
11921190
daos_size_t write_sz;
11931191

@@ -1227,7 +1225,7 @@ int DARSHAN_DECL(daos_array_write)(daos_handle_t oh, daos_handle_t th,
12271225
int DARSHAN_DECL(daos_array_get_size)(daos_handle_t oh, daos_handle_t th,
12281226
daos_size_t *size, daos_event_t *ev)
12291227
{
1230-
int ret;
1228+
int ret, __darshan_disabled;
12311229
double tm1, tm2;
12321230
struct daos_object_record_ref *rec_ref;
12331231

@@ -1272,7 +1270,7 @@ int DARSHAN_DECL(daos_array_get_size)(daos_handle_t oh, daos_handle_t th,
12721270
int DARSHAN_DECL(daos_array_set_size)(daos_handle_t oh, daos_handle_t th,
12731271
daos_size_t size, daos_event_t *ev)
12741272
{
1275-
int ret;
1273+
int ret, __darshan_disabled;
12761274
double tm1, tm2;
12771275
struct daos_object_record_ref *rec_ref;
12781276

@@ -1316,7 +1314,7 @@ int DARSHAN_DECL(daos_array_set_size)(daos_handle_t oh, daos_handle_t th,
13161314

13171315
int DARSHAN_DECL(daos_array_stat)(daos_handle_t oh, daos_handle_t th, daos_array_stbuf_t *stbuf, daos_event_t *ev)
13181316
{
1319-
int ret;
1317+
int ret, __darshan_disabled;
13201318
double tm1, tm2;
13211319
struct daos_object_record_ref *rec_ref;
13221320

@@ -1361,7 +1359,7 @@ int DARSHAN_DECL(daos_array_stat)(daos_handle_t oh, daos_handle_t th, daos_array
13611359
int DARSHAN_DECL(daos_array_punch)(daos_handle_t oh, daos_handle_t th,
13621360
daos_array_iod_t *iod, daos_event_t *ev)
13631361
{
1364-
int ret;
1362+
int ret, __darshan_disabled;
13651363
double tm1, tm2;
13661364
struct daos_object_record_ref *rec_ref;
13671365

@@ -1406,7 +1404,7 @@ int DARSHAN_DECL(daos_array_punch)(daos_handle_t oh, daos_handle_t th,
14061404
int DARSHAN_DECL(daos_array_destroy)(daos_handle_t oh, daos_handle_t th,
14071405
daos_event_t *ev)
14081406
{
1409-
int ret;
1407+
int ret, __darshan_disabled;
14101408
double tm1, tm2;
14111409
struct daos_object_record_ref *rec_ref;
14121410

@@ -1450,7 +1448,7 @@ int DARSHAN_DECL(daos_array_destroy)(daos_handle_t oh, daos_handle_t th,
14501448

14511449
int DARSHAN_DECL(daos_array_close)(daos_handle_t oh, daos_event_t *ev)
14521450
{
1453-
int ret;
1451+
int ret, __darshan_disabled;
14541452
double tm1, tm2;
14551453

14561454
MAP_OR_FAIL(daos_array_close);
@@ -1487,7 +1485,7 @@ int DARSHAN_DECL(daos_array_close)(daos_handle_t oh, daos_event_t *ev)
14871485
int DARSHAN_DECL(daos_kv_open)(daos_handle_t coh, daos_obj_id_t oid, unsigned int mode,
14881486
daos_handle_t *oh, daos_event_t *ev)
14891487
{
1490-
int ret;
1488+
int ret, __darshan_disabled;
14911489
double tm1, tm2;
14921490

14931491
MAP_OR_FAIL(daos_kv_open);
@@ -1528,7 +1526,7 @@ int DARSHAN_DECL(daos_kv_open)(daos_handle_t coh, daos_obj_id_t oid, unsigned in
15281526
int DARSHAN_DECL(daos_kv_get)(daos_handle_t oh, daos_handle_t th, uint64_t flags,
15291527
const char *key, daos_size_t *size, void *buf, daos_event_t *ev)
15301528
{
1531-
int ret;
1529+
int ret, __darshan_disabled;
15321530
double tm1, tm2;
15331531

15341532
MAP_OR_FAIL(daos_kv_get);
@@ -1565,7 +1563,7 @@ int DARSHAN_DECL(daos_kv_get)(daos_handle_t oh, daos_handle_t th, uint64_t flags
15651563
int DARSHAN_DECL(daos_kv_put)(daos_handle_t oh, daos_handle_t th, uint64_t flags,
15661564
const char *key, daos_size_t size, const void *buf, daos_event_t *ev)
15671565
{
1568-
int ret;
1566+
int ret, __darshan_disabled;
15691567
double tm1, tm2;
15701568

15711569
MAP_OR_FAIL(daos_kv_put);
@@ -1602,7 +1600,7 @@ int DARSHAN_DECL(daos_kv_put)(daos_handle_t oh, daos_handle_t th, uint64_t flags
16021600
int DARSHAN_DECL(daos_kv_remove)(daos_handle_t oh, daos_handle_t th, uint64_t flags,
16031601
const char *key, daos_event_t *ev)
16041602
{
1605-
int ret;
1603+
int ret, __darshan_disabled;
16061604
double tm1, tm2;
16071605
struct daos_object_record_ref *rec_ref;
16081606

@@ -1647,7 +1645,7 @@ int DARSHAN_DECL(daos_kv_remove)(daos_handle_t oh, daos_handle_t th, uint64_t fl
16471645
int DARSHAN_DECL(daos_kv_list)(daos_handle_t oh, daos_handle_t th, uint32_t *nr,
16481646
daos_key_desc_t *kds, d_sg_list_t *sgl, daos_anchor_t *anchor, daos_event_t *ev)
16491647
{
1650-
int ret;
1648+
int ret, __darshan_disabled;
16511649
double tm1, tm2;
16521650
struct daos_object_record_ref *rec_ref;
16531651

@@ -1691,7 +1689,7 @@ int DARSHAN_DECL(daos_kv_list)(daos_handle_t oh, daos_handle_t th, uint32_t *nr,
16911689

16921690
int DARSHAN_DECL(daos_kv_destroy)(daos_handle_t oh, daos_handle_t th, daos_event_t *ev)
16931691
{
1694-
int ret;
1692+
int ret, __darshan_disabled;
16951693
double tm1, tm2;
16961694
struct daos_object_record_ref *rec_ref;
16971695

@@ -1735,7 +1733,7 @@ int DARSHAN_DECL(daos_kv_destroy)(daos_handle_t oh, daos_handle_t th, daos_event
17351733

17361734
int DARSHAN_DECL(daos_kv_close)(daos_handle_t oh, daos_event_t *ev)
17371735
{
1738-
int ret;
1736+
int ret, __darshan_disabled;
17391737
double tm1, tm2;
17401738

17411739
MAP_OR_FAIL(daos_kv_close);

0 commit comments

Comments
 (0)