gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uti: util_thread: Hoist uti_desc check

Browse Source 
Change-Id: I8c4b75140df2fe149dfe20e0a8f0bf323b5f1763
This commit is contained in:
Masamichi Takagi
2018-07-30 17:41:29 +09:00
parent 8900c2cec5
commit 00a34a8ba3
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
executer/user/mcexec.c
View File

@@ -2889,6 +2889,15 @@ static long util_thread(struct thread_data_s *my_thread, unsigned long rp_rctx,
struct thread_data_s *tp; struct thread_data_s *tp;
uti_desc = (struct uti_desc *)_uti_desc;
if (!uti_desc) {
printf("%s: ERROR: uti_desc not found. Add --enable-uti option to mcexec.\n",
__func__);
rc = -EINVAL;
goto out;
}
__dprintf("%s: uti_desc=%p\n", __FUNCTION__, uti_desc);
pthread_barrier_init(&uti_init_ready, NULL, 2); pthread_barrier_init(&uti_init_ready, NULL, 2);
if ((rc = create_worker_thread(&tp, &uti_init_ready))) { if ((rc = create_worker_thread(&tp, &uti_init_ready))) {
printf("%s: Error: create_worker_thread failed (%d)\n", __FUNCTION__, rc); printf("%s: Error: create_worker_thread failed (%d)\n", __FUNCTION__, rc);
@@ -2898,12 +2907,6 @@ static long util_thread(struct thread_data_s *my_thread, unsigned long rp_rctx,
pthread_barrier_wait(&uti_init_ready); pthread_barrier_wait(&uti_init_ready);
__dprintf("%s: worker tid: %d\n", __FUNCTION__, tp->tid); __dprintf("%s: worker tid: %d\n", __FUNCTION__, tp->tid);
uti_desc = (struct uti_desc *)_uti_desc;
if (!uti_desc) {
printf("%s: ERROR: uti_desc isn't set. Use mcexec.sh instead of mcexec\n", __FUNCTION__);
rc = -EINVAL;
goto out;
}
/* Initialize uti related variables for syscall_intercept */ /* Initialize uti related variables for syscall_intercept */
uti_desc->fd = fd; uti_desc->fd = fd;