osaf/libs/core/leap/include/sysf_exc_scr.h | 10 ----------
osaf/libs/core/leap/sysf_exc_scr.c | 10 +++++-----
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/osaf/libs/core/leap/include/sysf_exc_scr.h
b/osaf/libs/core/leap/include/sysf_exc_scr.h
--- a/osaf/libs/core/leap/include/sysf_exc_scr.h
+++ b/osaf/libs/core/leap/include/sysf_exc_scr.h
@@ -81,16 +81,6 @@ typedef struct sysf_execute_module_cb {
bool init;
} SYSF_EXECUTE_MODULE_CB;
-#define m_MMGR_ALLOC_PRO_EXC (SYSF_PID_LIST*)
m_NCS_MEM_ALLOC(sizeof(SYSF_PID_LIST),\
- NCS_MEM_REGION_PERSISTENT, \
- NCS_SERVICE_ID_COMMON, \
- 0)
-
-#define m_MMGR_FREE_PRO_EXC(p) m_NCS_MEM_FREE(p, \
- NCS_MEM_REGION_PERSISTENT, \
- NCS_SERVICE_ID_COMMON, \
- 0)
-
#ifndef NCS_EXEC_MOD_STACKSIZE
#define NCS_EXEC_MOD_STACKSIZE NCS_STACKSIZE_HUGE
diff --git a/osaf/libs/core/leap/sysf_exc_scr.c
b/osaf/libs/core/leap/sysf_exc_scr.c
--- a/osaf/libs/core/leap/sysf_exc_scr.c
+++ b/osaf/libs/core/leap/sysf_exc_scr.c
@@ -216,7 +216,7 @@ void ncs_exec_mod_hdlr(void)
ncs_patricia_tree_del(&module_cb.pid_list,
(NCS_PATRICIA_NODE *)exec_pid);
- m_MMGR_FREE_PRO_EXC(exec_pid);
+ free(exec_pid);
m_NCS_UNLOCK(&module_cb.tree_lock, NCS_LOCK_WRITE);
} else {
@@ -300,7 +300,7 @@ void give_exec_mod_cb(int pid, uint32_t
/* Remove entry from pat tree */
ncs_patricia_tree_del(&module_cb.pid_list,
(NCS_PATRICIA_NODE *)exec_pid);
- m_MMGR_FREE_PRO_EXC(exec_pid);
+ free(exec_pid);
}
}
m_NCS_UNLOCK(&module_cb.tree_lock, NCS_LOCK_WRITE);
@@ -330,7 +330,7 @@ uint32_t add_new_req_pid_in_list(NCS_OS_
if (module_cb.init == false)
return m_LEAP_DBG_SINK(NCSCC_RC_SUCCESS);
- if (NULL == (list_entry = m_MMGR_ALLOC_PRO_EXC))
+ if (NULL == (list_entry = (SYSF_PID_LIST *)
malloc(sizeof(SYSF_PID_LIST))))
return m_LEAP_DBG_SINK(NCSCC_RC_FAILURE);
list_entry->timeout_in_ms = req->i_timeout_in_ms;
@@ -344,7 +344,7 @@ uint32_t add_new_req_pid_in_list(NCS_OS_
m_NCS_LOCK(&module_cb.tree_lock, NCS_LOCK_WRITE);
if (NCSCC_RC_SUCCESS != ncs_patricia_tree_add(&module_cb.pid_list,
(NCS_PATRICIA_NODE *)list_entry)) {
- m_MMGR_FREE_PRO_EXC(list_entry);
+ free(list_entry);
return m_LEAP_DBG_SINK(NCSCC_RC_FAILURE);
}
@@ -479,7 +479,7 @@ uint32_t exec_mod_cb_destroy(void)
if (exec_pid->tmr_id != NULL)
m_NCS_TMR_DESTROY(exec_pid->tmr_id);
- m_MMGR_FREE_PRO_EXC(exec_pid);
+ free(exec_pid);
}
if (ncs_patricia_tree_destroy(&module_cb.pid_list) !=
NCSCC_RC_SUCCESS) {
------------------------------------------------------------------------------
Sponsored by Intel(R) XDK
Develop, test and display web and hybrid apps with a single code base.
Download it for free now!
http://pubads.g.doubleclick.net/gampad/clk?id=111408631&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
