Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 15:58:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix wait loop and void cast (#24)

Browse Source 
* Simplify EINTR/ECANCEL error handling

1. Add semaphore uninterruptible wait function
2 .Replace semaphore wait loop with a single uninterruptible wait
3. Replace all sem_xxx to nxsem_xxx

* Unify the void cast usage

1. Remove void cast for function because many place ignore the returned value witout cast
2. Replace void cast for variable with UNUSED macro
This commit is contained in:
Xiang Xiao
2020-01-02 10:49:34 -06:00
committed by Gregory Nutt
parent 316675f4db
commit 6a3c2aded6
1602 changed files with 6311 additions and 10874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crypto/blake2s.c
+1 -1
View File
@@ -251,7 +251,7 @@ static void blake2s_compress(FAR blake2s_state *S,
#else
/* Larger, slightly faster. */
(void)(round = 0);
UNUSED(round);
ROUND(0);
ROUND(1);
ROUND(2);
crypto/cryptodev.c
+1 -1
View File
@@ -173,5 +173,5 @@ static int cryptodev_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
void devcrypto_register(void)
{
(void)register_driver("/dev/crypto", &g_cryptodevops, 0666, NULL);
register_driver("/dev/crypto", &g_cryptodevops, 0666, NULL);
}
crypto/random_pool.c
+3 -32
View File
@@ -453,7 +453,7 @@ void up_rngaddentropy(enum rnd_source_t kindof, FAR const uint32_t *buf,
* reseeding too fast.
*/
(void)clock_gettime(CLOCK_REALTIME, &ts);
clock_gettime(CLOCK_REALTIME, &ts);
tbuf[0] = ROTL_32(ts.tv_nsec, 17) ^ ROTL_32(ts.tv_sec, 3);
tbuf[0] += ROTL_32(kindof, 27);
tbuf[0] += ROTL_32((uintptr_t)&tbuf[0], 11);
@@ -500,21 +500,7 @@ void up_rngaddentropy(enum rnd_source_t kindof, FAR const uint32_t *buf,
void up_rngreseed(void)
{
int ret;
do
{
/* Take the semaphore (perhaps waiting) */
ret = nxsem_wait(&g_rng.rd_sem);
/* The only case that an error should occur here is if the wait was
* awakened by a signal.
*/
DEBUGASSERT(ret == OK || ret == -EINTR);
}
while (ret == -EINTR);
nxsem_wait_uninterruptible(&g_rng.rd_sem);
if (g_rng.rd_newentr >= MIN_SEED_NEW_ENTROPY_WORDS)
{
@@ -563,22 +549,7 @@ void up_randompool_initialize(void)
void getrandom(FAR void *bytes, size_t nbytes)
{
int ret;
do
{
/* Take the semaphore (perhaps waiting) */
ret = nxsem_wait(&g_rng.rd_sem);
/* The only case that an error should occur here is if the wait was
* awakened by a signal.
*/
DEBUGASSERT(ret == OK || ret == -EINTR);
}
while (ret == -EINTR);
nxsem_wait_uninterruptible(&g_rng.rd_sem);
rng_buf_internal(bytes, nbytes);
nxsem_post(&g_rng.rd_sem);
}