Skip to content

Commit 999bb85

Browse files
style: format code with clang-format [skip ci]
1 parent ed17bd9 commit 999bb85

File tree

2 files changed

+56
-55
lines changed

2 files changed

+56
-55
lines changed

components/lwp/lwp_futex.c

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -959,54 +959,54 @@ rt_err_t lwp_futex(struct rt_lwp *lwp, int *uaddr, int op, int val,
959959
{
960960
switch (op_type)
961961
{
962-
case FUTEX_WAIT:
963-
rc = _futex_wait(futex, lwp, uaddr, val, timeout, op_flags);
964-
break;
965-
case FUTEX_WAKE:
966-
rc = _futex_wake(futex, lwp, val, op_flags);
967-
break;
968-
case FUTEX_REQUEUE:
969-
futex2 = _futex_get(uaddr2, lwp, op_flags, &rc);
970-
if (!rc)
971-
{
972-
_futex_lock(lwp, op_flags);
973-
rc = _futex_requeue(futex, futex2, lwp, val, (long)timeout,
974-
op_flags);
975-
_futex_unlock(lwp, op_flags);
976-
}
977-
break;
978-
case FUTEX_CMP_REQUEUE:
979-
futex2 = _futex_get(uaddr2, lwp, op_flags, &rc);
962+
case FUTEX_WAIT:
963+
rc = _futex_wait(futex, lwp, uaddr, val, timeout, op_flags);
964+
break;
965+
case FUTEX_WAKE:
966+
rc = _futex_wake(futex, lwp, val, op_flags);
967+
break;
968+
case FUTEX_REQUEUE:
969+
futex2 = _futex_get(uaddr2, lwp, op_flags, &rc);
970+
if (!rc)
971+
{
980972
_futex_lock(lwp, op_flags);
981-
if (*uaddr == val3)
982-
{
983-
rc = 0;
984-
}
985-
else
986-
{
987-
rc = -EAGAIN;
988-
}
989-
if (rc == 0)
990-
{
991-
rc = _futex_requeue(futex, futex2, lwp, val,
992-
(long)timeout, op_flags);
993-
}
973+
rc = _futex_requeue(futex, futex2, lwp, val, (long)timeout,
974+
op_flags);
994975
_futex_unlock(lwp, op_flags);
995-
break;
996-
case FUTEX_LOCK_PI:
997-
rc = _futex_lock_pi(futex, lwp, uaddr, timeout, op_flags,
998-
RT_FALSE);
999-
break;
1000-
case FUTEX_UNLOCK_PI:
1001-
rc = _futex_unlock_pi(futex, lwp, op_flags);
1002-
break;
1003-
case FUTEX_TRYLOCK_PI:
1004-
rc = _futex_lock_pi(futex, lwp, uaddr, 0, op_flags, RT_TRUE);
1005-
break;
1006-
default:
1007-
LOG_W("User require op=%d which is not implemented", op);
1008-
rc = -ENOSYS;
1009-
break;
976+
}
977+
break;
978+
case FUTEX_CMP_REQUEUE:
979+
futex2 = _futex_get(uaddr2, lwp, op_flags, &rc);
980+
_futex_lock(lwp, op_flags);
981+
if (*uaddr == val3)
982+
{
983+
rc = 0;
984+
}
985+
else
986+
{
987+
rc = -EAGAIN;
988+
}
989+
if (rc == 0)
990+
{
991+
rc = _futex_requeue(futex, futex2, lwp, val,
992+
(long)timeout, op_flags);
993+
}
994+
_futex_unlock(lwp, op_flags);
995+
break;
996+
case FUTEX_LOCK_PI:
997+
rc = _futex_lock_pi(futex, lwp, uaddr, timeout, op_flags,
998+
RT_FALSE);
999+
break;
1000+
case FUTEX_UNLOCK_PI:
1001+
rc = _futex_unlock_pi(futex, lwp, op_flags);
1002+
break;
1003+
case FUTEX_TRYLOCK_PI:
1004+
rc = _futex_lock_pi(futex, lwp, uaddr, 0, op_flags, RT_TRUE);
1005+
break;
1006+
default:
1007+
LOG_W("User require op=%d which is not implemented", op);
1008+
rc = -ENOSYS;
1009+
break;
10101010
}
10111011
}
10121012

@@ -1107,14 +1107,14 @@ static int _handle_futex_death(int *uaddr, rt_thread_t thread, rt_bool_t is_pi,
11071107
{
11081108
switch (rc)
11091109
{
1110-
case -EFAULT:
1111-
return -1;
1112-
case -EAGAIN:
1113-
rt_schedule();
1114-
goto retry;
1115-
default:
1116-
LOG_W("unknown errno: %d in '%s'", rc, __FUNCTION__);
1117-
return rc;
1110+
case -EFAULT:
1111+
return -1;
1112+
case -EAGAIN:
1113+
rt_schedule();
1114+
goto retry;
1115+
default:
1116+
LOG_W("unknown errno: %d in '%s'", rc, __FUNCTION__);
1117+
return rc;
11181118
}
11191119
}
11201120

components/lwp/lwp_futex_internal.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ DEFINE_RT_UTHASH_TYPE(shared_futex_entry, struct shared_futex_key, key);
4646
*/
4747
struct rt_futex
4848
{
49-
union {
49+
union
50+
{
5051
/* for private futex */
5152
struct lwp_avl_struct node; /**< AVL tree node for private futex */
5253
/* for shared futex */

0 commit comments

Comments
 (0)