Changeset 5110d0a in mainline for kernel/generic/include/synch


Ignore:
Timestamp:
2023-02-07T16:02:50Z (2 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7c5320c
Parents:
8a55346
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2023-02-06 16:44:26)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2023-02-07 16:02:50)
Message:

Turn a bunch of macros into regular functions

Location:
kernel/generic/include/synch
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/include/synch/condvar.h

    r8a55346 r5110d0a  
    4646} condvar_t;
    4747
    48 #define condvar_wait(cv, mtx) \
    49         _condvar_wait_timeout((cv), (mtx), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE)
    50 #define condvar_wait_timeout(cv, mtx, usec) \
    51         _condvar_wait_timeout((cv), (mtx), (usec), SYNCH_FLAGS_NONE)
    52 
    5348#ifdef CONFIG_SMP
    5449#define _condvar_wait_timeout_spinlock(cv, lock, usec, flags) \
    … …  
    6257extern void condvar_signal(condvar_t *cv);
    6358extern void condvar_broadcast(condvar_t *cv);
    64 extern errno_t _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, uint32_t usec,
    65     int flags);
     59
     60extern errno_t condvar_wait(condvar_t *cv, mutex_t *mtx);
     61extern errno_t condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, uint32_t usec);
     62
    6663extern errno_t _condvar_wait_timeout_spinlock_impl(condvar_t *cv, spinlock_t *lock,
    6764    uint32_t usec, int flags);

  • kernel/generic/include/synch/mutex.h

    r8a55346 r5110d0a  
    5656} mutex_t;
    5757
    58 #define mutex_lock(mtx) \
    59         _mutex_lock_timeout((mtx), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE)
    60 
    61 #define mutex_trylock(mtx) \
    62         _mutex_lock_timeout((mtx), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NON_BLOCKING)
    63 
    64 #define mutex_lock_timeout(mtx, usec) \
    65         _mutex_lock_timeout((mtx), (usec), SYNCH_FLAGS_NON_BLOCKING)
    66 
    6758extern void mutex_initialize(mutex_t *, mutex_type_t);
    6859extern bool mutex_locked(mutex_t *);
    69 extern errno_t _mutex_lock_timeout(mutex_t *, uint32_t, unsigned int);
     60extern errno_t mutex_trylock(mutex_t *);
     61extern errno_t mutex_lock(mutex_t *);
     62extern errno_t mutex_lock_timeout(mutex_t *, uint32_t);
    7063extern void mutex_unlock(mutex_t *);
    7164

  • kernel/generic/include/synch/semaphore.h

    r8a55346 r5110d0a  
    4545} semaphore_t;
    4646
    47 #define semaphore_down(s) \
    48         _semaphore_down_timeout((s), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE)
    49 
    50 #define semaphore_trydown(s) \
    51         _semaphore_down_timeout((s), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NON_BLOCKING)
    52 
    53 #define semaphore_down_timeout(s, usec) \
    54         _semaphore_down_timeout((s), (usec), SYNCH_FLAGS_NONE)
    55 
    56 #define semaphore_down_interruptable(s) \
    57         (_semaphore_down_timeout((s), SYNCH_NO_TIMEOUT, \
    58                 SYNCH_FLAGS_INTERRUPTIBLE) != EINTR)
    59 
    6047extern void semaphore_initialize(semaphore_t *, int);
    61 extern errno_t _semaphore_down_timeout(semaphore_t *, uint32_t, unsigned int);
     48extern errno_t _semaphore_down_timeout(semaphore_t *, uint32_t, unsigned);
     49extern errno_t semaphore_down_timeout(semaphore_t *, uint32_t);
     50extern errno_t semaphore_trydown(semaphore_t *);
     51extern void semaphore_down(semaphore_t *);
    6252extern void semaphore_up(semaphore_t *);
    6353extern int semaphore_count_get(semaphore_t *);

  • kernel/generic/include/synch/waitq.h

    r8a55346 r5110d0a  
    6969} waitq_t;
    7070
    71 #define waitq_sleep(wq) \
    72         waitq_sleep_timeout((wq), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE, NULL)
    73 
    7471struct thread;
    7572
    7673extern void waitq_initialize(waitq_t *);
     74extern errno_t waitq_sleep(waitq_t *);
    7775extern errno_t waitq_sleep_timeout(waitq_t *, uint32_t, unsigned int, bool *);
    7876extern ipl_t waitq_sleep_prepare(waitq_t *);
     77extern errno_t waitq_sleep_unsafe(waitq_t *, bool *);
    7978extern errno_t waitq_sleep_timeout_unsafe(waitq_t *, uint32_t, unsigned int, bool *);
    8079extern void waitq_sleep_finish(waitq_t *, bool, ipl_t);
Note: See TracChangeset for help on using the changeset viewer.