Merge pull request #120 from rountree/gcc-15.1.0

Fixes/updates for compilation under gcc 15.1.0 -Wall -Wextra -Werror

Author: mplegendre

scripts/remap.sh

@@ -19,6 +19,9 @@ cat <<EOF | $CCLINE -I $SRCDIR -shared -DWORKINGDIR=\"$WORKINGDIR\" -DUNIQ=\"$UN
 
 void get_relocated_file(int ldcs_id, char *orig_exec, int dso, char **reloc_exec, int *errcode, int *direxists)
 {
+   (void)ldcs_id;
+   (void)orig_exec;
+   (void)dso;
    *reloc_exec = strdup(WORKINGDIR "/remap2" UNIQ);
    *errcode = 0;
    if (direxists) *direxists = 1;
@@ -44,6 +47,8 @@ extern int dowork();
 int data = 5;
 int main(int argc, char *argv[])
 {
+   (void)argc;
+   (void)argv;
    return dowork();
 }
 EOF

src/biter/biterc.c

@@ -32,6 +32,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 
 #include "spindle_debug.h"
 #include "shmutil.h"
+#include "ccwarns.h"
 
 #if !defined(MAX_PATH_LEN)
 #define MAX_PATH_LEN 4096
@@ -77,11 +78,16 @@ static int init_locks(biterc_session_t *session)
    shminfo_t *shm = session->shm;
    biter_header_t *header = &shm->shared_header->biter;
    session->pipe_lock.lock = header->locks + 0;
-   session->pipe_lock.held_by = header->locks + 1;
    session->queue_lock.lock = header->locks + 2;
-   session->queue_lock.held_by = header->locks + 3;
    session->write_lock.lock = header->locks + 4;
+
+   GCC_DISABLE_WARNING("-Wincompatible-pointer-types")
+   // unsigned long int * assigned to volatile pid_t *
+   session->pipe_lock.held_by = header->locks + 1;
+   session->queue_lock.held_by = header->locks + 3;
    session->write_lock.held_by = header->locks + 5;
+   GCC_ENABLE_WARNING
+
    return init_heap_lock(shm);
 }
 

src/biter/biterd.c

@@ -44,8 +44,8 @@ typedef struct biterd_session {
    int s2c_fd;
    char *c2s_path;
    char *s2c_path;
-   int num_clients;
-   int clients_accepted;
+   uint32_t num_clients;
+   uint32_t clients_accepted;
    void *proc_messages;
    msg_header_t polled_data;
    int has_polled_data;
@@ -55,7 +55,7 @@ typedef struct biterd_session {
 } biterd_session_t;
 
 static biterd_session_t sessions[BITER_MAX_SESSIONS];
-static int max_session = 0;
+static uint32_t max_session = 0;
 
 extern void init_queue(int num_procs, void *session);
 
@@ -117,7 +117,7 @@ int biterd_newsession(const char *tmpdir, int cn_id)
    char *c2s_path = NULL, *s2c_path = NULL;
    int result, c2s_fd = -1, s2c_fd = -1;
    int path_len = strlen(tmpdir) + 32;
-   int session_id, i, unique_number, num_clients;
+   uint32_t session_id, i, unique_number, num_clients;
 
    assert(sizeof(int) == sizeof(uint32_t)); //Fix FD_* macros if this fails on new platform
 
@@ -393,7 +393,7 @@ int biterd_has_data_avail(int session_id, fd_set *readset)
    int client_id;
    int fd = sessions[session_id].c2s_fd;
    int aux_fd = get_aux_fd();
-   int i, orig;
+   uint32_t i, orig;
 
    session = sessions + session_id;
 
@@ -422,8 +422,8 @@ int biterd_has_data_avail(int session_id, fd_set *readset)
 
 int biterd_get_session_proc_w_aux_data(int *session_result, int *proc_result)
 {
-   static int last_session = 0;
-   int cur_session, start_session, j;
+   static uint32_t last_session = 0;
+   uint32_t cur_session, start_session, j;
    biterd_session_t *session;
    cur_session = start_session = last_session;
 

src/biter/client_queue.c

@@ -91,6 +91,7 @@ int init_message(int num_procs, void *header_ptr, void *session)
 
 void get_message(int for_proc, void **msg_data, size_t *msg_size, size_t *bytes_read, void *session)
 {
+   (void)session;
    message_t *msg;
    sheep_ptr_t *msgp = proc_messages + for_proc;
    assert(!IS_SHEEP_NULL(msgp));
@@ -103,6 +104,7 @@ void get_message(int for_proc, void **msg_data, size_t *msg_size, size_t *bytes_
 
 int has_message(int for_proc, void *session)
 {
+   (void)session;
    sheep_ptr_t *msgp = proc_messages + for_proc;
    return !IS_SHEEP_NULL(msgp);
 }
@@ -209,6 +211,7 @@ int get_message_space(size_t msg_size, unsigned char **msg_space, void **header_
 
 void update_bytes_read(int for_proc, size_t newval, void *session)
 {
+   (void)session;
    message_t *msg;
    sheep_ptr_t *msgp = proc_messages + for_proc;
    assert(!IS_SHEEP_NULL(msgp));

src/biter/demultiplex.h

@@ -22,7 +22,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 
 typedef struct msg_header_t {
    uint32_t msg_size;
-   uint32_t msg_target;
+   int msg_target;
 } msg_header_t;
 
 extern int test_pipe_lock(void *session);

src/biter/ids.h

@@ -18,6 +18,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 #define IDS_H_
 
 int biterc_get_job_id();
-unsigned int biterc_get_rank();
+unsigned int biterc_get_rank(int session_id);
 
 #endif

src/biter/linux_daemon_ids.c

@@ -25,6 +25,7 @@ int biterd_num_compute_nodes()
 
 int biterd_ranks_in_cn(int cn_id)
 {
+   (void)cn_id;
    char *proc_s = getenv("PROCS");
    if (proc_s)
       return atoi(proc_s);
@@ -34,20 +35,26 @@ int biterd_ranks_in_cn(int cn_id)
 
 int biterd_unique_num_for_cn(int cn_id)
 {
+   (void)cn_id;
    return 0;
 }
 
 int biterd_get_rank(int compute_node_id, int client_id)
 {
+   (void)compute_node_id;
    return client_id;
 }
 
 int biterd_register_rank(int session_id, uint32_t client_id, uint32_t rank)
 {
+   (void)session_id;
+   (void)client_id;
+   (void)rank;
    return 0;
 }
 
 int biterd_init_comms(const char *tmpdir)
 {
+   (void)tmpdir;
    return 0;
 }

src/biter/server_queue.c

@@ -45,36 +45,43 @@ void init_queue(int num_procs, void *session)
 
 int test_pipe_lock(void *session)
 {
+   (void)session;
    return 1;
 }
 
 int release_pipe_lock(void *session)
 {
+   (void)session;
    return 0;
 }
 
 int take_queue_lock(void *session)
 {
+   (void)session;
    return 0;
 }
 
 int release_queue_lock(void *session)
 {
+   (void)session;
    return 0;
 }
 
 int take_write_lock(void *session)
 {
+   (void)session;
    return 0;
 }
 
 int release_write_lock(void *session)
 {
+   (void)session;
    return 0;
 }
 
 int take_pipe_lock(void *session)
 {
+   (void)session;
    return 0;
 }
 
@@ -124,6 +131,7 @@ int enqueue_message(int for_proc, void *msg_data, size_t msg_size, void *header_
 
 int get_message_space(size_t msg_size, unsigned char **msg_space, void **header_space, void *session)
 {
+   (void)session;
    *msg_space = (unsigned char *) malloc(msg_size);
    *header_space = malloc(sizeof(message_t));
    return 0;

src/biter/shmutil.c

@@ -28,6 +28,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 #include "shmutil.h"
 #include "sheep.h"
 #include "spindle_launch.h"
+#include "ccwarns.h"
 
 static pid_t gettid()
 {
@@ -185,8 +186,11 @@ int init_heap_lock(shminfo_t *shminfo)
       return 0;
    initialized = 1;
 
+   GCC_DISABLE_WARNING("-Wincompatible-pointer-types")
+   // unsigned long int * assigned to volatile pid_t *
    shminfo->mem_lock.lock = shminfo->shared_header->base.locks + 0;
    shminfo->mem_lock.held_by = shminfo->shared_header->base.locks + 1;
+   GCC_ENABLE_WARNING
    return 0;
 }
 

src/biter/shmutil.h

@@ -17,12 +17,13 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 #if !defined(SHMUTIL_H_)
 #define SHMUTIL_H_
 
+#include <sys/types.h>
 #include "sheep.h"
 #include "spindle_launch.h"
 
 typedef struct {
    volatile unsigned long *lock;
-   volatile unsigned long *held_by;
+   volatile pid_t *held_by;
    int ref_count;
 } lock_t;
 
@@ -85,6 +86,6 @@ int setup_ids(shminfo_t *shminfo);
 int take_heap_lock(shminfo_t *shminfo);
 int release_heap_lock(shminfo_t *shminfo);
 
-void update_shm_id();
+void update_shm_id(shminfo_t *shminfo);
 
 #endif