Updated issues related to uds capacity and eventfd macro redefinition (#8329)

This commit is contained in:
zmq810150896
2023-12-06 13:51:13 +08:00
committed by GitHub
parent 1b0dae2bb0
commit 2790ce5357
6 changed files with 107 additions and 30 deletions

View File

@@ -25,7 +25,7 @@
#define EFD_SHARED_FCNTL_FLAGS (O_CLOEXEC | O_NONBLOCK)
#define EFD_FLAGS_SET (EFD_SHARED_FCNTL_FLAGS | EFD_SEMAPHORE)
#define ULLONG_MAX (~0ULL)
#define EFD_ULLONG_MAX (~0ULL)
#define EVENTFD_MUTEX_NAME "eventfd"
@@ -84,10 +84,10 @@ static int eventfd_poll(struct dfs_file *file, struct rt_pollreq *req)
if (count > 0)
events |= POLLIN;
if (count == ULLONG_MAX)
if (count == EFD_ULLONG_MAX)
events |= POLLERR;
if ((ULLONG_MAX - 1) > count)
if ((EFD_ULLONG_MAX - 1) > count)
events |= POLLOUT;
return events;
@@ -161,14 +161,14 @@ static ssize_t eventfd_write(struct dfs_file *file, const void *buf, size_t coun
counter_num = *(rt_uint64_t *)buf;
if (counter_num == ULLONG_MAX)
if (counter_num == EFD_ULLONG_MAX)
return -EINVAL;
ret = -EAGAIN;
rt_mutex_take(&ctx->lock, RT_WAITING_FOREVER);
if ((ULLONG_MAX - ctx->count) > counter_num)
if ((EFD_ULLONG_MAX - ctx->count) > counter_num)
{
ret = sizeof(counter_num);
}
@@ -176,7 +176,7 @@ static ssize_t eventfd_write(struct dfs_file *file, const void *buf, size_t coun
{
for (;;)
{
if ((ULLONG_MAX - ctx->count) >= counter_num)
if ((EFD_ULLONG_MAX - ctx->count) >= counter_num)
{
ret = sizeof(counter_num);
break;