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