mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve debug

Browse source
This commit is contained in:
Wim Taymans 2020-04-21 15:51:55 +02:00
parent 539296069d
commit 48036f7d13
3 changed files with 31 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/module-protocol-native.c
View file

@ -34,8 +34,7 @@
#include <spa/pod/iter.h>
#include <spa/utils/result.h>
#include <spa/debug/pod.h>
#include <spa/debug/types.h>
#include "config.h"
@ -51,6 +50,12 @@
#include "modules/module-protocol-native/connection.h"
#include "modules/module-protocol-native/defs.h"
#undef spa_debug
#define spa_debug pw_log_debug
#include <spa/debug/pod.h>
#include <spa/debug/types.h>
#define NAME "protocol-native"
#ifndef UNIX_PATH_MAX
@ -130,7 +135,7 @@ struct client_data {
static void debug_msg(const char *prefix, const struct pw_protocol_native_message *msg, bool hex)
{
struct spa_pod *pod;
fprintf(stderr, "%s: id:%d op:%d size:%d seq:%d\n", prefix,
pw_log_debug("%s: id:%d op:%d size:%d seq:%d\n", prefix,
msg->id, msg->opcode, msg->size, msg->seq);
if ((pod = spa_pod_from_data(msg->data, msg->size, 0, msg->size)) != NULL)

6
src/modules/module-protocol-native/connection.c
View file

@ -30,12 +30,14 @@
#include <unistd.h>
#include <sys/socket.h>
#include <spa/debug/pod.h>
#include <spa/utils/result.h>
#include <spa/pod/builder.h>
#include <pipewire/pipewire.h>
#define spa_debug pw_log_debug
#include <spa/debug/pod.h>
#include "connection.h"
#define MAX_BUFFER_SIZE (1024 * 32)
@ -466,7 +468,7 @@ pw_protocol_native_connection_end(struct pw_protocol_native_connection *conn,
buf->n_fds = buf->msg.n_fds;
if (debug_messages) {
fprintf(stderr, ">>>>>>>>> out: id:%d op:%d size:%d seq:%d\n",
pw_log_debug(">>>>>>>>> out: id:%d op:%d size:%d seq:%d\n",
buf->msg.id, buf->msg.opcode, size, buf->msg.seq);
spa_debug_pod(0, NULL, SPA_MEMBER(p, impl->hdr_size, struct spa_pod));
}

33
src/pipewire/mem.c
View file

@ -315,8 +315,8 @@ static struct mapping * memblock_map(struct memblock *b,
b->this.ref++;
spa_list_append(&b->mappings, &m->link);
pw_log_debug(NAME" %p: fd:%d map:%p ptr:%p (%d %d)", p,
b->this.fd, m, m->ptr, offset, size);
pw_log_debug(NAME" %p: block:%p fd:%d map:%p ptr:%p (%d %d) block-ref:%d", p, &b->this,
b->this.fd, m, m->ptr, offset, size, b->this.ref);
return m;
}
@ -326,8 +326,8 @@ static void mapping_unmap(struct mapping *m)
struct memblock *b = m->block;
struct mempool *p = SPA_CONTAINER_OF(b->this.pool, struct mempool, this);
pw_log_debug(NAME" %p: mapping:%p fd:%d ptr:%p size:%d block-ref:%d",
p, m, b->this.fd, m->ptr, m->size, b->this.ref);
pw_log_debug(NAME" %p: mapping:%p block:%p fd:%d ptr:%p size:%d block-ref:%d",
p, m, b, b->this.fd, m->ptr, m->size, b->this.ref);
if (m->do_unmap)
munmap(m->ptr, m->size);
@ -374,8 +374,8 @@ struct pw_memmap * pw_memblock_map(struct pw_memblock *block,
spa_list_append(&b->maps, &mm->link);
pw_log_debug(NAME" %p: map:%p fd:%d ptr:%p (%d %d) mapping:%p ref:%d", p,
&mm->this, b->this.fd, mm->this.ptr, offset, size, m, m->ref);
pw_log_debug(NAME" %p: map:%p block:%p fd:%d ptr:%p (%d %d) mapping:%p ref:%d", p,
&mm->this, b, b->this.fd, mm->this.ptr, offset, size, m, m->ref);
return &mm->this;
}
@ -403,8 +403,8 @@ int pw_memmap_free(struct pw_memmap *map)
struct memblock *b = m->block;
struct mempool *p = SPA_CONTAINER_OF(b->this.pool, struct mempool, this);
pw_log_debug(NAME" %p: map:%p fd:%d ptr:%p mapping:%p ref:%d", p,
&mm->this, b->this.fd, mm->this.ptr, m, m->ref);
pw_log_debug(NAME" %p: map:%p block:%p fd:%d ptr:%p mapping:%p ref:%d", p,
&mm->this, b, b->this.fd, mm->this.ptr, m, m->ref);
spa_list_remove(&mm->link);
@ -500,7 +500,7 @@ struct pw_memblock * pw_mempool_alloc(struct pw_mempool *pool, enum pw_memblock_
b->this.id = pw_map_insert_new(&impl->map, b);
spa_list_append(&impl->blocks, &b->link);
pw_log_debug(NAME" %p: mem %p alloc id:%d type:%u", pool, &b->this, b->this.id, type);
pw_log_debug(NAME" %p: block:%p id:%d type:%u", pool, &b->this, b->this.id, type);
pw_mempool_emit_added(impl, &b->this);
@ -557,7 +557,7 @@ struct pw_memblock * pw_mempool_import(struct pw_mempool *pool,
b->this.id = pw_map_insert_new(&impl->map, b);
spa_list_append(&impl->blocks, &b->link);
pw_log_debug(NAME" %p: import %p id:%u flags:%08x type:%u fd:%d",
pw_log_debug(NAME" %p: block:%p id:%u flags:%08x type:%u fd:%d",
pool, b, b->this.id, flags, type, fd);
pw_mempool_emit_added(impl, &b->this);
@ -618,6 +618,8 @@ struct pw_memmap * pw_mempool_import_map(struct pw_mempool *pool,
if (map == NULL)
return NULL;
pw_log_debug(NAME" %p: block:%p id:%u", pool, block, block->id);
return map;
}
@ -631,6 +633,9 @@ int pw_mempool_unref_id(struct pw_mempool *pool, uint32_t id)
if (b == NULL)
return -ENOENT;
pw_log_debug(NAME" %p: block:%p id:%d fd:%d ref:%d",
pool, b, id, b->this.fd, b->this.ref);
pw_memblock_unref(&b->this);
return 0;
}
@ -649,7 +654,7 @@ void pw_memblock_free(struct pw_memblock *block)
spa_return_if_fail(block != NULL);
pw_log_debug(NAME" %p: free mem %p id:%d fd:%d ref:%d",
pw_log_debug(NAME" %p: block:%p id:%d fd:%d ref:%d",
pool, block, block->id, block->fd, block->ref);
block->ref++;
@ -681,8 +686,8 @@ struct pw_memblock * pw_mempool_find_ptr(struct pw_mempool *pool, const void *pt
spa_list_for_each(b, &impl->blocks, link) {
spa_list_for_each(m, &b->mappings, link) {
if (ptr >= m->ptr && ptr < SPA_MEMBER(m->ptr, m->size, void)) {
pw_log_debug(NAME" %p: found %p id:%d for %p", pool,
m->block, b->this.id, ptr);
pw_log_debug(NAME" %p: block:%p id:%d for %p", pool,
b, b->this.id, ptr);
return &b->this;
}
}
@ -697,7 +702,7 @@ struct pw_memblock * pw_mempool_find_id(struct pw_mempool *pool, uint32_t id)
struct memblock *b;
b = pw_map_lookup(&impl->map, id);
pw_log_debug(NAME" %p: found %p for %d", pool, b, id);
pw_log_debug(NAME" %p: block:%p for %d", pool, b, id);
if (b == NULL)
return NULL;