diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-07-26 05:25:28 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-07-26 05:34:52 +0000 |
commit | 9ecff41dd11e920286f9be670a0ec3a668371d1d (patch) | |
tree | 89c73ab6742847ca5f12056e6c0dd4ec6bbe79d0 /examples/telemetry-listen.c | |
parent | Adding debian version 1.0-1. (diff) | |
download | libnvme-9ecff41dd11e920286f9be670a0ec3a668371d1d.tar.xz libnvme-9ecff41dd11e920286f9be670a0ec3a668371d1d.zip |
Merging upstream version 1.1~rc0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'examples/telemetry-listen.c')
-rw-r--r-- | examples/telemetry-listen.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/examples/telemetry-listen.c b/examples/telemetry-listen.c index 746992b..ec5edb3 100644 --- a/examples/telemetry-listen.c +++ b/examples/telemetry-listen.c @@ -55,7 +55,6 @@ static void save_telemetry(nvme_ctrl_t c) free(log); return; } - log_size = (le16_to_cpu(log->dalb3) + 1) * NVME_LOG_TELEM_BLOCK_SIZE; fd = open(buf, O_CREAT|O_WRONLY, S_IRUSR|S_IRGRP); if (fd < 0) { @@ -67,7 +66,7 @@ static void save_telemetry(nvme_ctrl_t c) if (ret < 0) printf("failed to write telemetry log\n"); else - printf("telemetry log save as %s, wrote:%d size:%ld\n", buf, + printf("telemetry log save as %s, wrote:%d size:%zd\n", buf, ret, log_size); close(fd); free(log); @@ -77,8 +76,10 @@ static void check_telemetry(nvme_ctrl_t c, int ufd) { char buf[0x1000] = { 0 }; char *p, *ptr; + int len; - if (read(ufd, buf, sizeof(buf)) < 0) + len = read(ufd, buf, sizeof(buf) - 1); + if (len < 0) return; ptr = buf; @@ -140,7 +141,7 @@ int main() nvme_subsystem_for_each_ctrl(s, c) i++; - e = calloc(i, sizeof(e)); + e = calloc(i, sizeof(struct events)); FD_ZERO(&fds); i = 0; |