d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ggate: Fix ggated/ggatec debug print of offsets.

Browse Source 
The request offset and length are always unsigned, so print them as
such.

Submitted by:	Yoshihiro Ota <ota@j.email.ne.jp>
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D21388
This commit is contained in:
Mark Johnston 2020-09-09 12:58:19 +00:00
parent 285385ba56
commit 278847ae58
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=365502
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sbin/ggate/ggatec/ggatec.c
View File

@ -35,6 +35,7 @@
#include <unistd.h>
#include <string.h>
#include <ctype.h>
#include <inttypes.h>
#include <libgen.h>
#include <pthread.h>
#include <signal.h>
@ -174,8 +175,9 @@ send_thread(void *arg __unused)
pthread_kill(recvtd, SIGUSR1);
break;
}
g_gate_log(LOG_DEBUG, "Sent %zd bytes (offset=%llu, "
"size=%u).", data, hdr.gh_offset, hdr.gh_length);
g_gate_log(LOG_DEBUG, "Sent %zd bytes (offset=%"
PRIu64 ", length=%" PRIu32 ").", data,
hdr.gh_offset, hdr.gh_length);
}
}
g_gate_log(LOG_DEBUG, "%s: Died.", __func__);
@ -229,9 +231,9 @@ recv_thread(void *arg __unused)
pthread_kill(sendtd, SIGUSR1);
break;
}
g_gate_log(LOG_DEBUG, "Received %d bytes (offset=%ju, "
"size=%zu).", data, (uintmax_t)hdr.gh_offset,
(size_t)hdr.gh_length);
g_gate_log(LOG_DEBUG, "Received %d bytes (offset=%"
PRIu64 ", length=%" PRIu32 ").", data,
hdr.gh_offset, hdr.gh_length);
}
g_gate_ioctl(G_GATE_CMD_DONE, &ggio);

17
sbin/ggate/ggated/ggated.c
View File

@ -43,6 +43,7 @@
#include <assert.h>
#include <err.h>
#include <errno.h>
#include <inttypes.h>
#include <fcntl.h>
#include <libgen.h>
#include <libutil.h>
@ -662,8 +663,8 @@ recv_thread(void *arg)
g_gate_log(LOG_DEBUG, "Received hdr packet.");
g_gate_swap2h_hdr(&req->r_hdr);
g_gate_log(LOG_DEBUG, "%s: offset=%jd length=%u", __func__,
(intmax_t)req->r_offset, (unsigned)req->r_length);
g_gate_log(LOG_DEBUG, "%s: offset=%" PRIu64 " length=%" PRIu32,
__func__, req->r_offset, req->r_length);
/*
* Allocate memory for data.
@ -730,8 +731,8 @@ disk_thread(void *arg)
assert((req->r_offset % conn->c_sectorsize) == 0);
assert((req->r_length % conn->c_sectorsize) == 0);
g_gate_log(LOG_DEBUG, "%s: offset=%jd length=%u", __func__,
(intmax_t)req->r_offset, (unsigned)req->r_length);
g_gate_log(LOG_DEBUG, "%s: offset=%" PRIu64 " length=%" PRIu32,
__func__, req->r_offset, req->r_length);
/*
* Do the request.
@ -804,8 +805,8 @@ send_thread(void *arg)
error = pthread_mutex_unlock(&outqueue_mtx);
assert(error == 0);
g_gate_log(LOG_DEBUG, "%s: offset=%jd length=%u", __func__,
(intmax_t)req->r_offset, (unsigned)req->r_length);
g_gate_log(LOG_DEBUG, "%s: offset=%" PRIu64 " length=%" PRIu32,
__func__, req->r_offset, req->r_length);
/*
* Send the request.
@ -824,8 +825,8 @@ send_thread(void *arg)
strerror(errno));
}
g_gate_log(LOG_DEBUG,
"Sent %zd bytes (offset=%ju, size=%zu).", data,
(uintmax_t)req->r_offset, (size_t)req->r_length);
"Sent %zd bytes (offset=%" PRIu64 ", size=%" PRIu32
").", data, req->r_offset, req->r_length);
free(req->r_data);
}
free(req);