Skip to content

apps: replace atomic_fetch_xxx with atomic_xxx #3733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhangyu-duck wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −11
Open

apps: replace atomic_fetch_xxx with atomic_xxx #3733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
* Private Functions
****************************************************************************/

static SSL_SESSION *SSL_SESSION_new(void)

Check failure on line 50 in crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
{
SSL_SESSION *session;

Expand All @@ -58,7 +58,7 @@
goto failed1;
}

session->peer = X509_new();

Check failure on line 61 in crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
if (!session->peer)
{
SSL_DEBUG(SSL_LIB_ERROR_LEVEL, "X509_new() return NULL");
Expand Down Expand Up @@ -163,33 +163,33 @@
* Public Functions
****************************************************************************/

X509_VERIFY_PARAM *SSL_get0_param(SSL *ssl)

Check failure on line 166 in crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
{
return &ssl->param;
}

X509 *SSL_get_certificate(const SSL *ssl)

Check failure on line 171 in crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
{
SSL_ASSERT2(ssl);

return ssl->cert->x509;
}

X509 *SSL_get_peer_certificate(const SSL *ssl)

Check failure on line 178 in crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
{
SSL_ASSERT2(ssl);

return ssl->session->peer;
}

int SSL_want(const SSL *ssl)

Check failure on line 185 in crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
{
SSL_ASSERT1(ssl);

return ssl->rwstate;
}

int SSL_want_nothing(const SSL *ssl)

Check failure on line 192 in crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
{
SSL_ASSERT1(ssl);

Expand All @@ -198,10 +198,10 @@
return 1;
}

return (SSL_want(ssl) == SSL_NOTHING);

Check failure on line 201 in crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
}

int SSL_want_read(const SSL *ssl)

Check failure on line 204 in crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
{
SSL_ASSERT1(ssl);

Expand All @@ -210,7 +210,7 @@
return 0;
}

return (SSL_want(ssl) == SSL_READING);

Check failure on line 213 in crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
}

int SSL_want_x509_lookup(const SSL *ssl)
Expand Down Expand Up @@ -1023,15 +1023,15 @@
{
SSL_ASSERT2(ssl);

atomic_fetch_add(&ssl->session->references, 1);
atomic_add(&ssl->session->references, 1);
return ssl->session;
}

void SSL_SESSION_free(SSL_SESSION *session)
{
SSL_ASSERT3(session);

if (atomic_fetch_sub(&session->references, 1) == 1)
if (atomic_sub(&session->references, 1) == 1)
{
X509_free(session->peer);
ssl_mem_free(session);
Expand Down
14 changes: 7 additions & 7 deletions testing/libc/atomic/atomic_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,33 +43,33 @@ if ((value) != (expected)) \
atomic_##type object = init; \
atomic_##type expected = 2; \
\
atomic_##type old_value = atomic_fetch_add(&object, 1); \
atomic_##type old_value = atomic_add(&object, 1); \
ATOMIC_CHECK(old_value, 1); \
ATOMIC_CHECK(object, 2); \
\
atomic_store(&object, 1); \
atomic_set(&object, 1); \
ATOMIC_CHECK(object, 1); \
\
old_value = atomic_load(&object); \
old_value = atomic_read(&object); \
ATOMIC_CHECK(object, 1) \
\
old_value = atomic_fetch_or(&object, 4); \
old_value = atomic_or(&object, 4); \
ATOMIC_CHECK(old_value, 1); \
ATOMIC_CHECK(object, 5); \
\
old_value = atomic_fetch_xor(&object, 7); \
old_value = atomic_xor(&object, 7); \
ATOMIC_CHECK(old_value, 5); \
ATOMIC_CHECK(object, 2); \
\
old_value = atomic_fetch_and(&object, 3); \
old_value = atomic_and(&object, 3); \
ATOMIC_CHECK(old_value, 2); \
ATOMIC_CHECK(object, 2); \
\
old_value = atomic_exchange(&object, 5); \
ATOMIC_CHECK(old_value, 2); \
ATOMIC_CHECK(object, 5); \
\
old_value = atomic_fetch_sub(&object, 3); \
old_value = atomic_sub(&object, 3); \
ATOMIC_CHECK(old_value, 5); \
ATOMIC_CHECK(object, 2); \
\
Expand Down
2 changes: 1 addition & 1 deletion testing/ostest/roundrobin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ static FAR void *get_primes_thread(FAR void *parameter)
for (i = 0; i < CONFIG_TESTING_OSTEST_RR_RUNS; i++)
{
get_primes(&count, &last);
g_rr_values[atomic_fetch_add(&g_rr_value_index, 1)] = id;
g_rr_values[atomic_add(&g_rr_value_index, 1)] = id;
}

printf("get_primes_thread id=%d finished, found %d primes, "
Expand Down
2 changes: 1 addition & 1 deletion testing/ostest/spinlock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ FAR static void * lock_type##_test_thread(FAR void *arg) \
uint32_t i; \
FAR struct spinlock_pub_args_s *pub = param->pub; \
FAR lock_type *l = (FAR lock_type *)pub->lock; \
atomic_fetch_add(&pub->barrier, 1); \
atomic_add(&pub->barrier, 1); \
while (atomic_read(&pub->barrier) != pub->thread_num) \
{ \
sched_yield(); \
Expand Down
Loading