Skip to content

Commit e596c7c

Browse files
author
neok-m4700
committed
more cleanup - use __LINE__ macros for debug
1 parent 272c284 commit e596c7c

File tree

1 file changed

+44
-75
lines changed

1 file changed

+44
-75
lines changed

‎src/mpi/mpi_caf.c‎

Lines changed: 44 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ static char* caf_array_ref_str[] = {
7474
#define dprint(...)
7575
#define chk_err(...)
7676
#else
77-
#define dprint(format, ...) \
78-
fprintf(stderr, "%d/%d: %s() " format, \
79-
caf_this_image, caf_num_images, \
80-
__FUNCTION__, ## __VA_ARGS__)
77+
#define dprint(format, ...) \
78+
fprintf(stderr, "%d/%d: %s(%d) " format, \
79+
caf_this_image, caf_num_images, \
80+
__FUNCTION__, __LINE__, ## __VA_ARGS__)
8181
#define chk_err(ierr) \
8282
do \
8383
{ \
@@ -4158,17 +4158,13 @@ get_for_ref(caf_reference_t *ref, size_t *i, size_t dst_index,
41584158
sr_byte_offset = 0;
41594159
desc_byte_offset = 0;
41604160
#ifdef EXTRA_DEBUG_OUTPUT
4161-
fprintf(stderr, "%d/%d: %s() remote desc rank: %zd (ref_rank: %zd)\n",
4162-
caf_this_image, caf_num_images, __FUNCTION__,
4163-
GFC_DESCRIPTOR_RANK(src), ref_rank);
4161+
dprint("remote desc rank: %zd (ref_rank: %zd)\n",
4162+
GFC_DESCRIPTOR_RANK(src), ref_rank);
41644163
for (int r = 0; r < GFC_DESCRIPTOR_RANK(src); ++r)
41654164
{
4166-
fprintf(stderr,
4167-
"%d/%d: %s() remote desc "
4168-
"dim[%d] = (lb = %zd, ub = %zd, stride = %zd)\n",
4169-
caf_this_image, caf_num_images, __FUNCTION__,
4170-
r, src->dim[r].lower_bound, src->dim[r]._ubound,
4171-
src->dim[r]._stride);
4165+
dprint("remote desc dim[%d] = (lb = %zd, ub = %zd, stride = %zd)\n",
4166+
r, src->dim[r].lower_bound, src->dim[r]._ubound,
4167+
src->dim[r]._stride);
41724168
}
41734169
#endif
41744170
}
@@ -4590,16 +4586,13 @@ PREFIX(get_by_ref) (caf_token_t token, int image_index,
45904586
src = mpi_token->desc;
45914587

45924588
#ifdef EXTRA_DEBUG_OUTPUT
4593-
fprintf(stderr, "%d/%d: %s() remote desc rank: %zd (ref_rank: %zd)\n",
4594-
caf_this_image, caf_num_images, __FUNCTION__,
4595-
GFC_DESCRIPTOR_RANK(src), ref_rank);
4589+
dprint("remote desc rank: %zd (ref_rank: %zd)\n",
4590+
GFC_DESCRIPTOR_RANK(src), ref_rank);
45964591
for (i = 0; i < GFC_DESCRIPTOR_RANK(src); ++i)
45974592
{
4598-
fprintf(stderr, "%d/%d: %s() remote desc "
4599-
"dim[%zd] = (lb = %zd, ub = %zd, stride = %zd)\n",
4600-
caf_this_image, caf_num_images, __FUNCTION__,
4601-
i, src->dim[i].lower_bound, src->dim[i]._ubound,
4602-
src->dim[i]._stride);
4593+
dprint("remote desc dim[%zd] = (lb = %zd, ub = %zd, stride = %zd)\n",
4594+
i, src->dim[i].lower_bound, src->dim[i]._ubound,
4595+
src->dim[i]._stride);
46034596
}
46044597
#endif
46054598
for (i = 0; riter->u.a.mode[i] != CAF_ARR_REF_NONE; ++i)
@@ -4982,14 +4975,11 @@ case kind: \
49824975
remote_memptr = mpi_token->memptr;
49834976
dst_index = 0;
49844977
#ifdef EXTRA_DEBUG_OUTPUT
4985-
fprintf(stderr, "%d/%d: %s() dst_rank: %zd\n",
4986-
caf_this_image, caf_num_images, __FUNCTION__,
4987-
GFC_DESCRIPTOR_RANK(dst));
4978+
dprint("dst_rank: %zd\n", GFC_DESCRIPTOR_RANK(dst));
49884979
for (i = 0; i < GFC_DESCRIPTOR_RANK(dst); ++i)
49894980
{
4990-
fprintf(stderr, "%d/%d: %s() dst_dim[%zd] = (%zd, %zd)\n",
4991-
caf_this_image, caf_num_images, __FUNCTION__,
4992-
i, dst->dim[i].lower_bound, dst->dim[i]._ubound);
4981+
dprint("dst_dim[%zd] = (%zd, %zd)\n",
4982+
i, dst->dim[i].lower_bound, dst->dim[i]._ubound);
49934983
}
49944984
#endif
49954985
i = 0;
@@ -5292,17 +5282,13 @@ send_for_ref(caf_reference_t *ref, size_t *i, size_t src_index,
52925282
dst_byte_offset = 0;
52935283
desc_byte_offset = 0;
52945284
#ifdef EXTRA_DEBUG_OUTPUT
5295-
fprintf(stderr, "%d/%d: %s() remote desc rank: %zd (ref_rank: %zd)\n",
5296-
caf_this_image, caf_num_images, __FUNCTION__,
5297-
GFC_DESCRIPTOR_RANK(src), ref_rank);
5285+
dprint("remote desc rank: %zd (ref_rank: %zd)\n",
5286+
GFC_DESCRIPTOR_RANK(src), ref_rank);
52985287
for (int r = 0; r < GFC_DESCRIPTOR_RANK(src); ++r)
52995288
{
5300-
fprintf(stderr,
5301-
"%d/%d: %s() remote desc "
5302-
"dim[%d] = (lb = %zd, ub = %zd, stride = %zd)\n",
5303-
caf_this_image, caf_num_images, __FUNCTION__,
5304-
r, src->dim[r].lower_bound, src->dim[r]._ubound,
5305-
src->dim[r]._stride);
5289+
dprint("remote desc dim[%d] = (lb = %zd, ub = %zd, stride = %zd)\n",
5290+
r, src->dim[r].lower_bound, src->dim[r]._ubound,
5291+
src->dim[r]._stride);
53065292
}
53075293
#endif
53085294
}
@@ -5741,18 +5727,13 @@ PREFIX(send_by_ref) (caf_token_t token, int image_index,
57415727
else
57425728
dst = mpi_token->desc;
57435729
#ifdef EXTRA_DEBUG_OUTPUT
5744-
fprintf(stderr,
5745-
"%d/%d: %s() remote desc rank: %zd (ref_rank: %zd)\n",
5746-
caf_this_image, caf_num_images, __FUNCTION__,
5747-
GFC_DESCRIPTOR_RANK(dst), ref_rank);
5730+
dprint("remote desc rank: %zd (ref_rank: %zd)\n",
5731+
GFC_DESCRIPTOR_RANK(dst), ref_rank);
57485732
for (i = 0; i < GFC_DESCRIPTOR_RANK(dst); ++i)
57495733
{
5750-
fprintf(stderr,
5751-
"%d/%d: %s() remote desc "
5752-
"dim[%zd] = (lb = %zd, ub = %zd, stride = %zd)\n",
5753-
caf_this_image, caf_num_images, __FUNCTION__,
5754-
i, dst->dim[i].lower_bound, dst->dim[i]._ubound,
5755-
dst->dim[i]._stride);
5734+
dprint("remote desc dim[%zd] = (lb = %zd, ub = %zd, stride = %zd)\n",
5735+
i, dst->dim[i].lower_bound, dst->dim[i]._ubound,
5736+
dst->dim[i]._stride);
57565737
}
57575738
#endif
57585739
for (i = 0; riter->u.a.mode[i] != CAF_ARR_REF_NONE; ++i)
@@ -6016,14 +5997,11 @@ case kind: \
60165997
remote_memptr = mpi_token->memptr;
60175998
src_index = 0;
60185999
#ifdef EXTRA_DEBUG_OUTPUT
6019-
fprintf(stderr, "%d/%d: %s() src_rank: %zd\n",
6020-
caf_this_image, caf_num_images, __FUNCTION__,
6021-
GFC_DESCRIPTOR_RANK(src));
6000+
dprint("src_rank: %zd\n", GFC_DESCRIPTOR_RANK(src));
60226001
for (i = 0; i < GFC_DESCRIPTOR_RANK(src); ++i)
60236002
{
6024-
fprintf(stderr, "%d/%d: %s() src_dim[%zd] = (%zd, %zd)\n",
6025-
caf_this_image, caf_num_images, __FUNCTION__,
6026-
i, src->dim[i].lower_bound, src->dim[i]._ubound);
6003+
dprint("src_dim[%zd] = (%zd, %zd)\n",
6004+
i, src->dim[i].lower_bound, src->dim[i]._ubound);
60276005
}
60286006
#endif
60296007
/* When accessing myself and may_require_tmp is set, then copy the source
@@ -6212,17 +6190,13 @@ PREFIX(sendget_by_ref) (caf_token_t dst_token, int dst_image_index,
62126190
src = src_mpi_token->desc;
62136191
}
62146192
#ifdef EXTRA_DEBUG_OUTPUT
6215-
fprintf(stderr, "%d/%d: %s() remote desc rank: %zd (ref_rank: %zd)\n",
6216-
caf_this_image, caf_num_images, __FUNCTION__,
6217-
GFC_DESCRIPTOR_RANK(src), ref_rank);
6193+
dprint("remote desc rank: %zd (ref_rank: %zd)\n",
6194+
GFC_DESCRIPTOR_RANK(src), ref_rank);
62186195
for (i = 0; i < GFC_DESCRIPTOR_RANK(src); ++i)
62196196
{
6220-
fprintf(stderr,
6221-
"%d/%d: %s() remote desc "
6222-
"dim[%zd] = (lb = %zd, ub = %zd, stride = %zd)\n",
6223-
caf_this_image, caf_num_images, __FUNCTION__,
6224-
i, src->dim[i].lower_bound, src->dim[i]._ubound,
6225-
src->dim[i]._stride);
6197+
dprint("remote desc dim[%zd] = (lb = %zd, ub = %zd, stride = %zd)\n",
6198+
i, src->dim[i].lower_bound, src->dim[i]._ubound,
6199+
src->dim[i]._stride);
62266200
}
62276201
#endif
62286202
for (i = 0; riter->u.a.mode[i] != CAF_ARR_REF_NONE; ++i)
@@ -6431,13 +6405,11 @@ case kind: \
64316405
remote_memptr = src_mpi_token->memptr;
64326406
dst_index = 0;
64336407
#ifdef EXTRA_DEBUG_OUTPUT
6434-
fprintf(stderr, "%d/%d: %s() dst_rank: %d\n",
6435-
caf_this_image, caf_num_images, __FUNCTION__, dst_rank);
6408+
dprint("dst_rank: %d\n", dst_rank);
64366409
for (i = 0; i < dst_rank; ++i)
64376410
{
6438-
fprintf(stderr, "%d/%d: %s() temp_src_dim[%zd] = (%zd, %zd)\n",
6439-
caf_this_image, caf_num_images, __FUNCTION__,
6440-
i, temp_src_desc.dim[i].lower_bound, temp_src_desc.dim[i]._ubound);
6411+
dprint("temp_src_dim[%zd] = (%zd, %zd)\n",
6412+
i, temp_src_desc.dim[i].lower_bound, temp_src_desc.dim[i]._ubound);
64416413
}
64426414
#endif
64436415
i = 0;
@@ -6652,17 +6624,14 @@ PREFIX(is_present) (caf_token_t token, int image_index, caf_reference_t *refs)
66526624
#ifdef EXTRA_DEBUG_OUTPUT
66536625
{
66546626
gfc_descriptor_t * src = (gfc_descriptor_t *)(&src_desc);
6655-
fprintf(stderr, "%d/%d: %s() remote desc rank: %zd (ref_rank: %zd)\n",
6656-
caf_this_image, caf_num_images, __FUNCTION__,
6657-
GFC_DESCRIPTOR_RANK(src), ref_rank);
6627+
dprint("remote desc rank: %zd (ref_rank: %zd)\n",
6628+
GFC_DESCRIPTOR_RANK(src), ref_rank);
66586629
for (i = 0; i < GFC_DESCRIPTOR_RANK(src); ++i)
66596630
{
6660-
fprintf(stderr,
6661-
"%d/%d: %s() remote desc "
6662-
"dim[%zd] = (lb = %zd, ub = %zd, stride = %zd)\n",
6663-
caf_this_image, caf_num_images, __FUNCTION__,
6664-
i, src_desc.dim[i].lower_bound, src_desc.dim[i]._ubound,
6665-
src_desc.dim[i]._stride);
6631+
dprint("remote desc dim[%zd] = "
6632+
"(lb = %zd, ub = %zd, stride = %zd)\n",
6633+
i, src_desc.dim[i].lower_bound, src_desc.dim[i]._ubound,
6634+
src_desc.dim[i]._stride);
66666635
}
66676636
}
66686637
#endif

0 commit comments

Comments
 (0)