lby/mr-library
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.优化错误码，默认为负。

Browse Source
This commit is contained in:
MacRsh
2023-10-14 11:14:33 +08:00
parent 7397961529
commit 90bfcf8bbc
4 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
module/eloop/eloop.c
View File

@@ -64,8 +64,8 @@ mr_err_t mr_eloop_add(mr_eloop_t eloop, const char *name, mr_size_t queue_size)
mem = mr_malloc(queue_size * sizeof(*mem));
if (mem == MR_NULL)
{
MR_DEBUG_D(DEBUG_TAG, "[%s] add failed: [%d]\r\n", name, -MR_ERR_NO_MEMORY);
return -MR_ERR_NO_MEMORY;
MR_DEBUG_D(DEBUG_TAG, "[%s] add failed: [%d]\r\n", name, MR_ERR_NO_MEMORY);
return MR_ERR_NO_MEMORY;
}
/* Initialize the private fields */
@@ -142,7 +142,7 @@ void mr_eloop_handle(mr_eloop_t eloop)
mr_event_t event = (mr_event_t)mr_avl_find(eloop->list, id);
if (event == MR_NULL)
{
MR_DEBUG_D(DEBUG_TAG, "[%s] handle [%d] failed: [%d]\r\n", eloop->object.name, id, -MR_ERR_NOT_FOUND);
MR_DEBUG_D(DEBUG_TAG, "[%s] handle [%d] failed: [%d]\r\n", eloop->object.name, id, MR_ERR_NOT_FOUND);
continue;
}
@@ -172,15 +172,15 @@ mr_err_t mr_eloop_create_event(mr_eloop_t eloop, mr_uint32_t id, mr_err_t (*cb)(
/* Check if the event already exists */
if (mr_avl_find(eloop->list, id) != MR_NULL)
{
MR_DEBUG_D(DEBUG_TAG, "[%s] created event [%d] failed: [%d]\r\n", eloop->object.name, id, -MR_ERR_BUSY);
return -MR_ERR_BUSY;
MR_DEBUG_D(DEBUG_TAG, "[%s] created event [%d] failed: [%d]\r\n", eloop->object.name, id, MR_ERR_BUSY);
return MR_ERR_BUSY;
}
event = (mr_event_t)mr_malloc(sizeof(struct mr_event));
if (event == MR_NULL)
{
MR_DEBUG_D(DEBUG_TAG, "[%s] created event [%d] failed: [%d]\r\n", eloop->object.name, id, -MR_ERR_BUSY);
return -MR_ERR_NO_MEMORY;
MR_DEBUG_D(DEBUG_TAG, "[%s] created event [%d] failed: [%d]\r\n", eloop->object.name, id, MR_ERR_BUSY);
return MR_ERR_NO_MEMORY;
}
/* Initialize the private fields */
@@ -219,8 +219,8 @@ mr_err_t mr_eloop_delete_event(mr_eloop_t eloop, mr_uint32_t id)
event = (mr_event_t)mr_avl_find(eloop->list, id);
if (event == MR_NULL)
{
MR_DEBUG_D(DEBUG_TAG, "[%s] delete event [%d] failed: [%d]\r\n", eloop->object.name, id, -MR_ERR_NOT_FOUND);
return -MR_ERR_NOT_FOUND;
MR_DEBUG_D(DEBUG_TAG, "[%s] delete event [%d] failed: [%d]\r\n", eloop->object.name, id, MR_ERR_NOT_FOUND);
return MR_ERR_NOT_FOUND;
}
/* Disable interrupt */
@@ -253,8 +253,8 @@ mr_err_t mr_eloop_notify_event(mr_eloop_t eloop, mr_uint32_t id)
if (mr_rb_write(&eloop->queue, &id, sizeof(id)) != sizeof(id))
{
MR_DEBUG_D(DEBUG_TAG, "[%s] notify event [%d] failed: [%d]\r\n", eloop->object.name, id, -MR_ERR_BUSY);
return -MR_ERR_BUSY;
MR_DEBUG_D(DEBUG_TAG, "[%s] notify event [%d] failed: [%d]\r\n", eloop->object.name, id, MR_ERR_BUSY);
return MR_ERR_BUSY;
}
return MR_ERR_OK;
@@ -277,8 +277,8 @@ mr_err_t mr_eloop_trigger_event(mr_eloop_t eloop, mr_uint32_t id)
mr_event_t event = (mr_event_t)mr_avl_find(eloop->list, id);
if (event == MR_NULL)
{
MR_DEBUG_D(DEBUG_TAG, "[%s] trigger event [%d] failed: [%d]\r\n", eloop->object.name, id, -MR_ERR_NOT_FOUND);
return -MR_ERR_NOT_FOUND;
MR_DEBUG_D(DEBUG_TAG, "[%s] trigger event [%d] failed: [%d]\r\n", eloop->object.name, id, MR_ERR_NOT_FOUND);
return MR_ERR_NOT_FOUND;
}
/* Call the event callback */

10
module/eloop/eloop.h
View File

@@ -12,7 +12,11 @@
#define _ELOOP_H_
#include "mrapi.h"
#define MR_CFG_ELOOP MR_CFG_ENABLE
#ifdef __cplusplus
extern "C" {
#endif
#if (MR_CFG_ELOOP == MR_CFG_ENABLE)
/**
@@ -44,4 +48,8 @@ mr_uint32_t mr_eloop_string_to_id(const char *string, mr_size_t size);
#endif
#ifdef __cplusplus
}
#endif
#endif /* _ELOOP_H_ */

34
module/eloop_sp/eloop_sp.c
View File

@@ -65,16 +65,16 @@ mr_err_t mr_eloop_sp_add(mr_eloop_sp_t eloop, const char *name, mr_size_t queue_
queue_mem = mr_malloc(queue_size * sizeof(*queue_mem));
if (queue_mem == MR_NULL)
{
MR_DEBUG_D(DEBUG_TAG, "[%s] add failed: [%d]\r\n", name, -MR_ERR_NO_MEMORY);
return -MR_ERR_NO_MEMORY;
MR_DEBUG_D(DEBUG_TAG, "[%s] add failed: [%d]\r\n", name, MR_ERR_NO_MEMORY);
return MR_ERR_NO_MEMORY;
}
list_mem = mr_malloc(event_size * sizeof(struct mr_event_sp));
if (list_mem == MR_NULL)
{
MR_DEBUG_D(DEBUG_TAG, "[%s] add failed: [%d]\r\n", name, -MR_ERR_NO_MEMORY);
MR_DEBUG_D(DEBUG_TAG, "[%s] add failed: [%d]\r\n", name, MR_ERR_NO_MEMORY);
mr_free(queue_mem);
return -MR_ERR_NO_MEMORY;
return MR_ERR_NO_MEMORY;
}
mr_memset(list_mem, 0, event_size * sizeof(struct mr_event_sp));
@@ -157,7 +157,7 @@ void mr_eloop_sp_handle(mr_eloop_sp_t eloop)
if (event[id].cb == MR_NULL)
{
MR_DEBUG_D(DEBUG_TAG, "[%s] handle [%d] failed: [%d]\r\n", eloop->object.name, id, -MR_ERR_NOT_FOUND);
MR_DEBUG_D(DEBUG_TAG, "[%s] handle [%d] failed: [%d]\r\n", eloop->object.name, id, MR_ERR_NOT_FOUND);
continue;
}
@@ -192,15 +192,15 @@ mr_err_t mr_eloop_sp_create_event(mr_eloop_sp_t eloop,
/* Check if the event id is valid */
if (id >= eloop->list_size)
{
MR_DEBUG_D(DEBUG_TAG, "[%s] create event [%d] failed: [%d]\r\n", eloop->object.name, id, -MR_ERR_INVALID);
return -MR_ERR_INVALID;
MR_DEBUG_D(DEBUG_TAG, "[%s] create event [%d] failed: [%d]\r\n", eloop->object.name, id, MR_ERR_INVALID);
return MR_ERR_INVALID;
}
/* Check if the event is busy */
if (event[id].cb != MR_NULL)
{
MR_DEBUG_D(DEBUG_TAG, "[%s] create event [%d] failed: [%d]\r\n", eloop->object.name, id, -MR_ERR_BUSY);
return -MR_ERR_BUSY;
MR_DEBUG_D(DEBUG_TAG, "[%s] create event [%d] failed: [%d]\r\n", eloop->object.name, id, MR_ERR_BUSY);
return MR_ERR_BUSY;
}
/* Initialize the private fields */
@@ -228,8 +228,8 @@ mr_err_t mr_eloop_sp_delete_event(mr_eloop_sp_t eloop, mr_uint8_t id)
/* Check if the event id is valid */
if (id >= eloop->list_size)
{
MR_DEBUG_D(DEBUG_TAG, "[%s] delete event [%d] failed: [%d]\r\n", eloop->object.name, id, -MR_ERR_INVALID);
return -MR_ERR_INVALID;
MR_DEBUG_D(DEBUG_TAG, "[%s] delete event [%d] failed: [%d]\r\n", eloop->object.name, id, MR_ERR_INVALID);
return MR_ERR_INVALID;
}
/* Check if the event is idle */
@@ -262,13 +262,13 @@ mr_err_t mr_eloop_sp_notify_event(mr_eloop_sp_t eloop, mr_uint8_t id)
if (id >= eloop->list_size)
{
MR_DEBUG_D(DEBUG_TAG, "[%s] notify event [%d] failed: [%d]\r\n", eloop->object.name, id - MR_ERR_INVALID);
return -MR_ERR_INVALID;
return MR_ERR_INVALID;
}
if (mr_rb_push(&eloop->queue, id) != sizeof(id))
{
MR_DEBUG_D(DEBUG_TAG, "[%s] notify event [%d] failed: [%d]\r\n", eloop->object.name, id, -MR_ERR_BUSY);
return -MR_ERR_BUSY;
MR_DEBUG_D(DEBUG_TAG, "[%s] notify event [%d] failed: [%d]\r\n", eloop->object.name, id, MR_ERR_BUSY);
return MR_ERR_BUSY;
}
return MR_ERR_OK;
@@ -293,14 +293,14 @@ mr_err_t mr_eloop_sp_trigger_event(mr_eloop_sp_t eloop, mr_uint8_t id)
if (id >= eloop->list_size)
{
MR_DEBUG_D(DEBUG_TAG, "[%s] trigger event [%d] failed: [%d]\r\n", eloop->object.name, id - MR_ERR_INVALID);
return -MR_ERR_INVALID;
return MR_ERR_INVALID;
}
/* Check if the event is idle */
if (event[id].cb == MR_NULL)
{
MR_DEBUG_D(DEBUG_TAG, "[%s] handle [%d] failed: [%d]\r\n", eloop->object.name, id, -MR_ERR_NOT_FOUND);
return -MR_ERR_NOT_FOUND;
MR_DEBUG_D(DEBUG_TAG, "[%s] handle [%d] failed: [%d]\r\n", eloop->object.name, id, MR_ERR_NOT_FOUND);
return MR_ERR_NOT_FOUND;
}
/* Call the event callback */

8
module/eloop_sp/eloop_sp.h
View File

@@ -13,6 +13,10 @@
#include "mrapi.h"
#ifdef __cplusplus
extern "C" {
#endif
#if (MR_CFG_ELOOP_SP == MR_CFG_ENABLE)
/**
@@ -47,4 +51,8 @@ mr_err_t mr_eloop_sp_trigger_event(mr_eloop_sp_t eloop, mr_uint8_t id);
#endif
#ifdef __cplusplus
}
#endif
#endif /* _ELOOP_SP_H_ */