Changeset 4b54bd9 in mainline for uspace/lib/pcut/src/os/helenos.c
- Timestamp:
- 2018-09-12T13:23:03Z (6 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 3da0ee4
- Parents:
- 275530a4
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/pcut/src/os/helenos.c
r275530a4 r4b54bd9 46 46 /* String functions. */ 47 47 48 int pcut_str_equals(const char *a, const char *b) 49 { 48 int pcut_str_equals(const char *a, const char *b) { 50 49 return str_cmp(a, b) == 0; 51 50 } 52 51 53 52 54 int pcut_str_start_equals(const char *a, const char *b, int len) 55 { 53 int pcut_str_start_equals(const char *a, const char *b, int len) { 56 54 return str_lcmp(a, b, len) == 0; 57 55 } 58 56 59 int pcut_str_size(const char *s) 60 { 57 int pcut_str_size(const char *s) { 61 58 return str_size(s); 62 59 } 63 60 64 int pcut_str_to_int(const char *s) 65 { 61 int pcut_str_to_int(const char *s) { 66 62 int result = strtol(s, NULL, 10); 67 63 return result; 68 64 } 69 65 70 char *pcut_str_find_char(const char *haystack, const char needle) 71 { 66 char *pcut_str_find_char(const char *haystack, const char needle) { 72 67 return str_chr(haystack, needle); 73 68 } 74 69 75 void pcut_str_error(errno_t error, char *buffer, int size) 76 { 70 void pcut_str_error(int error, char *buffer, int size) { 77 71 const char *str = str_error(error); 78 72 if (str == NULL) { … … 107 101 * @param test Test that is about to be run. 108 102 */ 109 static void before_test_start(pcut_item_t *test) 110 { 103 static void before_test_start(pcut_item_t *test) { 111 104 pcut_report_test_start(test); 112 105 … … 116 109 117 110 /** Mutex guard for forced_termination_cv. */ 118 static fibril_mutex_t forced_termination_mutex =119 111 static fibril_mutex_t forced_termination_mutex 112 = FIBRIL_MUTEX_INITIALIZER(forced_termination_mutex); 120 113 121 114 /** Condition-variable for checking whether test timed-out. */ 122 static fibril_condvar_t forced_termination_cv =123 115 static fibril_condvar_t forced_termination_cv 116 = FIBRIL_CONDVAR_INITIALIZER(forced_termination_cv); 124 117 125 118 /** Spawned task id. */ … … 137 130 * @return EOK Always. 138 131 */ 139 static errno_t test_timeout_handler_fibril(void *arg) 140 { 132 static int test_timeout_handler_fibril(void *arg) { 141 133 pcut_item_t *test = arg; 142 134 int timeout_sec = pcut_get_test_timeout(test); … … 148 140 } 149 141 errno_t rc = fibril_condvar_wait_timeout(&forced_termination_cv, 150 142 &forced_termination_mutex, timeout_us); 151 143 if (rc == ETIMEOUT) { 152 144 task_kill(test_task_id); … … 162 154 * @param test Test to be run. 163 155 */ 164 int pcut_run_test_forking(const char *self_path, pcut_item_t *test) 165 { 156 int pcut_run_test_forking(const char *self_path, pcut_item_t *test) { 166 157 before_test_start(test); 167 158 … … 235 226 } 236 227 237 void pcut_hook_before_test(pcut_item_t *test) 238 { 228 void pcut_hook_before_test(pcut_item_t *test) { 239 229 PCUT_UNUSED(test); 240 230
Note:
See TracChangeset
for help on using the changeset viewer.