projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib/graph/port.c: add logging
[babeltrace.git]
/
lib
/
graph
/
port.c
diff --git
a/lib/graph/port.c
b/lib/graph/port.c
index 7a464708e9371a55a49899340685c402fe82acfd..4f974aa1fae91cd1eb1b6b95ef230d7c6e3dc165 100644
(file)
--- a/
lib/graph/port.c
+++ b/
lib/graph/port.c
@@
-26,6
+26,9
@@
* SOFTWARE.
*/
* SOFTWARE.
*/
+#define BT_LOG_TAG "PORT"
+#include <babeltrace/lib-logging-internal.h>
+
#include <babeltrace/graph/port.h>
#include <babeltrace/graph/component-internal.h>
#include <babeltrace/graph/port-internal.h>
#include <babeltrace/graph/port.h>
#include <babeltrace/graph/component-internal.h>
#include <babeltrace/graph/port-internal.h>
@@
-38,9
+41,13
@@
void bt_port_destroy(struct bt_object *obj)
{
struct bt_port *port = container_of(obj, struct bt_port, base);
{
struct bt_port *port = container_of(obj, struct bt_port, base);
+ BT_LOGD("Destroying port: addr=%p, name=\"%s\", comp-addr=%p",
+ port, bt_port_get_name(port), obj->parent);
+
if (port->name) {
g_string_free(port->name, TRUE);
}
if (port->name) {
g_string_free(port->name, TRUE);
}
+
g_free(port);
}
g_free(port);
}
@@
-61,25
+68,39
@@
struct bt_port *bt_port_create(struct bt_component *parent_component,
assert(type == BT_PORT_TYPE_INPUT || type == BT_PORT_TYPE_OUTPUT);
if (strlen(name) == 0) {
assert(type == BT_PORT_TYPE_INPUT || type == BT_PORT_TYPE_OUTPUT);
if (strlen(name) == 0) {
+ BT_LOGW_STR("Invalid parameter: name is an empty string.");
goto end;
}
port = g_new0(struct bt_port, 1);
if (!port) {
goto end;
}
port = g_new0(struct bt_port, 1);
if (!port) {
+ BT_LOGE_STR("Failed to allocate one port.");
goto end;
}
goto end;
}
+ BT_LOGD("Creating port for component: "
+ "comp-addr=%p, comp-name=\"%s\", port-type=%s, "
+ "port-name=\"%s\"",
+ parent_component, bt_component_get_name(parent_component),
+ bt_port_type_string(type), name);
+
bt_object_init(port, bt_port_destroy);
port->name = g_string_new(name);
if (!port->name) {
bt_object_init(port, bt_port_destroy);
port->name = g_string_new(name);
if (!port->name) {
+ BT_LOGE_STR("Failed to allocate one GString.");
BT_PUT(port);
goto end;
}
port->type = type;
port->user_data = user_data;
BT_PUT(port);
goto end;
}
port->type = type;
port->user_data = user_data;
-
bt_object_set_parent(port, &parent_component->base);
bt_object_set_parent(port, &parent_component->base);
+ BT_LOGD("Created port for component: "
+ "comp-addr=%p, comp-name=\"%s\", port-type=%s, "
+ "port-name=\"%s\", port-addr=%p",
+ parent_component, bt_component_get_name(parent_component),
+ bt_port_type_string(type), name, port);
+
end:
return port;
}
end:
return port;
}
@@
-98,11
+119,18
@@
struct bt_connection *bt_port_get_connection(struct bt_port *port)
{
struct bt_connection *connection = NULL;
{
struct bt_connection *connection = NULL;
- if (!port || !port->connection) {
+ if (!port) {
+ BT_LOGW_STR("Invalid parameter: port is NULL.");
+ goto end;
+ }
+
+ if (!port->connection) {
+ /* Not an error: means disconnected */
goto end;
}
connection = bt_get(port->connection);
goto end;
}
connection = bt_get(port->connection);
+
end:
return connection;
}
end:
return connection;
}
@@
-136,6
+164,9
@@
void bt_port_set_connection(struct bt_port *port,
* connection exists.
*/
port->connection = connection;
* connection exists.
*/
port->connection = connection;
+ BT_LOGV("Set port's connection: "
+ "port-addr=%p, port-name=\"%s\", conn-addr=%p",
+ port, bt_port_get_name(port), connection);
}
int bt_private_port_remove_from_component(
}
int bt_private_port_remove_from_component(
@@
-146,11
+177,14
@@
int bt_private_port_remove_from_component(
struct bt_component *comp = NULL;
if (!port) {
struct bt_component *comp = NULL;
if (!port) {
+ BT_LOGW_STR("Invalid parameter: private port is NULL.");
ret = -1;
goto end;
}
comp = (void *) bt_object_get_parent(port);
ret = -1;
goto end;
}
comp = (void *) bt_object_get_parent(port);
+
+ /* bt_component_remove_port() logs details */
ret = bt_component_remove_port(comp, port);
end:
ret = bt_component_remove_port(comp, port);
end:
@@
-163,12
+197,16
@@
int bt_port_disconnect(struct bt_port *port)
int ret = 0;
if (!port) {
int ret = 0;
if (!port) {
+ BT_LOGW_STR("Invalid parameter: port is NULL.");
ret = -1;
goto end;
}
if (port->connection) {
bt_connection_disconnect_ports(port->connection);
ret = -1;
goto end;
}
if (port->connection) {
bt_connection_disconnect_ports(port->connection);
+ BT_LOGV("Disconnected port: "
+ "port-addr=%p, port-name=\"%s\"",
+ port, bt_port_get_name(port));
}
end:
}
end:
@@
-180,6
+218,7
@@
bt_bool bt_port_is_connected(struct bt_port *port)
int ret;
if (!port) {
int ret;
if (!port) {
+ BT_LOGW_STR("Invalid parameter: port is NULL.");
ret = -1;
goto end;
}
ret = -1;
goto end;
}
This page took
0.027077 seconds
and
4
git commands to generate.