Move canonical definitions of MIN/MAX macros to bitmacros.h, remove duplicated defini...

Signed-off-by: Simon Gerber <simon.gerber@inf.ethz.ch>

diff --git a/include/bitmacros.h b/include/bitmacros.h
index 7f95369..508f85f 100644 (file)
--- a/include/bitmacros.h
+++ b/include/bitmacros.h
@@ -41,6 +41,16 @@
 /* Return the number of entries in a statically-allocated array */
 #define ARRAY_LENGTH(x) (sizeof(x) / sizeof((x)[0]))
 
+/* Return minimum argument */
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
+/* Return maximum argument */
+#ifndef MAX
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
 /* Compute the floor of log_2 of the given number */
 static inline uint8_t
 log2floor(uintptr_t num) {

diff --git a/include/sys/param.h b/include/sys/param.h
index 03bbcbf..0f61a49 100644 (file)
--- a/include/sys/param.h
+++ b/include/sys/param.h
@@ -197,9 +197,13 @@
 #define        roundup2(x, y)  (((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */
 #define powerof2(x)    ((((x)-1)&(x))==0)
 
-/* Macros for min/max. */
+/* Macros for min/max.: these are also defined in include/bitmacros.h */
+#ifndef MIN
 #define        MIN(a,b) (((a)<(b))?(a):(b))
+#endif
+#ifndef MIN
 #define        MAX(a,b) (((a)>(b))?(a):(b))
+#endif
 
 #ifdef _KERNEL
 /*

diff --git a/lib/arranet/arranet.c b/lib/arranet/arranet.c
index 5b88cae..c364dcf 100644 (file)
--- a/lib/arranet/arranet.c
+++ b/lib/arranet/arranet.c
@@ -829,8 +829,6 @@ struct recv_raw_args {
     /* struct packet **inpkt; */
 };
 
-#define MIN(a,b)        ((a) < (b) ? (a) : (b))
-
 static void sock_recved_udp_packet(void *arg)
 {
     struct recv_udp_args *args = arg;

diff --git a/lib/cpio/cpiobin.c b/lib/cpio/cpiobin.c
index 2f2490a..9d25dc9 100644 (file)
--- a/lib/cpio/cpiobin.c
+++ b/lib/cpio/cpiobin.c
@@ -17,11 +17,9 @@
 #include <string.h>
 
 #include <barrelfish/static_assert.h>
-#include "cpiobin.h"
+#include <bitmacros.h> // for MIN
 
-#ifndef MIN
-#define MIN(a,b) ((a) < (b)) ? (a) : (b)
-#endif // MIN
+#include "cpiobin.h"
 
 typedef struct
 {

diff --git a/lib/phoenix/map_reduce.c b/lib/phoenix/map_reduce.c
index efd955b..a455933 100644 (file)
--- a/lib/phoenix/map_reduce.c
+++ b/lib/phoenix/map_reduce.c
@@ -68,8 +68,12 @@
 #define dprintf(...) //printf(__VA_ARGS__)
 #endif
 
+#ifndef MIN
 #define MIN(X,Y) ((X) < (Y) ? (X) : (Y))
+#endif
+#ifndef MAX
 #define MAX(X,Y) ((X) > (Y) ? (X) : (Y))
+#endif
 #define OUT_PREFIX "[Phoenix] "
 
 /* A key and a value pair. */

diff --git a/lib/posixcompat/select.c b/lib/posixcompat/select.c
index f9a0ae1..4b8d2e2 100644 (file)
--- a/lib/posixcompat/select.c
+++ b/lib/posixcompat/select.c
@@ -25,7 +25,6 @@
 #include <assert.h>
 #include <unistd.h>
 
-#define        MAX(a,b) (((a)>(b))?(a):(b))
 #define READ_SLOT 0
 #define WRITE_SLOT 1
 

diff --git a/lib/posixcompat/sockets.c b/lib/posixcompat/sockets.c
index e88acf9..69b322c 100644 (file)
--- a/lib/posixcompat/sockets.c
+++ b/lib/posixcompat/sockets.c
@@ -18,8 +18,6 @@
 #include <vfs/fdtab.h>
 #include "unixsock.h"
 
-#define MIN(a,b)        ((a) < (b) ? (a) : (b))
-
 ssize_t recv(int sockfd, void *buf, size_t len, int flags)
 {
     struct fdtab_entry *e = fdtab_get(sockfd);

diff --git a/lib/rcce/RCCE_reduce.c b/lib/rcce/RCCE_reduce.c
index 399d555..3e5d4e6 100644 (file)
--- a/lib/rcce/RCCE_reduce.c
+++ b/lib/rcce/RCCE_reduce.c
@@ -28,8 +28,12 @@
 //    limitations under the License.
 // 
 #include "RCCE_lib.h"
+#ifndef MIN
 #define MIN(x,y) ( (x) < (y) ? (x) : (y) )
+#endif
+#ifndef MAX
 #define MAX(x,y) ( (x) > (y) ? (x) : (y) )
+#endif
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/lib/vfs/vfs_nfs.c b/lib/vfs/vfs_nfs.c
index d775e61..c32cbc0 100644 (file)
--- a/lib/vfs/vfs_nfs.c
+++ b/lib/vfs/vfs_nfs.c
@@ -42,7 +42,6 @@
 #define MAX_NFS_WRITE_CHUNKS 1    /* workaround for breakage in lwip */
 #define NFS_WRITE_STABILITY  UNSTABLE
 
-#define MIN(a,b) ((a)<(b)?(a):(b))
 #define assert_err(e,m)     \
 do {                        \
     if (err_is_fail(e)) {   \

diff --git a/usr/acpi/intel_vtd.h b/usr/acpi/intel_vtd.h
index 69994ed..6902c78 100644 (file)
--- a/usr/acpi/intel_vtd.h
+++ b/usr/acpi/intel_vtd.h
@@ -13,6 +13,8 @@
 
 #include <pci/confspace/pci_confspace.h>
 
+#include <bitmacros.h>
+
 #include <dev/vtd_dev.h>
 #include <dev/vtd_iotlb_dev.h>
 
@@ -25,8 +27,6 @@
 #define VTD_FOR_EACH(var, head) for (var = (head); var; var = var->next)
 #define VTD_ADD_UNIT(x, head) do {(x)->next = (head); (head) = (x);} while(0)
 
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
 
 // A structure representing a remapping hardware unit. We currently assume
 // that there is only one such unit per segment.

diff --git a/usr/arrakismon/guest.c b/usr/arrakismon/guest.c
index 90d100c..b08a7bc 100644 (file)
--- a/usr/arrakismon/guest.c
+++ b/usr/arrakismon/guest.c
@@ -42,8 +42,6 @@
 
 #define APIC_BASE       0xfee00000
 
-#define MIN(x,y) ((x)<(y)?(x):(y))
-
 lvaddr_t guest_offset = 0;
 /// stores the last used guest ASID
 static uint32_t last_guest_asid = 0;

diff --git a/usr/bench/sdma_bench/sdma_bench.c b/usr/bench/sdma_bench/sdma_bench.c
index 8d9a5bb..7524cd9 100644 (file)
--- a/usr/bench/sdma_bench/sdma_bench.c
+++ b/usr/bench/sdma_bench/sdma_bench.c
@@ -30,8 +30,6 @@
 #define OMAP44XX_SDMA_MAX_FN_BITS    15
 #define OMAP44XX_SDMA_MAX_EN_BITS    23
 
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-
 #define MEASURE(outval, CALL) {                     \
     uint64_t start, end;                            \
     sys_debug_hardware_global_timer_read(&start);   \

diff --git a/usr/bench/udp_echo/udp_echo.c b/usr/bench/udp_echo/udp_echo.c
index 9b0067d..ab5b0e8 100644 (file)
--- a/usr/bench/udp_echo/udp_echo.c
+++ b/usr/bench/udp_echo/udp_echo.c
@@ -51,8 +51,12 @@ extern size_t posix_recv_transactions;
 //#define SIMULATE_PROC_TIME
 //#define ARRANET_RECVFROM
 
+#ifndef MIN
 #define MIN(a,b)        ((a) < (b) ? (a) : (b))
+#endif
+#ifndef MAX
 #define MAX(a,b)        ((a) > (b) ? (a) : (b))
+#endif
 
 static char initbuf[] = "123456789012345678901234567890123456789012345678901234567890123";
 

diff --git a/usr/bench/udp_echo/udp_ipip_openloop.c b/usr/bench/udp_echo/udp_ipip_openloop.c
index 85603b3..9eab8d5 100644 (file)
--- a/usr/bench/udp_echo/udp_ipip_openloop.c
+++ b/usr/bench/udp_echo/udp_ipip_openloop.c
@@ -21,6 +21,7 @@
 #include <sys/time.h>
 #include <strings.h>
 #include <assert.h>
+#include <bitmacros.h>
 #include <pthread.h>
 #include <linux/if_ether.h>
 #include <sys/ioctl.h>
@@ -116,9 +117,6 @@ struct udp_hdr {
 #define INBUFSIZE      2048
 #define MAX_ROUNDS      10000000
 
-#define MIN(a,b)        ((a) < (b) ? (a) : (b))
-#define MAX(a,b)        ((a) > (b) ? (a) : (b))
-
 static struct timeval tvs[MAX_ROUNDS], tst[MAX_ROUNDS];
 
 /*

diff --git a/usr/bench/udp_echo/udp_openloop.c b/usr/bench/udp_echo/udp_openloop.c
index 60244d3..df90ba5 100644 (file)
--- a/usr/bench/udp_echo/udp_openloop.c
+++ b/usr/bench/udp_echo/udp_openloop.c
@@ -36,8 +36,12 @@
 #define BUFSIZE         1024
 #define MAX_ROUNDS      10000000
 
+#ifndef MIN
 #define MIN(a,b)        ((a) < (b) ? (a) : (b))
+#endif
+#ifndef MAX
 #define MAX(a,b)        ((a) > (b) ? (a) : (b))
+#endif
 
 static struct timeval tvs[MAX_ROUNDS], tst[MAX_ROUNDS];
 

diff --git a/usr/block_server/network_common.h b/usr/block_server/network_common.h
index 7364353..99ed978 100644 (file)
--- a/usr/block_server/network_common.h
+++ b/usr/block_server/network_common.h
@@ -26,6 +26,7 @@
 #include <bulk_transfer/bulk_local.h>
 #endif
 
+#include <bitmacros.h> // for MIN
 
 
 enum block_net_msg_type
@@ -110,7 +111,5 @@ struct block_net_service {
 #endif
 };
 
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-
 #endif /* BLOCK_NETWORK_COMMON_H */
 

diff --git a/usr/drivers/megaraid/megaraid.c b/usr/drivers/megaraid/megaraid.c
index 417910f..17a0835 100644 (file)
--- a/usr/drivers/megaraid/megaraid.c
+++ b/usr/drivers/megaraid/megaraid.c
@@ -59,7 +59,9 @@ static uint32_t pci_deviceid = MRSAS_INVADER;
 
 #define ECONNREFUSED   61
 
+#ifndef MIN
 #define MIN(a,b)       ((a) < (b) ? (a) : (b))
+#endif
 
 struct megaraid_ctrl *sc = NULL;
 #ifndef BARRELFISH

diff --git a/usr/drivers/omap44xx/sdma/sdma.h b/usr/drivers/omap44xx/sdma/sdma.h
index 2248d4a..b5584ef 100644 (file)
--- a/usr/drivers/omap44xx/sdma/sdma.h
+++ b/usr/drivers/omap44xx/sdma/sdma.h
@@ -11,8 +11,7 @@
 #define SDMA_H_
 
 #include <if/omap_sdma_defs.h>
-
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
+#include <bitmacros.h>
 
 void start_service(void);
 

diff --git a/usr/drivers/xeon_phi/boot.c b/usr/drivers/xeon_phi/boot.c
index 1456ecf..52a7ac6 100644 (file)
--- a/usr/drivers/xeon_phi/boot.c
+++ b/usr/drivers/xeon_phi/boot.c
@@ -52,12 +52,7 @@ typedef errval_t (*loadfile_fn_t)(char *path, void *buf, size_t buflen, size_t *
 #define UOS_RESERVE_SIZE_MIN    ((128) * 1024 * 1024)
 #define UOS_RESERVE_SIZE_MAX    (((4) * 1024 * 1024 * 1024ULL) - ((4) * 1024))
 
-/*
- * Helper macros
- */
-#define MAX(a, b)   ( ((a) > (b)) ? (a) : (b) )
-#define MIN(a, b)   ( ((a) < (b)) ? (a) : (b) )
-#define ALIGN(x) ((x + BASE_PAGE_SIZE-1) & ~(BASE_PAGE_SIZE-1))
+#define ALIGN(x) ROUND_UP(x, BASE_PAGE_SIZE)
 
 static xeon_phi_boot_t boot_registers;
 static xeon_phi_apic_t apic_registers;

diff --git a/usr/monitor/inter.c b/usr/monitor/inter.c
index 52097f6..70ee2cf 100644 (file)
--- a/usr/monitor/inter.c
+++ b/usr/monitor/inter.c
@@ -22,8 +22,6 @@
 #include "capops.h"
 #include <trace_definitions/trace_defs.h>
 
-#define MIN(x,y) ((x<y) ? (x) : (y))
-#define MAX(x,y) ((x>y) ? (x) : (y))
 static bool* notification_sent = NULL;
 static bool* monitor_ready = NULL;
 static errval_t new_monitor_notify(coreid_t id)

diff --git a/usr/netfile/netfile.c b/usr/netfile/netfile.c
index 1546f27..6a7220d 100644 (file)
--- a/usr/netfile/netfile.c
+++ b/usr/netfile/netfile.c
@@ -46,8 +46,6 @@ wait_for_condition (void) {
 
 /* -------------- LWIP/network initialisation ----------------------*/
 
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-
 #define SEND_TIMER_MSECS 4
 
 

diff --git a/usr/pci/pci.c b/usr/pci/pci.c
index 926bcc4..016d7a1 100644 (file)
--- a/usr/pci/pci.c
+++ b/usr/pci/pci.c
@@ -35,8 +35,6 @@
 
 #include <if/acpi_rpcclient_defs.h>
 
-#define MIN(a,b)        ((a) < (b) ? (a) : (b))
-
 #define BAR_PROBE       0xffffffff
 
 #define PAGE_BITS BASE_PAGE_BITS

diff --git a/usr/replay/slave.c b/usr/replay/slave.c
index 4a15d9f..17db2b1 100644 (file)
--- a/usr/replay/slave.c
+++ b/usr/replay/slave.c
@@ -28,7 +28,9 @@
 
 #include "defs.h"
 
+#ifndef MIN
 #define MIN(x,y) (x < y ? x : y)
+#endif
 
 static char *defdir;
 static struct {

diff --git a/usr/tests/net_tests/posix-sockets/main.c b/usr/tests/net_tests/posix-sockets/main.c
index fac011e..12b41cf 100644 (file)
--- a/usr/tests/net_tests/posix-sockets/main.c
+++ b/usr/tests/net_tests/posix-sockets/main.c
@@ -42,8 +42,12 @@
 #define BACKLOG             10
 #define BUFFER_SIZE         32
 
+#ifndef MAX
 #define        MAX(a,b) (((a)>(b))?(a):(b))
+#endif
+#ifndef MIN
 #define MIN(a,b) (((a)<(b))?(a):(b))
+#endif
 
 enum client_state {
     READING,

diff --git a/usr/vmkitmon/guest.c b/usr/vmkitmon/guest.c
index a3a501c..61d1e3e 100644 (file)
--- a/usr/vmkitmon/guest.c
+++ b/usr/vmkitmon/guest.c
@@ -14,6 +14,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <bitmacros.h> // for MIN
 #include "vmkitmon.h"
 #include <barrelfish/lmp_endpoints.h>
 #include "x86.h"
@@ -48,8 +49,6 @@
 
 #define SERIAL_DRIVER   "serial0.raw"
 
-#define MIN(x,y) ((x)<(y)?(x):(y))
-
 #ifndef CONFIG_SVM
 extern uint16_t saved_exit_reason;
 extern uint64_t saved_exit_qual, saved_rip;

diff --git a/usr/webserver/http_server.c b/usr/webserver/http_server.c
index 528b16b..a374b09 100644 (file)
--- a/usr/webserver/http_server.c
+++ b/usr/webserver/http_server.c
@@ -45,9 +45,6 @@
 #define HTTP_MIME_BZIP2 "Content-type: application/x-bzip2" CRLF
 #define HTTP_MIME_OCTET "Content-type: application/octet-stream" CRLF
 
-#define MIN(a,b)        ((a) < (b) ? (a) : (b))
-
-
 
 static const char notfound_reply[] =
     HTTP_HEADER_404 HTTP_MIME_HTML CRLF