[dialog] added profiling on signaling API functions

Author: bogdan-iancu

modules/callops/callops.c

@@ -918,7 +918,7 @@ static mi_response_t *mi_call_blind_transfer(const mi_params_t *params,
 				call_transfer_dlg_callback, 0, 0);
 	}
 
-	if (call_dlg_api.send_indialog_request(dlg, &refer,
+	if (run_dlg_api(&call_dlg_api, send_indialog_request, dlg, &refer,
 			(caller?DLG_CALLER_LEG:callee_idx(dlg)), NULL, NULL, refer_hdr,
 			mi_call_transfer_reply, async_hdl, NULL) < 0) {
 		LM_ERR("could not send the transfer message!\n");
@@ -1063,7 +1063,7 @@ static mi_response_t *mi_call_attended_transfer(const mi_params_t *params,
 		call_dlg_api.register_dlgcb(dlgA, DLGCB_REQ_WITHIN,
 				call_transfer_dlg_callback, 0, 0);
 
-	if (call_dlg_api.send_indialog_request(dlgA, &refer,
+	if (run_dlg_api(&call_dlg_api, send_indialog_request, dlgA, &refer,
 			(callerA?DLG_CALLER_LEG:callee_idx(dlgA)), NULL, NULL, refer_hdr,
 			mi_call_transfer_reply, async_hdl, NULL) < 0) {
 		LM_ERR("could not send the transfer message!\n");
@@ -1215,7 +1215,7 @@ static int call_put_leg_onhold(struct dlg_cell *dlg, int leg, unsigned mode, str
 	RAISE_CALL_EVENT(HOLD, &dlg->callid, &sleg, &action, &state, NULL);
 
 	/* send it out */
-	ret = call_dlg_api.send_indialog_request(dlg, &invite, leg, &body, &ct,
+	ret = run_dlg_api(&call_dlg_api, send_indialog_request, dlg, &invite, leg, &body, &ct,
 			hdrs, mi_call_hold_reply, (void *)(long)param, NULL);
 	pkg_free(body.s);
 	if (ret < 0) {
@@ -1276,7 +1276,7 @@ static int call_resume_leg_onhold(struct dlg_cell *dlg, int leg, unsigned mode,
 	param |= mode;
 
 	RAISE_CALL_EVENT(HOLD, &dlg->callid, &sleg, &action, &state, NULL);
-	if (call_dlg_api.send_indialog_request(dlg, &invite, leg, &body, &ct,
+	if (run_dlg_api(&call_dlg_api, send_indialog_request, dlg, &invite, leg, &body, &ct,
 			hdrs, mi_call_hold_reply, (void *)(long)param, NULL) < 0) {
 		init_str(&state, "fail");
 		RAISE_CALL_EVENT(HOLD, &dlg->callid, &sleg, &action, &state, NULL);
@@ -1533,7 +1533,7 @@ static int w_call_blind_transfer(struct sip_msg *req, int leg, str *dst)
 				call_transfer_dlg_callback, 0, 0);
 	}
 
-	if (call_dlg_api.send_indialog_request(dlg, &refer,
+	if (run_dlg_api(&call_dlg_api, send_indialog_request, dlg, &refer,
 			(leg == DLG_CALLER_LEG?DLG_CALLER_LEG:callee_idx(dlg)), NULL, NULL,
 			refer_hdr, mi_call_transfer_reply, NULL, NULL) < 0) {
 		LM_ERR("could not send the transfer message!\n");
@@ -1620,7 +1620,7 @@ static int w_call_attended_transfer(struct sip_msg *req, int leg,
 		call_dlg_api.register_dlgcb(dlgA, DLGCB_REQ_WITHIN,
 				call_transfer_dlg_callback, 0, 0);
 
-	if (call_dlg_api.send_indialog_request(dlgA, &refer,
+	if (run_dlg_api(&call_dlg_api, send_indialog_request, dlgA, &refer,
 			(leg == DLG_CALLER_LEG?DLG_CALLER_LEG:callee_idx(dlgA)), NULL, NULL,
 			refer_hdr, mi_call_transfer_reply, NULL, NULL) < 0) {
 		LM_ERR("could not send the transfer message!\n");

modules/cgrates/cgrates_acc.c

@@ -1072,7 +1072,7 @@ static void cgr_tmcb_func(struct cell* t, int type, struct tmcb_params *ps)
 	/* TODO: should we close all the started sessions now? */
 	terminate_str.s = "CGRateS Accounting Denied";
 	terminate_str.len = strlen(terminate_str.s);
-	if (cgr_dlgb.terminate_dlg(NULL, dlg->h_entry, dlg->h_id, &terminate_str) >= 0)
+	if (run_dlg_api(&cgr_dlgb, terminate_dlg, NULL, dlg->h_entry, dlg->h_id, &terminate_str) >= 0)
 		return;
 	LM_ERR("cannot terminate the dialog!\n");
 unref:
@@ -1425,7 +1425,7 @@ int cgr_acc_terminate(json_object *param, json_object **ret)
 		terminate_str.s = terminate_str_pre.s;
 		terminate_str.len = terminate_str_pre.len - 2 /* skip the ': ' */;
 	}
-	if (cgr_dlgb.terminate_dlg(NULL, h_entry, h_id, &terminate_str) < 0) {
+	if (run_dlg_api(&cgr_dlgb, terminate_dlg, NULL, h_entry, h_id, &terminate_str) < 0) {
 		if (terminate_str.s != terminate_str_pre.s)
 			pkg_free(terminate_str.s);
 		err = "cannot terminate dialog";

modules/dialog/dlg_load.h

@@ -27,6 +27,7 @@
 #include "dlg_handlers.h"
 #include "dlg_profile.h"
 #include "dlg_vals.h"
+#include "../../profiling.h"
 #include "../../sr_module.h"
 
 typedef struct dlg_cell *(*get_dlg_f) (void);
@@ -102,5 +103,14 @@ static inline int load_dlg_api( struct dlg_binds *dlgb )
 	return 0;
 }
 
+#define run_dlg_api(_dlg_api, _api_func, _args...) \
+	({ \
+		typeof((_dlg_api)->_api_func(_args)) _dlg_api_rc; \
+		profiling_proc_enter(#_api_func, 0); \
+		_dlg_api_rc = (_dlg_api)->_api_func(_args); \
+		profiling_proc_exit(#_api_func, (int)(intptr_t)_dlg_api_rc); \
+		_dlg_api_rc; \
+	})
+
 
 #endif

modules/media_exchange/media_exchange.c

@@ -871,7 +871,7 @@ static int media_exchange_to_call(struct sip_msg *msg, str *callid, int leg, int
 
 	/* all good - send the invite to the client */
 	MSL_REF(msl);
-	if (media_dlg.send_indialog_request(dlg, &inv, MEDIA_SESSION_DLG_LEG(msl), &body,
+	if (run_dlg_api(&media_dlg, send_indialog_request, dlg, &inv, MEDIA_SESSION_DLG_LEG(msl), &body,
 			&msg->content_type->body, NULL, media_session_exchange_server_reply, mslp,
 			media_session_exchange_server_release) < 0) {
 		LM_ERR("could not send indialog request for callid %.*s\n", callid->len, callid->s);
@@ -1292,7 +1292,7 @@ static void handle_media_session_negative(struct media_session_leg *msl)
 		body = NULL;
 	else
 		body = &sbody;
-	if (media_dlg.send_indialog_request(msl->ms->dlg,
+	if (run_dlg_api(&media_dlg, send_indialog_request, msl->ms->dlg,
 			&inv, dlg_leg, body, &content_type_sdp, NULL,
 			media_session_exchange_negative_reply, msl, NULL) < 0) {
 		LM_ERR("could not forward INVITE!\n");

modules/media_exchange/media_sessions.c

@@ -329,7 +329,7 @@ int media_session_reinvite(struct media_session_leg *msl, int leg, str *body)
 			}
 		}
 	}
-	ret = media_dlg.send_indialog_request(msl->ms->dlg, &inv, leg, body, &content_type_sdp, NULL,
+	ret = run_dlg_api(&media_dlg, send_indialog_request, msl->ms->dlg, &inv, leg, body, &content_type_sdp, NULL,
 			(p?media_session_reinvite_reply:NULL),p, NULL);
 	if (p && ret < 0) {
 		MSL_UNREF(msl);

modules/rtp_relay/rtp_relay_ctx.c

@@ -2379,7 +2379,7 @@ static int rtp_relay_reinvite(struct rtp_relay_tmp *tmp, int leg,
 	static str inv = str_init("INVITE");
 	static str content_type_sdp = str_init("application/sdp");
 
-	int ret = rtp_relay_dlg.send_indialog_request(tmp->dlg,
+	int ret = run_dlg_api(&rtp_relay_dlg, send_indialog_request, tmp->dlg,
 			&inv, leg, body, &content_type_sdp, NULL,
 			rtp_relay_reinvite_reply, tmp, NULL);
 	if (body && release_body)

modules/rtpengine/rtpengine.c

@@ -1517,7 +1517,7 @@ static mi_response_t *mi_teardown_call(const mi_params_t *params,
 	/* try to "resolve" the callid first through rtp_relay */
 	if (!rtp_relay.get_dlg_ids || rtp_relay.get_dlg_ids(&callid, &h_entry, &h_id) == 0)
 		pcallid = &callid; /* search for callid, if dialog was not found */
-	if (dlgb.terminate_dlg(pcallid, h_entry, h_id, _str("MI Termination")) < 0)
+	if (run_dlg_api(&dlgb, terminate_dlg, pcallid, h_entry, h_id, _str("MI Termination")) < 0)
 		return init_mi_error(500, MI_SSTR("Failed to terminate dialog"));
 
 	return init_mi_result_ok();

modules/rtpproxy/notification_process.c

@@ -83,7 +83,7 @@ static int notification_handler(str *command)
 			LM_INFO("Timeout notification for %.*s\n", param.len, param.s);
 			if (parse_dlg_did(&param, &h_entry, &h_id) < 0)
 				return -1;
-			if(dlg_api.terminate_dlg(NULL, h_entry, h_id, &terminate_reason)< 0)
+			if(run_dlg_api(&dlg_api, terminate_dlg, NULL, h_entry, h_id, &terminate_reason)< 0)
 				LM_ERR("Failed to terminate dialog h_entry=[%u], h_id=[%u]\n", h_entry, h_id);
 			return 0;
 		case 'D':