From 1d2bca9cb00606cfb06cc2e7d17cd056da2becac Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Wed, 9 Aug 2017 11:17:56 +0200 Subject: [PATCH 1/1] less bprintf (some were completely useless) --- src/bindings/java/jmsg_process.cpp | 6 +++--- src/bindings/java/jmsg_task.cpp | 2 +- src/kernel/routing/ClusterZone.cpp | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/bindings/java/jmsg_process.cpp b/src/bindings/java/jmsg_process.cpp index 184e259cf5..000d1d4c4a 100644 --- a/src/bindings/java/jmsg_process.cpp +++ b/src/bindings/java/jmsg_process.cpp @@ -101,7 +101,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_fromPID(JNIEnv * env, jcl msg_process_t process = MSG_process_from_PID(pid); if (not process) { - jxbt_throw_process_not_found(env, bprintf("PID = %d",static_cast(pid))); + jxbt_throw_process_not_found(env, std::string("PID = ") + std::to_string(static_cast(pid))); return nullptr; } @@ -156,7 +156,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_suspend(JNIEnv * env, jobjec /* try to suspend the process */ msg_error_t rv = MSG_process_suspend(process); - jxbt_check_res("MSG_process_suspend()", rv, MSG_OK, bprintf("unexpected error , please report this bug")); + jxbt_check_res("MSG_process_suspend()", rv, MSG_OK, "unexpected error , please report this bug"); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_resume(JNIEnv * env, jobject jprocess) @@ -170,7 +170,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_resume(JNIEnv * env, jobject /* try to resume the process */ msg_error_t res = MSG_process_resume(process); - jxbt_check_res("MSG_process_resume()", res, MSG_OK, bprintf("unexpected error , please report this bug")); + jxbt_check_res("MSG_process_resume()", res, MSG_OK, "unexpected error , please report this bug"); } JNIEXPORT void diff --git a/src/bindings/java/jmsg_task.cpp b/src/bindings/java/jmsg_task.cpp index 47dfe47f93..eb5ca2ddb6 100644 --- a/src/bindings/java/jmsg_task.cpp +++ b/src/bindings/java/jmsg_task.cpp @@ -112,7 +112,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_cancel(JNIEnv * env, jobject jt msg_error_t rv = MSG_task_cancel(ptask); - jxbt_check_res("MSG_task_cancel()", rv, MSG_OK, bprintf("unexpected error , please report this bug")); + jxbt_check_res("MSG_task_cancel()", rv, MSG_OK, "unexpected error , please report this bug"); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_execute(JNIEnv * env, jobject jtask) diff --git a/src/kernel/routing/ClusterZone.cpp b/src/kernel/routing/ClusterZone.cpp index 501722560d..9467b8de99 100644 --- a/src/kernel/routing/ClusterZone.cpp +++ b/src/kernel/routing/ClusterZone.cpp @@ -121,7 +121,7 @@ void ClusterZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges void ClusterZone::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int /*rank*/, int position) { - char* link_id = bprintf("%s_link_%d", cluster->id, id); + std::string link_id = std::string(cluster->id) + "_link_" + std::to_string(id); LinkCreationArgs link; link.id = link_id; @@ -135,13 +135,12 @@ void ClusterZone::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id if (link.policy == SURF_LINK_FULLDUPLEX) { std::string tmp_link = std::string(link_id) + "_UP"; linkUp = surf::LinkImpl::byName(tmp_link); - tmp_link = bprintf("%s_DOWN", link_id); + tmp_link = std::string(link_id) + "_DOWN"; linkDown = surf::LinkImpl::byName(tmp_link); } else { linkUp = surf::LinkImpl::byName(link_id); linkDown = linkUp; } - xbt_free(link_id); privateLinks_.insert({position, {linkUp, linkDown}}); } } -- 2.20.1