Skip to content

Commit 1a5b3e0

Browse files
author
Cruz Monrreal
authored
Merge pull request #7725 from SenRamakri/sen_LwipMbedErrorUpdate
Update Lwip error calls to use new error codes and mbed_error call
2 parents e85acac + 01c46f0 commit 1a5b3e0

File tree

1 file changed

+28
-18
lines changed

1 file changed

+28
-18
lines changed

‎features/lwipstack/lwip-sys/arch/lwip_sys_arch.c

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,15 @@ u32_t sys_now(void) {
123123
*---------------------------------------------------------------------------*/
124124
err_t sys_mbox_new(sys_mbox_t *mbox, int queue_sz) {
125125
if (queue_sz > MB_SIZE)
126-
error("sys_mbox_new size error\n");
126+
MBED_ERROR1(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_INVALID_SIZE), "sys_mbox_new size error\n", queue_sz);
127127

128128
memset(mbox, 0, sizeof(*mbox));
129129

130130
mbox->attr.cb_mem = &mbox->data;
131131
mbox->attr.cb_size = sizeof(mbox->data);
132132
mbox->id = osEventFlagsNew(&mbox->attr);
133133
if (mbox->id == NULL)
134-
error("sys_mbox_new create error\n");
134+
MBED_ERROR1(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_FAILED_OPERATION), "sys_mbox_new create error\n", (u32_t)mbox);
135135

136136
osEventFlagsSet(mbox->id, SYS_MBOX_POST_EVENT);
137137

@@ -150,7 +150,7 @@ err_t sys_mbox_new(sys_mbox_t *mbox, int queue_sz) {
150150
*---------------------------------------------------------------------------*/
151151
void sys_mbox_free(sys_mbox_t *mbox) {
152152
if (mbox->post_idx != mbox->fetch_idx)
153-
error("sys_mbox_free error\n");
153+
MBED_ERROR1(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_INVALID_INDEX), "sys_mbox_free error\n", (u32_t)mbox->fetch_idx);
154154
}
155155

156156
/*---------------------------------------------------------------------------*
@@ -194,8 +194,10 @@ void sys_mbox_post(sys_mbox_t *mbox, void *msg) {
194194
err_t sys_mbox_trypost(sys_mbox_t *mbox, void *msg) {
195195
uint32_t flags = osEventFlagsWait(mbox->id, SYS_MBOX_POST_EVENT,
196196
osFlagsWaitAny | osFlagsNoClear, 0);
197-
if ((flags & osFlagsError) || !(flags & SYS_MBOX_POST_EVENT))
197+
if ((flags & osFlagsError) || !(flags & SYS_MBOX_POST_EVENT)) {
198+
MBED_WARNING1(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_FAILED_OPERATION), "sys_mbox_trypost error\n", flags);
198199
return ERR_MEM;
200+
}
199201

200202
int state = osKernelLock();
201203

@@ -239,8 +241,10 @@ u32_t sys_arch_mbox_fetch(sys_mbox_t *mbox, void **msg, u32_t timeout) {
239241
uint32_t start = osKernelGetTickCount();
240242
uint32_t flags = osEventFlagsWait(mbox->id, SYS_MBOX_FETCH_EVENT,
241243
osFlagsWaitAny | osFlagsNoClear, (timeout ? timeout : osWaitForever));
242-
if ((flags & osFlagsError) || !(flags & SYS_MBOX_FETCH_EVENT))
244+
if ((flags & osFlagsError) || !(flags & SYS_MBOX_FETCH_EVENT)) {
245+
MBED_WARNING1(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_TIME_OUT), "sys_arch_mbox_fetch time-out\n", flags);
243246
return SYS_ARCH_TIMEOUT;
247+
}
244248

245249
int state = osKernelLock();
246250

@@ -273,8 +277,10 @@ u32_t sys_arch_mbox_fetch(sys_mbox_t *mbox, void **msg, u32_t timeout) {
273277
u32_t sys_arch_mbox_tryfetch(sys_mbox_t *mbox, void **msg) {
274278
uint32_t flags = osEventFlagsWait(mbox->id, SYS_MBOX_FETCH_EVENT,
275279
osFlagsWaitAny | osFlagsNoClear, 0);
276-
if ((flags & osFlagsError) || !(flags & SYS_MBOX_FETCH_EVENT))
280+
if ((flags & osFlagsError) || !(flags & SYS_MBOX_FETCH_EVENT)) {
281+
MBED_WARNING1(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_FAILED_OPERATION), "sys_arch_mbox_tryfetch empty\n", flags);
277282
return SYS_MBOX_EMPTY;
283+
}
278284

279285
int state = osKernelLock();
280286

@@ -309,7 +315,7 @@ err_t sys_sem_new(sys_sem_t *sem, u8_t count) {
309315
sem->attr.cb_size = sizeof(sem->data);
310316
sem->id = osSemaphoreNew(UINT16_MAX, count, &sem->attr);
311317
if (sem->id == NULL)
312-
error("sys_sem_new create error\n");
318+
MBED_ERROR1(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_FAILED_OPERATION), "sys_sem_new create error\n", (u32_t)sem);
313319

314320
return ERR_OK;
315321
}
@@ -340,8 +346,10 @@ err_t sys_sem_new(sys_sem_t *sem, u8_t count) {
340346
u32_t sys_arch_sem_wait(sys_sem_t *sem, u32_t timeout) {
341347
u32_t start = osKernelGetTickCount();
342348

343-
if (osSemaphoreAcquire(sem->id, (timeout != 0)?(timeout):(osWaitForever)) != osOK)
349+
if (osSemaphoreAcquire(sem->id, (timeout != 0)?(timeout):(osWaitForever)) != osOK) {
350+
MBED_WARNING1(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_TIME_OUT), "sys_arch_sem_wait time out\n", (u32_t)sem);
344351
return SYS_ARCH_TIMEOUT;
352+
}
345353

346354
return osKernelGetTickCount() - start;
347355
}
@@ -356,7 +364,7 @@ u32_t sys_arch_sem_wait(sys_sem_t *sem, u32_t timeout) {
356364
*---------------------------------------------------------------------------*/
357365
void sys_sem_signal(sys_sem_t *data) {
358366
if (osSemaphoreRelease(data->id) != osOK)
359-
mbed_die(); /* Can be called by ISR do not use printf */
367+
MBED_ERROR1(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_SEMAPHORE_UNLOCK_FAILED), "sys_sem_signal error\n", (u32_t)data->id);
360368
}
361369

362370
/*---------------------------------------------------------------------------*
@@ -378,8 +386,10 @@ err_t sys_mutex_new(sys_mutex_t *mutex) {
378386
mutex->attr.cb_mem = &mutex->data;
379387
mutex->attr.cb_size = sizeof(mutex->data);
380388
mutex->id = osMutexNew(&mutex->attr);
381-
if (mutex->id == NULL)
389+
if (mutex->id == NULL) {
390+
MBED_WARNING1(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_FAILED_OPERATION), "sys_mutex_new error\n", (u32_t)mutex);
382391
return ERR_MEM;
392+
}
383393

384394
return ERR_OK;
385395
}
@@ -388,14 +398,14 @@ err_t sys_mutex_new(sys_mutex_t *mutex) {
388398
* @param mutex the mutex to lock */
389399
void sys_mutex_lock(sys_mutex_t *mutex) {
390400
if (osMutexAcquire(mutex->id, osWaitForever) != osOK)
391-
error("sys_mutex_lock error\n");
401+
MBED_ERROR1(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_MUTEX_LOCK_FAILED), "sys_mutex_lock error\n", (u32_t)mutex);
392402
}
393403

394404
/** Unlock a mutex
395405
* @param mutex the mutex to unlock */
396406
void sys_mutex_unlock(sys_mutex_t *mutex) {
397407
if (osMutexRelease(mutex->id) != osOK)
398-
error("sys_mutex_unlock error\n");
408+
MBED_ERROR1(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_MUTEX_UNLOCK_FAILED), "sys_mutex_unlock error\n", (u32_t)mutex);
399409
}
400410

401411
/** Delete a mutex
@@ -418,7 +428,7 @@ void sys_init(void) {
418428
lwip_sys_mutex_attr.cb_size = sizeof(lwip_sys_mutex_data);
419429
lwip_sys_mutex = osMutexNew(&lwip_sys_mutex_attr);
420430
if (lwip_sys_mutex == NULL)
421-
error("sys_init error\n");
431+
MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_INITIALIZATION_FAILED), "sys_init error, mutex initialization failed\n");
422432
}
423433

424434
/*---------------------------------------------------------------------------*
@@ -452,7 +462,7 @@ u32_t sys_jiffies(void) {
452462
*---------------------------------------------------------------------------*/
453463
sys_prot_t sys_arch_protect(void) {
454464
if (osMutexAcquire(lwip_sys_mutex, osWaitForever) != osOK)
455-
error("sys_arch_protect error\n");
465+
MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_MUTEX_LOCK_FAILED), "sys_arch_protect error\n");
456466
return (sys_prot_t) 1;
457467
}
458468

@@ -469,7 +479,7 @@ sys_prot_t sys_arch_protect(void) {
469479
*---------------------------------------------------------------------------*/
470480
void sys_arch_unprotect(sys_prot_t p) {
471481
if (osMutexRelease(lwip_sys_mutex) != osOK)
472-
error("sys_arch_unprotect error\n");
482+
MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_MUTEX_UNLOCK_FAILED), "sys_arch_unprotect error\n");
473483
}
474484

475485
u32_t sys_now(void) {
@@ -524,7 +534,7 @@ static sys_thread_data_t thread_pool[SYS_THREAD_POOL_N];
524534
LWIP_DEBUGF(SYS_DEBUG, ("New Thread: %s\n", pcName));
525535

526536
if (thread_pool_index >= SYS_THREAD_POOL_N)
527-
error("sys_thread_new number error\n");
537+
MBED_ERROR1(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_THREAD_CREATE_FAILED), "sys_thread_new number error\n", thread_pool_index);
528538
sys_thread_t t = (sys_thread_t)&thread_pool[thread_pool_index];
529539
thread_pool_index++;
530540

@@ -537,11 +547,11 @@ static sys_thread_data_t thread_pool[SYS_THREAD_POOL_N];
537547
t->attr.stack_mem = malloc(stacksize);
538548
t->attr.tz_module = MBED_TZ_DEFAULT_ACCESS;
539549
if (t->attr.stack_mem == NULL) {
540-
error("Error allocating the stack memory");
550+
MBED_ERROR1(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_OUT_OF_MEMORY), "unable to allocate thread stack\n", stacksize);
541551
}
542552
t->id = osThreadNew((osThreadFunc_t)thread, arg, &t->attr);
543553
if (t->id == NULL)
544-
error("sys_thread_new create error\n");
554+
MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_THREAD_CREATE_FAILED), "sys_thread_new create error\n");
545555

546556
return t;
547557
}

0 commit comments

Comments
 (0)