Skip to content

Commit a32a817

Browse files
SSingh5845andrestraker
authored andcommitted
fix(server): modernize ZMQ API and fix code formatting
Update deprecated setsockopt() calls to modern set() method using zmq::sockopt. Fix loop variable type (int -> size_t) for safe container iteration. Apply clang-format fixes for consistent code style. Signed-off-by: Subham Singh <Subham.Singh@analog.com>
1 parent 197240f commit a32a817

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

apps/server/server.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,8 @@ void stream_zmq_frame() {
154154
static zmq::context_t zmq_context(1);
155155
server_socket =
156156
std::make_unique<zmq::socket_t>(zmq_context, zmq::socket_type::push);
157-
server_socket->setsockopt(ZMQ_SNDHWM, (int *)&max_send_frames,
158-
sizeof(max_send_frames));
159-
server_socket->setsockopt(ZMQ_SNDTIMEO, FRAME_TIMEOUT);
157+
server_socket->set(zmq::sockopt::sndhwm, static_cast<int>(max_send_frames));
158+
server_socket->set(zmq::sockopt::sndtimeo, FRAME_TIMEOUT);
160159
server_socket->bind("tcp://*:5555");
161160
LOG(INFO) << "ZMQ server socket connection established.";
162161

@@ -251,7 +250,7 @@ void stop_stream_thread() {
251250

252251
// Flush the messages
253252
if (server_socket) {
254-
server_socket->setsockopt(ZMQ_LINGER, 0);
253+
server_socket->set(zmq::sockopt::linger, 0);
255254
}
256255

257256
if (stream_thread.joinable()) {
@@ -691,9 +690,10 @@ void invoke_sdk_api(payload::ClientRequest buff_recv) {
691690
static zmq::context_t zmq_context(1);
692691
server_socket = std::make_unique<zmq::socket_t>(
693692
zmq_context, zmq::socket_type::push);
694-
server_socket->setsockopt(ZMQ_SNDHWM, (int *)&max_send_frames,
695-
sizeof(max_send_frames));
696-
server_socket->setsockopt(ZMQ_SNDTIMEO, FRAME_TIMEOUT);
693+
server_socket->set(zmq::sockopt::sndhwm,
694+
static_cast<int>(max_send_frames));
695+
server_socket->set(zmq::sockopt::sndtimeo,
696+
static_cast<int>(FRAME_TIMEOUT));
697697
server_socket->bind("tcp://*:5555");
698698
LOG(INFO) << "ZMQ server socket connection established.";
699699
}
@@ -752,7 +752,7 @@ void invoke_sdk_api(payload::ClientRequest buff_recv) {
752752
protoContent->set_metadata_size(frameDetails.metadataSize);
753753
protoContent->set_is_pcm(frameDetails.isPCM);
754754
protoContent->set_number_of_phases(frameDetails.numberOfPhases);
755-
for (int i = 0; i < frameDetails.frameContent.size(); i++) {
755+
for (size_t i = 0; i < frameDetails.frameContent.size(); i++) {
756756
protoContent->add_frame_content(
757757
frameDetails.frameContent.at(i));
758758
}

0 commit comments

Comments
 (0)