Skip to content

Fix unused variable warnings in rdma.c with NDEBUG #312

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
bjosv wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix unused variable warnings in rdma.c with NDEBUG #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86da3c2
Build a release build of RDMA in CI to enable NDEBUG
bjosv May 15, 2026
83b0708
Remove unused variables in valkeyRdmaWaitConn in release builds
bjosv May 15, 2026
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 .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,12 +206,12 @@ jobs:
- name: Build shared libraries using CMake
run: |
mkdir build-shared && cd build-shared
cmake -DENABLE_RDMA=ON ..
cmake -DENABLE_RDMA=ON -DCMAKE_BUILD_TYPE=Release ..
sudo make install
- name: Build static libraries using CMake
run: |
mkdir build-static && cd build-static
cmake -DBUILD_SHARED_LIBS=OFF -DENABLE_RDMA=ON ..
cmake -DBUILD_SHARED_LIBS=OFF -DENABLE_RDMA=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
sudo make install
- name: Build using Makefile
run: |
Expand Down
8 changes: 4 additions & 4 deletions src/rdma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,8 +1035,7 @@ static int valkeyRdmaCM(valkeyContext *c, long timeout) {

static int valkeyRdmaWaitConn(valkeyContext *c, long timeout) {
long now, end;
RdmaContext *ctx = c->privctx;

@pizhenwei pizhenwei May 15, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Declaring a temporary variable in a separate line, casting it from a private type pointer, and then accessing it — to me, the original style is more readable. However, I don’t object to the current style either.

Otherwise, LGTM.

struct epoll_event events[1], *event;
struct epoll_event events[1];
int nevent;

assert(timeout >= 0);
Expand All @@ -1062,8 +1061,9 @@ static int valkeyRdmaWaitConn(valkeyContext *c, long timeout) {
return VALKEY_ERR;
}

event = &events[0];
assert(event->data.fd == ctx->cm_channel->fd); /* CM channel fd wakes up only now */
/* Only the CM channel fd is polled here */
assert(events[0].data.fd == ((RdmaContext *)c->privctx)->cm_channel->fd);

if (valkeyRdmaCM(c, end - now) == VALKEY_ERR) {
return VALKEY_ERR;
}
Expand Down
Loading