Changeset b7664a03

Timestamp:

Jan 15, 2021, 2:30:03 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

1dbc3e10, d46bdac

Parents:

8c43d05

Message:

Removed some warnings and allowed io calls to compile without io_uring.

Location:

libcfa/src

Files:

• concurrency/io/setup.cfa (modified) (1 diff)
• concurrency/stats.hfa (modified) (2 diffs)
• parseargs.cfa (modified) (1 diff)

libcfa/src/concurrency/io/setup.cfa

@@ -42 +42 @@
         void ^?{}(io_context & this, bool cluster_context) {}
 
+        void register_fixed_files( io_context &, int *, unsigned ) {}
+        void register_fixed_files( cluster    &, int *, unsigned ) {}
+
 #else
         #include <errno.h>

libcfa/src/concurrency/stats.hfa

@@ -2 +2 @@
 
 #include <stdint.h>
+
+enum {
+        CFA_STATS_READY_Q  = 0x01,
+        CFA_STATS_IO = 0x02,
+};
 
 #if defined(__CFA_NO_STATISTICS__)
@@ -9 +14 @@
         static inline void __print_stats( struct __stats_t *, int, const char *, const char *, void * ) {}
 #else
-        enum {
-                CFA_STATS_READY_Q  = 0x01,
-                #if defined(CFA_HAVE_LINUX_IO_URING_H)
-                        CFA_STATS_IO = 0x02,
-                #endif
-        };
 
         struct __attribute__((aligned(64))) __stats_readQ_t {

libcfa/src/parseargs.cfa

@@ -39 +39 @@
                         if( options[i].short_name != '\0'
                         && options[i].short_name == options[j].short_name)
-                                abort("Parse Args error: two options have short name '%c' (%d & %d)", options[i].short_name, i, j);
-
-                        if(0 == strcmp(options[i].long_name, options[j].long_name)) abort("Parse Args error: two options have long name '%s' (%d & %d)", options[i].long_name, i, j);
+                                abort("Parse Args error: two options have short name '%c' (%zu & %zu)", options[i].short_name, i, j);
+
+                        if(0 == strcmp(options[i].long_name, options[j].long_name)) abort("Parse Args error: two options have long name '%s' (%zu & %zu)", options[i].long_name, i, j);
                 }
         }