Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/cleanup_swiftnet.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <stdint.h>
#include <stdio.h>

static inline void close_listeners() {
static inline void close_listeners(void) {
LOCK_ATOMIC_DATA_TYPE(&listeners.atomic_lock);

LOOP_HASHMAP(&listeners, struct Listener*,
Expand All @@ -22,13 +22,13 @@ static inline void close_listeners() {
hashmap_destroy(&listeners);
}

static inline void close_background_service() {
static inline void close_background_service(void) {
atomic_store_explicit(&swiftnet_closing, true, memory_order_release);

pthread_join(memory_cleanup_thread, NULL);
}

void swiftnet_cleanup() {
void swiftnet_cleanup(void) {
close_background_service();

allocator_destroy(&packet_queue_node_memory_allocator ENABLE_INTERNAL_CHECK);
Expand Down
8 changes: 4 additions & 4 deletions src/initialize_swiftnet.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ pthread_t memory_cleanup_thread;

_Atomic bool swiftnet_closing;

static inline void initialize_allocators() {
static inline void initialize_allocators(void) {
packet_queue_node_memory_allocator = allocator_create(sizeof(struct SwiftNetPacketQueueNode), 40 * SWIFT_NET_MEMORY_USAGE);
packet_callback_queue_node_memory_allocator = allocator_create(sizeof(struct SwiftNetPacketCallbackQueueNode), 40 * SWIFT_NET_MEMORY_USAGE);
server_packet_data_memory_allocator = allocator_create(sizeof(struct SwiftNetServerPacketData), 40 * SWIFT_NET_MEMORY_USAGE);
Expand All @@ -79,19 +79,19 @@ static inline void initialize_allocators() {
#endif
}

static inline void initialize_vectors() {
static inline void initialize_vectors(void) {
#ifndef SWIFT_NET_DISABLE_REQUESTS
requests_sent = hashmap_create(&request_sent_key_allocator);
#endif

listeners = hashmap_create(NULL);
}

static inline void initialize_memory_cleanup_thread() {
static inline void initialize_memory_cleanup_thread(void) {
pthread_create(&memory_cleanup_thread, NULL, memory_cleanup_background_service, NULL);
}

void swiftnet_initialize() {
void swiftnet_initialize(void) {
#ifdef SWIFT_NET_BACKEND_DPDK
char dpdk_args[1024];
char* argv[32];
Expand Down
4 changes: 2 additions & 2 deletions src/swift_net.h
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ extern void swiftnet_client_cleanup(struct SwiftNetClientConnection* const clien
extern void swiftnet_server_cleanup(struct SwiftNetServer* const server);

// Initialize the SwiftNet library.
extern void swiftnet_initialize();
extern void swiftnet_initialize(void);

// Send a packet from the client to its connected server.
extern void swiftnet_client_send_packet(
Expand Down Expand Up @@ -445,7 +445,7 @@ extern void swiftnet_server_destroy_packet_data(
);

// Clean up the entire SwiftNet library.
extern void swiftnet_cleanup();
extern void swiftnet_cleanup(void);

#ifndef SWIFT_NET_DISABLE_REQUESTS

Expand Down
4 changes: 2 additions & 2 deletions tests/integration_tests_dpdk/src/making_request.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ static _Atomic uint32_t g_response_data_len = 0;

const uint8_t g_make_request_code = 0xFF;

static void wait_until_response_sent() {
static void wait_until_response_sent(void) {
while (atomic_load_explicit(&g_sent_response, memory_order_acquire) == false) {
usleep(1000);
}
}

static void reset_test_state() {
static void reset_test_state(void) {
swiftnet_server_cleanup(atomic_load_explicit(&g_server, memory_order_acquire));
swiftnet_client_cleanup(atomic_load_explicit(&g_client_conn, memory_order_acquire));

Expand Down
2 changes: 1 addition & 1 deletion tests/integration_tests_dpdk/src/run_tests.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

char private_ip_address_testing[INET_ADDRSTRLEN];

int main() {
int main(void) {
get_private_ip_from_socket();

const struct Test tests[] = {
Expand Down
2 changes: 1 addition & 1 deletion tests/integration_tests_dpdk/src/sending_packet.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ static _Atomic (uint8_t*) g_server_data = NULL;
static _Atomic uint32_t g_client_data_len = 0;
static _Atomic uint32_t g_server_data_len = 0;

static void reset_test_state() {
static void reset_test_state(void) {
swiftnet_server_cleanup(atomic_load_explicit(&g_server, memory_order_acquire));
swiftnet_client_cleanup(atomic_load_explicit(&g_client_conn, memory_order_acquire));

Expand Down
4 changes: 2 additions & 2 deletions tests/integration_tests_pcap/src/making_request.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ static _Atomic uint32_t g_response_data_len = 0;

const uint8_t g_make_request_code = 0xFF;

static void wait_until_response_sent() {
static void wait_until_response_sent(void) {
while (atomic_load_explicit(&g_sent_response, memory_order_acquire) == false) {
usleep(1000);
}
}

static void reset_test_state() {
static void reset_test_state(void) {
swiftnet_server_cleanup(atomic_load_explicit(&g_server, memory_order_acquire));
swiftnet_client_cleanup(atomic_load_explicit(&g_client_conn, memory_order_acquire));

Expand Down
2 changes: 1 addition & 1 deletion tests/integration_tests_pcap/src/run_tests.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

char private_ip_address_testing[INET_ADDRSTRLEN];

int main() {
int main(void) {
get_private_ip_from_socket();

const struct Test tests[] = {
Expand Down
2 changes: 1 addition & 1 deletion tests/integration_tests_pcap/src/sending_packet.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ static _Atomic (uint8_t*) g_server_data = NULL;
static _Atomic uint32_t g_client_data_len = 0;
static _Atomic uint32_t g_server_data_len = 0;

static void reset_test_state() {
static void reset_test_state(void) {
swiftnet_server_cleanup(atomic_load_explicit(&g_server, memory_order_acquire));
swiftnet_client_cleanup(atomic_load_explicit(&g_client_conn, memory_order_acquire));

Expand Down
2 changes: 1 addition & 1 deletion tests/performance_tests/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ void send_large_packets(const bool loopback) {
swiftnet_client_cleanup(client);
}

int main() {
int main(void) {
swiftnet_initialize();

send_large_packets(true);
Expand Down
2 changes: 1 addition & 1 deletion tests/shared.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ enum ConnectionType {

extern char private_ip_address_testing[INET_ADDRSTRLEN];

static inline int get_private_ip_from_socket() {
static inline int get_private_ip_from_socket(void) {
const int temp_socket = socket(AF_INET, SOCK_DGRAM, 0);
if (temp_socket < 0) {
PRINT_ERROR("Failed to create temp socket");
Expand Down
Loading