diff --git a/modules/src/kc_list_array.c b/modules/src/kc_list_array.c index f29fc08..7ebccf1 100644 --- a/modules/src/kc_list_array.c +++ b/modules/src/kc_list_array.c @@ -653,8 +653,6 @@ */ static bool KcArrayList_set_capacity(KcArrayListInfo *info, int capacity) { - // printf("p = %p\n", info->data); - // printf("size = %ld\n", info->element_size * capacity); void *ptr = realloc(info->data, (info->element_size * capacity)); if (ptr != NULL) { diff --git a/modules/src/kc_list_array.c b/modules/src/kc_list_array.c index f29fc08..7ebccf1 100644 --- a/modules/src/kc_list_array.c +++ b/modules/src/kc_list_array.c @@ -653,8 +653,6 @@ */ static bool KcArrayList_set_capacity(KcArrayListInfo *info, int capacity) { - // printf("p = %p\n", info->data); - // printf("size = %ld\n", info->element_size * capacity); void *ptr = realloc(info->data, (info->element_size * capacity)); if (ptr != NULL) { diff --git a/modules/src/kc_list_linked.c b/modules/src/kc_list_linked.c index e4a7d84..30c972f 100644 --- a/modules/src/kc_list_linked.c +++ b/modules/src/kc_list_linked.c @@ -11,7 +11,6 @@ #endif #endif // defined(__GNUC__) -#include <stdio.h> #include <stdlib.h> #include <stdint.h> #include <string.h> @@ -362,9 +361,7 @@ } prev_entry->next = info->tail; info->tail->prev = prev_entry; - printf("---free(ptr_list) %p---\n", ptr_list); free(ptr_list); - printf("---end---\n"); } } diff --git a/modules/src/kc_list_array.c b/modules/src/kc_list_array.c index f29fc08..7ebccf1 100644 --- a/modules/src/kc_list_array.c +++ b/modules/src/kc_list_array.c @@ -653,8 +653,6 @@ */ static bool KcArrayList_set_capacity(KcArrayListInfo *info, int capacity) { - // printf("p = %p\n", info->data); - // printf("size = %ld\n", info->element_size * capacity); void *ptr = realloc(info->data, (info->element_size * capacity)); if (ptr != NULL) { diff --git a/modules/src/kc_list_linked.c b/modules/src/kc_list_linked.c index e4a7d84..30c972f 100644 --- a/modules/src/kc_list_linked.c +++ b/modules/src/kc_list_linked.c @@ -11,7 +11,6 @@ #endif #endif // defined(__GNUC__) -#include <stdio.h> #include <stdlib.h> #include <stdint.h> #include <string.h> @@ -362,9 +361,7 @@ } prev_entry->next = info->tail; info->tail->prev = prev_entry; - printf("---free(ptr_list) %p---\n", ptr_list); free(ptr_list); - printf("---end---\n"); } } diff --git a/modules/src/kc_queue.c b/modules/src/kc_queue.c index 2df6e42..fe118bb 100644 --- a/modules/src/kc_queue.c +++ b/modules/src/kc_queue.c @@ -3,7 +3,6 @@ * @brief キューモジュール * @copyright 2003 - 2023 Nomura Kei */ -#include <stdio.h> #include <stdlib.h> #include <stdint.h> #include <string.h> @@ -82,7 +81,6 @@ KcQueueInfo *info = (KcQueueInfo *)queue->_info; info->list = list; info->queue_size = (size == 0) ? INT_MAX : size; - printf("queue info->mutex: %p\n", &(info->mutex)); mtx_init(&(info->mutex), mtx_plain); cnd_init(&(info->not_empty)); cnd_init(&(info->not_full)); @@ -320,10 +318,8 @@ */ static void KcQueue_cleanup_info(struct KcQueue_ *queue) { - printf("### cleanup info\n"); KcQueueInfo *info = (KcQueueInfo *)queue->_info; KcList_delete(info->list); - printf("info->mutex : %p\n", &info->mutex); mtx_destroy(&(info->mutex)); cnd_destroy(&(info->not_empty)); cnd_destroy(&(info->not_full)); diff --git a/modules/src/kc_list_array.c b/modules/src/kc_list_array.c index f29fc08..7ebccf1 100644 --- a/modules/src/kc_list_array.c +++ b/modules/src/kc_list_array.c @@ -653,8 +653,6 @@ */ static bool KcArrayList_set_capacity(KcArrayListInfo *info, int capacity) { - // printf("p = %p\n", info->data); - // printf("size = %ld\n", info->element_size * capacity); void *ptr = realloc(info->data, (info->element_size * capacity)); if (ptr != NULL) { diff --git a/modules/src/kc_list_linked.c b/modules/src/kc_list_linked.c index e4a7d84..30c972f 100644 --- a/modules/src/kc_list_linked.c +++ b/modules/src/kc_list_linked.c @@ -11,7 +11,6 @@ #endif #endif // defined(__GNUC__) -#include <stdio.h> #include <stdlib.h> #include <stdint.h> #include <string.h> @@ -362,9 +361,7 @@ } prev_entry->next = info->tail; info->tail->prev = prev_entry; - printf("---free(ptr_list) %p---\n", ptr_list); free(ptr_list); - printf("---end---\n"); } } diff --git a/modules/src/kc_queue.c b/modules/src/kc_queue.c index 2df6e42..fe118bb 100644 --- a/modules/src/kc_queue.c +++ b/modules/src/kc_queue.c @@ -3,7 +3,6 @@ * @brief キューモジュール * @copyright 2003 - 2023 Nomura Kei */ -#include <stdio.h> #include <stdlib.h> #include <stdint.h> #include <string.h> @@ -82,7 +81,6 @@ KcQueueInfo *info = (KcQueueInfo *)queue->_info; info->list = list; info->queue_size = (size == 0) ? INT_MAX : size; - printf("queue info->mutex: %p\n", &(info->mutex)); mtx_init(&(info->mutex), mtx_plain); cnd_init(&(info->not_empty)); cnd_init(&(info->not_full)); @@ -320,10 +318,8 @@ */ static void KcQueue_cleanup_info(struct KcQueue_ *queue) { - printf("### cleanup info\n"); KcQueueInfo *info = (KcQueueInfo *)queue->_info; KcList_delete(info->list); - printf("info->mutex : %p\n", &info->mutex); mtx_destroy(&(info->mutex)); cnd_destroy(&(info->not_empty)); cnd_destroy(&(info->not_full)); diff --git a/modules/test/src/test_list_array.c b/modules/test/src/test_list_array.c index bfdf199..8b9d9f5 100644 --- a/modules/test/src/test_list_array.c +++ b/modules/test/src/test_list_array.c @@ -1,4 +1,3 @@ -#include <stdio.h> #include <errno.h> #include <kc.h> diff --git a/modules/src/kc_list_array.c b/modules/src/kc_list_array.c index f29fc08..7ebccf1 100644 --- a/modules/src/kc_list_array.c +++ b/modules/src/kc_list_array.c @@ -653,8 +653,6 @@ */ static bool KcArrayList_set_capacity(KcArrayListInfo *info, int capacity) { - // printf("p = %p\n", info->data); - // printf("size = %ld\n", info->element_size * capacity); void *ptr = realloc(info->data, (info->element_size * capacity)); if (ptr != NULL) { diff --git a/modules/src/kc_list_linked.c b/modules/src/kc_list_linked.c index e4a7d84..30c972f 100644 --- a/modules/src/kc_list_linked.c +++ b/modules/src/kc_list_linked.c @@ -11,7 +11,6 @@ #endif #endif // defined(__GNUC__) -#include <stdio.h> #include <stdlib.h> #include <stdint.h> #include <string.h> @@ -362,9 +361,7 @@ } prev_entry->next = info->tail; info->tail->prev = prev_entry; - printf("---free(ptr_list) %p---\n", ptr_list); free(ptr_list); - printf("---end---\n"); } } diff --git a/modules/src/kc_queue.c b/modules/src/kc_queue.c index 2df6e42..fe118bb 100644 --- a/modules/src/kc_queue.c +++ b/modules/src/kc_queue.c @@ -3,7 +3,6 @@ * @brief キューモジュール * @copyright 2003 - 2023 Nomura Kei */ -#include <stdio.h> #include <stdlib.h> #include <stdint.h> #include <string.h> @@ -82,7 +81,6 @@ KcQueueInfo *info = (KcQueueInfo *)queue->_info; info->list = list; info->queue_size = (size == 0) ? INT_MAX : size; - printf("queue info->mutex: %p\n", &(info->mutex)); mtx_init(&(info->mutex), mtx_plain); cnd_init(&(info->not_empty)); cnd_init(&(info->not_full)); @@ -320,10 +318,8 @@ */ static void KcQueue_cleanup_info(struct KcQueue_ *queue) { - printf("### cleanup info\n"); KcQueueInfo *info = (KcQueueInfo *)queue->_info; KcList_delete(info->list); - printf("info->mutex : %p\n", &info->mutex); mtx_destroy(&(info->mutex)); cnd_destroy(&(info->not_empty)); cnd_destroy(&(info->not_full)); diff --git a/modules/test/src/test_list_array.c b/modules/test/src/test_list_array.c index bfdf199..8b9d9f5 100644 --- a/modules/test/src/test_list_array.c +++ b/modules/test/src/test_list_array.c @@ -1,4 +1,3 @@ -#include <stdio.h> #include <errno.h> #include <kc.h> diff --git a/modules/test/src/test_list_linked.c b/modules/test/src/test_list_linked.c index 27ac267..5e18063 100644 --- a/modules/test/src/test_list_linked.c +++ b/modules/test/src/test_list_linked.c @@ -1,4 +1,3 @@ -#include <stdio.h> #include <errno.h> #include <kc.h> diff --git a/modules/src/kc_list_array.c b/modules/src/kc_list_array.c index f29fc08..7ebccf1 100644 --- a/modules/src/kc_list_array.c +++ b/modules/src/kc_list_array.c @@ -653,8 +653,6 @@ */ static bool KcArrayList_set_capacity(KcArrayListInfo *info, int capacity) { - // printf("p = %p\n", info->data); - // printf("size = %ld\n", info->element_size * capacity); void *ptr = realloc(info->data, (info->element_size * capacity)); if (ptr != NULL) { diff --git a/modules/src/kc_list_linked.c b/modules/src/kc_list_linked.c index e4a7d84..30c972f 100644 --- a/modules/src/kc_list_linked.c +++ b/modules/src/kc_list_linked.c @@ -11,7 +11,6 @@ #endif #endif // defined(__GNUC__) -#include <stdio.h> #include <stdlib.h> #include <stdint.h> #include <string.h> @@ -362,9 +361,7 @@ } prev_entry->next = info->tail; info->tail->prev = prev_entry; - printf("---free(ptr_list) %p---\n", ptr_list); free(ptr_list); - printf("---end---\n"); } } diff --git a/modules/src/kc_queue.c b/modules/src/kc_queue.c index 2df6e42..fe118bb 100644 --- a/modules/src/kc_queue.c +++ b/modules/src/kc_queue.c @@ -3,7 +3,6 @@ * @brief キューモジュール * @copyright 2003 - 2023 Nomura Kei */ -#include <stdio.h> #include <stdlib.h> #include <stdint.h> #include <string.h> @@ -82,7 +81,6 @@ KcQueueInfo *info = (KcQueueInfo *)queue->_info; info->list = list; info->queue_size = (size == 0) ? INT_MAX : size; - printf("queue info->mutex: %p\n", &(info->mutex)); mtx_init(&(info->mutex), mtx_plain); cnd_init(&(info->not_empty)); cnd_init(&(info->not_full)); @@ -320,10 +318,8 @@ */ static void KcQueue_cleanup_info(struct KcQueue_ *queue) { - printf("### cleanup info\n"); KcQueueInfo *info = (KcQueueInfo *)queue->_info; KcList_delete(info->list); - printf("info->mutex : %p\n", &info->mutex); mtx_destroy(&(info->mutex)); cnd_destroy(&(info->not_empty)); cnd_destroy(&(info->not_full)); diff --git a/modules/test/src/test_list_array.c b/modules/test/src/test_list_array.c index bfdf199..8b9d9f5 100644 --- a/modules/test/src/test_list_array.c +++ b/modules/test/src/test_list_array.c @@ -1,4 +1,3 @@ -#include <stdio.h> #include <errno.h> #include <kc.h> diff --git a/modules/test/src/test_list_linked.c b/modules/test/src/test_list_linked.c index 27ac267..5e18063 100644 --- a/modules/test/src/test_list_linked.c +++ b/modules/test/src/test_list_linked.c @@ -1,4 +1,3 @@ -#include <stdio.h> #include <errno.h> #include <kc.h> diff --git a/modules/test/src/test_lock_guard.c b/modules/test/src/test_lock_guard.c index 378646d..27d8769 100644 --- a/modules/test/src/test_lock_guard.c +++ b/modules/test/src/test_lock_guard.c @@ -1,4 +1,3 @@ -#include <stdio.h> #include <errno.h> #include <kc.h> diff --git a/modules/src/kc_list_array.c b/modules/src/kc_list_array.c index f29fc08..7ebccf1 100644 --- a/modules/src/kc_list_array.c +++ b/modules/src/kc_list_array.c @@ -653,8 +653,6 @@ */ static bool KcArrayList_set_capacity(KcArrayListInfo *info, int capacity) { - // printf("p = %p\n", info->data); - // printf("size = %ld\n", info->element_size * capacity); void *ptr = realloc(info->data, (info->element_size * capacity)); if (ptr != NULL) { diff --git a/modules/src/kc_list_linked.c b/modules/src/kc_list_linked.c index e4a7d84..30c972f 100644 --- a/modules/src/kc_list_linked.c +++ b/modules/src/kc_list_linked.c @@ -11,7 +11,6 @@ #endif #endif // defined(__GNUC__) -#include <stdio.h> #include <stdlib.h> #include <stdint.h> #include <string.h> @@ -362,9 +361,7 @@ } prev_entry->next = info->tail; info->tail->prev = prev_entry; - printf("---free(ptr_list) %p---\n", ptr_list); free(ptr_list); - printf("---end---\n"); } } diff --git a/modules/src/kc_queue.c b/modules/src/kc_queue.c index 2df6e42..fe118bb 100644 --- a/modules/src/kc_queue.c +++ b/modules/src/kc_queue.c @@ -3,7 +3,6 @@ * @brief キューモジュール * @copyright 2003 - 2023 Nomura Kei */ -#include <stdio.h> #include <stdlib.h> #include <stdint.h> #include <string.h> @@ -82,7 +81,6 @@ KcQueueInfo *info = (KcQueueInfo *)queue->_info; info->list = list; info->queue_size = (size == 0) ? INT_MAX : size; - printf("queue info->mutex: %p\n", &(info->mutex)); mtx_init(&(info->mutex), mtx_plain); cnd_init(&(info->not_empty)); cnd_init(&(info->not_full)); @@ -320,10 +318,8 @@ */ static void KcQueue_cleanup_info(struct KcQueue_ *queue) { - printf("### cleanup info\n"); KcQueueInfo *info = (KcQueueInfo *)queue->_info; KcList_delete(info->list); - printf("info->mutex : %p\n", &info->mutex); mtx_destroy(&(info->mutex)); cnd_destroy(&(info->not_empty)); cnd_destroy(&(info->not_full)); diff --git a/modules/test/src/test_list_array.c b/modules/test/src/test_list_array.c index bfdf199..8b9d9f5 100644 --- a/modules/test/src/test_list_array.c +++ b/modules/test/src/test_list_array.c @@ -1,4 +1,3 @@ -#include <stdio.h> #include <errno.h> #include <kc.h> diff --git a/modules/test/src/test_list_linked.c b/modules/test/src/test_list_linked.c index 27ac267..5e18063 100644 --- a/modules/test/src/test_list_linked.c +++ b/modules/test/src/test_list_linked.c @@ -1,4 +1,3 @@ -#include <stdio.h> #include <errno.h> #include <kc.h> diff --git a/modules/test/src/test_lock_guard.c b/modules/test/src/test_lock_guard.c index 378646d..27d8769 100644 --- a/modules/test/src/test_lock_guard.c +++ b/modules/test/src/test_lock_guard.c @@ -1,4 +1,3 @@ -#include <stdio.h> #include <errno.h> #include <kc.h> diff --git a/modules/test/src/test_thread.c b/modules/test/src/test_thread.c index e217aea..c90fb95 100644 --- a/modules/test/src/test_thread.c +++ b/modules/test/src/test_thread.c @@ -11,7 +11,7 @@ // プロトタイプ宣言 static void test_thread_new(void); -// static void test_thread_sleep(void); +static void test_thread_sleep(void); static void test_thread_memory_error(void); /** @@ -21,7 +21,7 @@ { KcUt *ut = KcUt_get_instance(); ut->add(ut, UT_TESTCASE, "thread new/delete", test_thread_new); - // ut->add(ut, UT_TESTCASE, "thread sleep", test_thread_sleep); + ut->add(ut, UT_TESTCASE, "thread sleep", test_thread_sleep); ut->add(ut, UT_TESTCASE, "thread memory error", test_thread_memory_error); } @@ -79,44 +79,13 @@ KcThread_delete(thread_2); } -// for シグナル処理 -#if 0 -static volatile int test_thread_interrupted = 0; -static void test_thread_sig_handler(int sig) -{ - test_thread_interrupted = 1; -} -int test_sleep_func(void *args) -{ - signal(SIGUSR1, test_thread_sig_handler); - int *value = (int *)args; - if (*value == 1) - { - KcThread_msleep(200, true); - } - else - { - KcThread_msleep(200, false); - } - return 0; -} - /** - * Thread sleep 中のシグナル発生。 + * Thread sleep テスト。 */ static void test_thread_sleep(void) { - - KcThread *thread = KcThread_new(test_sleep_func); - int value = 1; - test_thread_interrupted = 0; - thread->start(thread, &value); - KcThread_msleep(10, false); - - thread->join(thread); - KcThread_delete(thread); + KcThread_sleep(0, 100, false); } -#endif /** * メモリ確保エラー