X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fport.c;h=7ca86abe5703a8754276721c378b1a3bbb099349;hb=bdb288b3e94e412a33c8647d44f6cfac66ca0665;hp=ff4e4430438998cd201288f13cb133cd20104419;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d;p=babeltrace.git

diff --git a/src/lib/graph/port.c b/src/lib/graph/port.c
index ff4e4430..7ca86abe 100644
--- a/src/lib/graph/port.c
+++ b/src/lib/graph/port.c
@@ -21,8 +21,8 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PORT"
-#include "lib/lib-logging.h"
+#define BT_LOG_TAG "LIB/PORT"
+#include "lib/logging.h"
 
 #include "common/assert.h"
 #include "lib/assert-pre.h"
@@ -44,7 +44,7 @@ void destroy_port(struct bt_object *obj)
 {
 	struct bt_port *port = (void *) obj;
 
-	BT_LIB_LOGD("Destroying port: %!+p", port);
+	BT_LIB_LOGI("Destroying port: %!+p", port);
 
 	if (port->name) {
 		g_string_free(port->name, TRUE);
@@ -66,17 +66,17 @@ struct bt_port *bt_port_create(struct bt_component *parent_component,
 	BT_ASSERT(strlen(name) > 0);
 	port = g_new0(struct bt_port, 1);
 	if (!port) {
-		BT_LOGE_STR("Failed to allocate one port.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one port.");
 		goto end;
 	}
 
-	BT_LIB_LOGD("Creating port for component: %![comp-]+c, port-type=%s, "
+	BT_LIB_LOGI("Creating port for component: %![comp-]+c, port-type=%s, "
 		"port-name=\"%s\"", parent_component, bt_port_type_string(type),
 		name);
 	bt_object_init_shared_with_parent(&port->base, destroy_port);
 	port->name = g_string_new(name);
 	if (!port->name) {
-		BT_LOGE_STR("Failed to allocate one GString.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GString.");
 		BT_OBJECT_PUT_REF_AND_RESET(port);
 		goto end;
 	}
@@ -84,7 +84,7 @@ struct bt_port *bt_port_create(struct bt_component *parent_component,
 	port->type = type;
 	port->user_data = user_data;
 	bt_object_set_parent(&port->base, &parent_component->base);
-	BT_LIB_LOGD("Created port for component: "
+	BT_LIB_LOGI("Created port for component: "
 		"%![comp-]+c, %![port-]+p", parent_component, port);
 
 end:
@@ -93,34 +93,34 @@ end:
 
 const char *bt_port_get_name(const struct bt_port *port)
 {
-	BT_ASSERT_PRE_NON_NULL(port, "Port");
+	BT_ASSERT_PRE_DEV_NON_NULL(port, "Port");
 	return port->name->str;
 }
 
 enum bt_port_type bt_port_get_type(const struct bt_port *port)
 {
-	BT_ASSERT_PRE_NON_NULL(port, "Port");
+	BT_ASSERT_PRE_DEV_NON_NULL(port, "Port");
 	return port->type;
 }
 
 const struct bt_connection *bt_port_borrow_connection_const(
 		const struct bt_port *port)
 {
-	BT_ASSERT_PRE_NON_NULL(port, "Port");
+	BT_ASSERT_PRE_DEV_NON_NULL(port, "Port");
 	return port->connection;
 }
 
 const struct bt_component *bt_port_borrow_component_const(
 		const struct bt_port *port)
 {
-	BT_ASSERT_PRE_NON_NULL(port, "Port");
+	BT_ASSERT_PRE_DEV_NON_NULL(port, "Port");
 	return bt_port_borrow_component_inline(port);
 }
 
 struct bt_self_component *bt_self_component_port_borrow_component(
 		struct bt_self_component_port *port)
 {
-	BT_ASSERT_PRE_NON_NULL(port, "Port");
+	BT_ASSERT_PRE_DEV_NON_NULL(port, "Port");
 	return (void *) bt_object_borrow_parent((void *) port);
 }
 
@@ -134,19 +134,19 @@ void bt_port_set_connection(struct bt_port *port,
 	 * connection exists.
 	 */
 	port->connection = connection;
-	BT_LIB_LOGV("Set port's connection: %![port-]+p, %![conn-]+x", port,
+	BT_LIB_LOGI("Set port's connection: %![port-]+p, %![conn-]+x", port,
 		connection);
 }
 
 bt_bool bt_port_is_connected(const struct bt_port *port)
 {
-	BT_ASSERT_PRE_NON_NULL(port, "Port");
+	BT_ASSERT_PRE_DEV_NON_NULL(port, "Port");
 	return port->connection ? BT_TRUE : BT_FALSE;
 }
 
 void *bt_self_component_port_get_data(const struct bt_self_component_port *port)
 {
-	BT_ASSERT_PRE_NON_NULL(port, "Port");
+	BT_ASSERT_PRE_DEV_NON_NULL(port, "Port");
 	return ((struct bt_port *) port)->user_data;
 }