OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block/sheepdog: Convert from DPRINTF() macro to trace events 

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20181213162727.17438-5-lvivier@redhat.com
[mreitz: Fixed sheepdog_snapshot_create_inode's format string to use
         PRIx32 for uint32_ts]
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Laurent Vivier 2018-12-13 17:27:27 +01:00 committed by Max Reitz
parent 4f7d28d738
commit 70018a149c
2 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
block/sheepdog.c
View File

@ -28,6 +28,7 @@
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "qemu/bitops.h" #include "qemu/bitops.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "trace.h"
#define SD_PROTO_VER 0x01 #define SD_PROTO_VER 0x01
@ -299,19 +300,6 @@ static inline size_t count_data_objs(const struct SheepdogInode *inode)
(1UL << inode->block_size_shift)); (1UL << inode->block_size_shift));
} }
#undef DPRINTF
#ifdef DEBUG_SDOG
#define DEBUG_SDOG_PRINT 1
#else
#define DEBUG_SDOG_PRINT 0
#endif
#define DPRINTF(fmt, args...) \
do { \
if (DEBUG_SDOG_PRINT) { \
fprintf(stderr, "%s %d: " fmt, __func__, __LINE__, ##args); \
} \
} while (0)
typedef struct SheepdogAIOCB SheepdogAIOCB; typedef struct SheepdogAIOCB SheepdogAIOCB;
typedef struct BDRVSheepdogState BDRVSheepdogState; typedef struct BDRVSheepdogState BDRVSheepdogState;
@ -750,7 +738,7 @@ static coroutine_fn void reconnect_to_sdog(void *opaque)
Error *local_err = NULL; Error *local_err = NULL;
s->fd = get_sheep_fd(s, &local_err); s->fd = get_sheep_fd(s, &local_err);
if (s->fd < 0) { if (s->fd < 0) {
DPRINTF("Wait for connection to be established\n"); trace_sheepdog_reconnect_to_sdog();
error_report_err(local_err); error_report_err(local_err);
qemu_co_sleep_ns(QEMU_CLOCK_REALTIME, 1000000000ULL); qemu_co_sleep_ns(QEMU_CLOCK_REALTIME, 1000000000ULL);
} }
@ -847,7 +835,7 @@ static void coroutine_fn aio_read_response(void *opaque)
break; break;
case AIOCB_FLUSH_CACHE: case AIOCB_FLUSH_CACHE:
if (rsp.result == SD_RES_INVALID_PARMS) { if (rsp.result == SD_RES_INVALID_PARMS) {
DPRINTF("disable cache since the server doesn't support it\n"); trace_sheepdog_aio_read_response();
s->cache_flags = SD_FLAG_CMD_DIRECT; s->cache_flags = SD_FLAG_CMD_DIRECT;
rsp.result = SD_RES_SUCCESS; rsp.result = SD_RES_SUCCESS;
} }
@ -1639,7 +1627,7 @@ static int sd_open(BlockDriverState *bs, QDict *options, int flags,
s->discard_supported = true; s->discard_supported = true;
if (snap_id || tag[0]) { if (snap_id || tag[0]) {
DPRINTF("%" PRIx32 " snapshot inode was open.\n", vid); trace_sheepdog_open(vid);
s->is_snapshot = true; s->is_snapshot = true;
} }
@ -2252,7 +2240,7 @@ static void sd_close(BlockDriverState *bs)
unsigned int wlen, rlen = 0; unsigned int wlen, rlen = 0;
int fd, ret; int fd, ret;
DPRINTF("%s\n", s->name); trace_sheepdog_close(s->name);
fd = connect_to_sdog(s, &local_err); fd = connect_to_sdog(s, &local_err);
if (fd < 0) { if (fd < 0) {
@ -2429,7 +2417,7 @@ static int sd_create_branch(BDRVSheepdogState *s)
char *buf; char *buf;
bool deleted; bool deleted;
DPRINTF("%" PRIx32 " is snapshot.\n", s->inode.vdi_id); trace_sheepdog_create_branch_snapshot(s->inode.vdi_id);
buf = g_malloc(SD_INODE_SIZE); buf = g_malloc(SD_INODE_SIZE);
@ -2445,7 +2433,7 @@ static int sd_create_branch(BDRVSheepdogState *s)
goto out; goto out;
} }
DPRINTF("%" PRIx32 " is created.\n", vid); trace_sheepdog_create_branch_created(vid);
fd = connect_to_sdog(s, &local_err); fd = connect_to_sdog(s, &local_err);
if (fd < 0) { if (fd < 0) {
@ -2467,7 +2455,7 @@ static int sd_create_branch(BDRVSheepdogState *s)
s->is_snapshot = false; s->is_snapshot = false;
ret = 0; ret = 0;
DPRINTF("%" PRIx32 " was newly created.\n", s->inode.vdi_id); trace_sheepdog_create_branch_new(s->inode.vdi_id);
out: out:
g_free(buf); g_free(buf);
@ -2561,11 +2549,11 @@ static void coroutine_fn sd_co_rw_vector(SheepdogAIOCB *acb)
} }
if (create) { if (create) {
DPRINTF("update ino (%" PRIu32 ") %" PRIu64 " %" PRIu64 " %ld\n", trace_sheepdog_co_rw_vector_update(inode->vdi_id, oid,
inode->vdi_id, oid, vid_to_data_oid(inode->data_vdi_id[idx], idx),
vid_to_data_oid(inode->data_vdi_id[idx], idx), idx); idx);
oid = vid_to_data_oid(inode->vdi_id, idx); oid = vid_to_data_oid(inode->vdi_id, idx);
DPRINTF("new oid %" PRIx64 "\n", oid); trace_sheepdog_co_rw_vector_new(oid);
} }
aio_req = alloc_aio_req(s, acb, oid, len, offset, flags, create, aio_req = alloc_aio_req(s, acb, oid, len, offset, flags, create,
@ -2670,9 +2658,8 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info)
SheepdogInode *inode; SheepdogInode *inode;
unsigned int datalen; unsigned int datalen;
DPRINTF("sn_info: name %s id_str %s s: name %s vm_state_size %" PRId64 " " trace_sheepdog_snapshot_create_info(sn_info->name, sn_info->id_str, s->name,
"is_snapshot %d\n", sn_info->name, sn_info->id_str, sn_info->vm_state_size, s->is_snapshot);
s->name, sn_info->vm_state_size, s->is_snapshot);
if (s->is_snapshot) { if (s->is_snapshot) {
error_report("You can't create a snapshot of a snapshot VDI, " error_report("You can't create a snapshot of a snapshot VDI, "
@ -2681,7 +2668,7 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info)
return -EINVAL; return -EINVAL;
} }
DPRINTF("%s %s\n", sn_info->name, sn_info->id_str); trace_sheepdog_snapshot_create(sn_info->name, sn_info->id_str);
s->inode.vm_state_size = sn_info->vm_state_size; s->inode.vm_state_size = sn_info->vm_state_size;
s->inode.vm_clock_nsec = sn_info->vm_clock_nsec; s->inode.vm_clock_nsec = sn_info->vm_clock_nsec;
@ -2726,8 +2713,8 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info)
} }
memcpy(&s->inode, inode, datalen); memcpy(&s->inode, inode, datalen);
DPRINTF("s->inode: name %s snap_id %x oid %x\n", trace_sheepdog_snapshot_create_inode(s->inode.name, s->inode.snap_id,
s->inode.name, s->inode.snap_id, s->inode.vdi_id); s->inode.vdi_id);
cleanup: cleanup:
g_free(inode); g_free(inode);

14
block/trace-events
View File

@ -193,3 +193,17 @@ file_xfs_discard(const char *error) "cannot punch hole (%s)"
file_FindEjectableOpticalMedia(const char *media) "Matching using %s" file_FindEjectableOpticalMedia(const char *media) "Matching using %s"
file_setup_cdrom(const char *partition) "Using %s as optical disc" file_setup_cdrom(const char *partition) "Using %s as optical disc"
file_hdev_is_sg(int type, int version) "SG device found: type=%d, version=%d" file_hdev_is_sg(int type, int version) "SG device found: type=%d, version=%d"
# block/sheepdog.c
sheepdog_reconnect_to_sdog(void) "Wait for connection to be established"
sheepdog_aio_read_response(void) "disable cache since the server doesn't support it"
sheepdog_open(uint32_t vid) "0x%" PRIx32 " snapshot inode was open"
sheepdog_close(const char *name) "%s"
sheepdog_create_branch_snapshot(uint32_t vdi) "0x%" PRIx32 " is snapshot"
sheepdog_create_branch_created(uint32_t vdi) "0x%" PRIx32 " is created"
sheepdog_create_branch_new(uint32_t vdi) "0x%" PRIx32 " was newly created"
sheepdog_co_rw_vector_update(uint32_t vdi, uint64_t oid, uint64_t data, long idx) "update ino (%" PRIu32 ") %" PRIu64 " %" PRIu64 " %ld"
sheepdog_co_rw_vector_new(uint64_t oid) "new oid 0x%" PRIx64
sheepdog_snapshot_create_info(const char *sn_name, const char *id, const char *name, int64_t size, int is_snapshot) "sn_info: name %s id_str %s s: name %s vm_state_size %" PRId64 " " "is_snapshot %d"
sheepdog_snapshot_create(const char *sn_name, const char *id) "%s %s"
sheepdog_snapshot_create_inode(const char *name, uint32_t snap, uint32_t vdi) "s->inode: name %s snap_id 0x%" PRIx32 " vdi 0x%" PRIx32