Skip to content

M
mariadb
Commit 19b44bcf authored by Yoni Fogel's avatar Yoni Fogel
Browse files
Options

Addresses #1185 

Modified makefile to be more modular with icc and gcc options.
Modified portability.h with some stubs and some real portability code

Removed named variadic macros for unnamed variadic macros (c99 only supports unnamed)
Removed ', ## __VAR_ARGS__' in favor of ', __VAR_ARGS__' due to apparent bug in the intel compiler (on windows at least)
__ICC means the linux intel compiler, __ICL means the windows intel compiler
__INTEL_COMPILER is set by both
Removed some include files (for windows) that don't exist.

git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6473 c7de825b-a66e-492c-adef-691d508d4ae1
parent 40a73816
Hide whitespace changes
Inline Side-by-side
Showing with 134 additions and 43 deletions
newbrt/Makefile
View file @ 19b44bcf
...@@ -26,34 +26,74 @@ else ...@@ -26,34 +26,74 @@ else
endif endif
endif endif
ifneq ($(CYGWIN),) #CFLAG default options
FORMAT=-Wno-format WERROR = -Werror
CYG_ADD_LIBZ=/usr/lib/libz.a WALL = -Wall -Wextra -Wcast-align -Wbad-function-cast -Wmissing-noreturn
else FORMAT = -Wmissing-format-attribute
VISIBILITY= -fvisibility=hidden
FPICFLAGS = -fPIC FPICFLAGS = -fPIC
# valgrind is not present on cygwin SHADOW = -Wshadow
VGRIND = valgrind --quiet --error-exitcode=1 --leak-check=yes SYMBOLS = -g3 -ggdb3
VISIBILITY=-fvisibility=hidden PORTABILITY=
ifneq ($(CC),icc) SKIP_WARNING=
SHADOW=-Wshadow COMBINE_C = -combine -c
FORMAT=-Wmissing-format-attribute LINK_FILES= -lz -lpthread
endif C99 = -std=gnu99
#Tools
VGRIND = valgrind --quiet --error-exitcode=1 --leak-check=yes
ifeq ($(CC),icc)
#icc only:
OPTFLAGS = -O3 -ip -ipo2
COMBINE_C = -ipo-c
FORMAT= #No argument for extra format warnings.
WALL = -Wall -Wcheck # '-Wextra' becomes '-Wcheck' in icc
SYMBOLS= -g -debug all -inline-debug-info
PORTABILITY=-diag-enable port-win
ifneq ($(CYGWIN),)
#Cygwin
ICC_NOWARN=-Qdiag-disable:
else
#Linux
ICC_NOWARN=-diag-disable #Need the space
endif
SKIP_WARNING += $(ICC_NOWARN)177 # Don't complain about static variables that are not used.
#SKIP_WARNING += $(ICC_NOWARN)188 # Don't complain about enumerated type mixed with another type.
SKIP_WARNING += $(ICC_NOWARN)589 # Don't complain about goto into a block that skips initializing variables. GCC catches the actual uninitialized variables.
SKIP_WARNING += $(ICC_NOWARN)869 # Don't complain about unused variables (since we defined __attribute__ to be nothing.)
SKIP_WARNING += $(ICC_NOWARN)981 # Don't complain about "operands are evaluated in unspecified order". This seems to be generated whenever more than one argument to a function or operand is computed by function call.
SKIP_WARNING += $(ICC_NOWARN)1324 # Don't complain about rdtsc clobbering its registers more than once.
endif endif
CFLAGS = -Werror -Wall $(FORMAT) $(OPTFLAGS) $(GCOV_FLAGS) $(PROF_FLAGS) $(FPICFLAGS) $(SHADOW) $(VISIBILITY) ifneq ($(CYGWIN),)
ifneq ($(CC),icc) #Cygwin (Windows) Must override some settings
CFLAGS += -Wextra -Wcast-align -Wbad-function-cast -Wmissing-noreturn -g3 -ggdb3 CYG_ADD_LIBZ=/usr/lib/libz.a
else VGRIND =#No Valgrind in cygwin
CFLAGS += -g FPICFLAGS=#FPIC is default and not allowed as an option.
CFLAGS += -diag-enable port-win VISIBILITY=#Not supported
CFLAGS += -diag-disable 177 # Don't complain about static variables that are not used. SHADOW=#Not supported
#CFLAGS += -diag-disable 188 # Don't complain about enumerated type mixed with another type. ifeq ($(CC),icc)
CFLAGS += -diag-disable 589 # Don't complain about goto into a block that skips initializing variables. GCC catches the actual uninitialized variables. #Cygwin icc only
CFLAGS += -diag-disable 869 # Don't complain about unused variables (since we defined __attribute__ to be nothing.) C99 = -Qstd=c99
CFLAGS += -diag-disable 981 # Don't complain about "operands are evaluated in unspecified order". This seems to be generated whenever more than one argument to a function or operand is computed by function call. OPTFLAGS = -Ox -Qip -Qipo2
CFLAGS += -diag-disable 1324 # Don't complain about rdtsc clobbering its registers more than once. COMBINE_C = -Qipo-c
WERROR = -WX # Windows icc version of -Werror
SYMBOLS= -Zi -debug:all -Qinline-debug-info
PORTABILITY=
LINK_FILES=#Not supported
SKIP_WARNING += $(ICC_NOWARN)1786 # Don't complain about 'read/write/other standards' being deprecated
else
#Cygwin gcc only
FORMAT = -Wno-format
endif
endif endif
LDFLAGS = $(OPTFLAGS) -g $(GCOV_FLAGS) $(PROF_FLAGS) -lz -lpthread
CFLAGS = $(WALL) $(WERROR) $(FORMAT) $(VISIBILITY) $(FPICFLAGS) $(SHADOW)
CFLAGS += $(OPTFLAGS) $(GCOV_FLAGS) $(PROF_FLAGS)
CFLAGS += $(SYMBOLS) $(SKIP_WARNING) $(C99)
LDFLAGS = $(OPTFLAGS) $(SYMBOLS) $(GCOV_FLAGS) $(PROF_FLAGS) $(LINK_FILES)
# Need XOPEN_SOURCE=600 to get strtoll() # Need XOPEN_SOURCE=600 to get strtoll()
CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_XOPEN_SOURCE=600 CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_XOPEN_SOURCE=600
...@@ -114,12 +154,9 @@ HFILES = $(wildcard *.h) ...@@ -114,12 +154,9 @@ HFILES = $(wildcard *.h)
BRT_C_FILES = $(patsubst %,%.c,$(BRT_SOURCES)) BRT_C_FILES = $(patsubst %,%.c,$(BRT_SOURCES))
ifeq ($(CIL),1) ifeq ($(CIL),1)
else ifeq ($(CC),icc)
newbrt.o: $(BRT_C_FILES) $(HFILES)
$(CC) -ipo-c $(CFLAGS) $(CPPFLAGS) $(BRT_C_FILES) -o $@
else else
newbrt.o: $(BRT_C_FILES) $(HFILES) newbrt.o: $(BRT_C_FILES) $(HFILES)
$(CC) -combine $(CFLAGS) $(CPPFLAGS) $(BRT_C_FILES) -c -o $@ $(CC) $(COMBINE_C) $(CFLAGS) $(CPPFLAGS) $(BRT_C_FILES) -o $@
endif endif
tdb_logprint.o: log-internal.h brttypes.h log.h kv-pair.h log_header.h tdb_logprint.o: log-internal.h brttypes.h log.h kv-pair.h log_header.h
...@@ -185,6 +222,7 @@ clean-tests: ...@@ -185,6 +222,7 @@ clean-tests:
clean-local: clean-local:
rm -rf $(BINS) *.o *.bb *.bbg *.da *.gcov *.gcno *.gcda rm -rf $(BINS) *.o *.bb *.bbg *.da *.gcov *.gcno *.gcda
rm -rf test_oexcl.c.tmp *.brt rm -rf test_oexcl.c.tmp *.brt
rm -rf *.obj *.pdb *.ilk *.exe
# After doing (cd ../src/tests;make test_log5.recover), run these. The files should have no differences. # After doing (cd ../src/tests;make test_log5.recover), run these. The files should have no differences.
testdump: brtdump testdump: brtdump
......
newbrt/brttypes.h
View file @ 19b44bcf
...@@ -10,7 +10,9 @@ ...@@ -10,7 +10,9 @@
#define _FILE_OFFSET_BITS 64 #define _FILE_OFFSET_BITS 64
#include "../include/db.h" #include "../include/db.h"
#if !defined(TOKU_WINDOWS)
#include <inttypes.h> #include <inttypes.h>
#endif
typedef struct brt *BRT; typedef struct brt *BRT;
struct brt_header; struct brt_header;
......
newbrt/includes.h
View file @ 19b44bcf
...@@ -9,20 +9,23 @@ ...@@ -9,20 +9,23 @@
// Portability first! // Portability first!
#include "portability.h" #include "portability.h"
#include <ctype.h> #if !defined(TOKU_WINDOWS)
#include <dirent.h> #include <dirent.h>
#include <errno.h>
#include <inttypes.h> #include <inttypes.h>
#include <malloc.h>
#include <pthread.h> #include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/file.h> #include <sys/file.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h> #include <unistd.h>
#include <zlib.h> #include <zlib.h>
#endif
#include <ctype.h>
#include <errno.h>
#include <malloc.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "block_allocator.h" #include "block_allocator.h"
#include "brt.h" #include "brt.h"
......
newbrt/leafentry.h
View file @ 19b44bcf
...@@ -86,7 +86,7 @@ static inline u_int64_t getint64 (unsigned char *p) { ...@@ -86,7 +86,7 @@ static inline u_int64_t getint64 (unsigned char *p) {
unsigned char* __kvaladdr = 4 + __klenaddr; \ unsigned char* __kvaladdr = 4 + __klenaddr; \
unsigned char* __clenaddr = __klen + __kvaladdr; u_int32_t __clen = getint(__clenaddr); \ unsigned char* __clenaddr = __klen + __kvaladdr; u_int32_t __clen = getint(__clenaddr); \
unsigned char* __cvaladdr = 4 + __clenaddr; \ unsigned char* __cvaladdr = 4 + __clenaddr; \
return funname ## _le_committed(__klen, __kvaladdr, __clen, __cvaladdr, ## __VA_ARGS__); } \ return funname ## _le_committed(__klen, __kvaladdr, __clen, __cvaladdr, __VA_ARGS__); } \
case LE_BOTH: { \ case LE_BOTH: { \
unsigned char* __xidaddr = 1+(unsigned char*)le; u_int64_t __xid = getint64(__xidaddr); \ unsigned char* __xidaddr = 1+(unsigned char*)le; u_int64_t __xid = getint64(__xidaddr); \
unsigned char* __klenaddr = 8 + __xidaddr; u_int32_t __klen = getint(__klenaddr); \ unsigned char* __klenaddr = 8 + __xidaddr; u_int32_t __klen = getint(__klenaddr); \
...@@ -95,21 +95,21 @@ static inline u_int64_t getint64 (unsigned char *p) { ...@@ -95,21 +95,21 @@ static inline u_int64_t getint64 (unsigned char *p) {
unsigned char* __cvaladdr = 4 + __clenaddr; \ unsigned char* __cvaladdr = 4 + __clenaddr; \
unsigned char* __plenaddr = __clen + __cvaladdr; u_int32_t __plen = getint(__plenaddr); \ unsigned char* __plenaddr = __clen + __cvaladdr; u_int32_t __plen = getint(__plenaddr); \
unsigned char* __pvaladdr = 4 + __plenaddr; \ unsigned char* __pvaladdr = 4 + __plenaddr; \
return funname ## _le_both(__xid, __klen, __kvaladdr, __clen, __cvaladdr, __plen, __pvaladdr, ## __VA_ARGS__); } \ return funname ## _le_both(__xid, __klen, __kvaladdr, __clen, __cvaladdr, __plen, __pvaladdr, __VA_ARGS__); } \
case LE_PROVDEL: { \ case LE_PROVDEL: { \
unsigned char* __xidaddr = 1+(unsigned char*)le; u_int64_t __xid = getint64(__xidaddr); \ unsigned char* __xidaddr = 1+(unsigned char*)le; u_int64_t __xid = getint64(__xidaddr); \
unsigned char* __klenaddr = 8 + __xidaddr; u_int32_t __klen = getint(__klenaddr); \ unsigned char* __klenaddr = 8 + __xidaddr; u_int32_t __klen = getint(__klenaddr); \
unsigned char* __kvaladdr = 4 + __klenaddr; \ unsigned char* __kvaladdr = 4 + __klenaddr; \
unsigned char* __dlenaddr = __klen + __kvaladdr; u_int32_t __dlen = getint(__dlenaddr); \ unsigned char* __dlenaddr = __klen + __kvaladdr; u_int32_t __dlen = getint(__dlenaddr); \
unsigned char* __dvaladdr = 4 + __dlenaddr; \ unsigned char* __dvaladdr = 4 + __dlenaddr; \
return funname ## _le_provdel(__xid, __klen, __kvaladdr, __dlen, __dvaladdr, ## __VA_ARGS__); } \ return funname ## _le_provdel(__xid, __klen, __kvaladdr, __dlen, __dvaladdr, __VA_ARGS__); } \
case LE_PROVPAIR: { \ case LE_PROVPAIR: { \
unsigned char* __xidaddr = 1+(unsigned char*)le; u_int64_t __xid = getint64(__xidaddr); \ unsigned char* __xidaddr = 1+(unsigned char*)le; u_int64_t __xid = getint64(__xidaddr); \
unsigned char* __klenaddr = 8 + __xidaddr; u_int32_t __klen = getint(__klenaddr); \ unsigned char* __klenaddr = 8 + __xidaddr; u_int32_t __klen = getint(__klenaddr); \
unsigned char* __kvaladdr = 4 + __klenaddr; \ unsigned char* __kvaladdr = 4 + __klenaddr; \
unsigned char* __plenaddr = __klen + __kvaladdr; u_int32_t __plen = getint(__plenaddr); \ unsigned char* __plenaddr = __klen + __kvaladdr; u_int32_t __plen = getint(__plenaddr); \
unsigned char* __pvaladdr = 4 + __plenaddr; \ unsigned char* __pvaladdr = 4 + __plenaddr; \
return funname ## _le_provpair(__xid, __klen, __kvaladdr, __plen, __pvaladdr, ## __VA_ARGS__); } \ return funname ## _le_provpair(__xid, __klen, __kvaladdr, __plen, __pvaladdr, __VA_ARGS__); } \
} abort(); } while (0) } abort(); } while (0)
......
newbrt/log-internal.h
View file @ 19b44bcf
...@@ -9,7 +9,9 @@ ...@@ -9,7 +9,9 @@
#include "list.h" #include "list.h"
#include "memarena.h" #include "memarena.h"
#include <stdio.h> #include <stdio.h>
#if !defined(TOKU_WINDOWS)
#include <pthread.h> #include <pthread.h>
#endif
#include <sys/types.h> #include <sys/types.h>
#include <string.h> #include <string.h>
......
newbrt/logformat.c
View file @ 19b44bcf
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
* The struct definitions. * The struct definitions.
* The Latex documentation. * The Latex documentation.
*/ */
#include "portability.h"
#include <assert.h> #include <assert.h>
#include <ctype.h> #include <ctype.h>
#include <stdarg.h> #include <stdarg.h>
...@@ -17,7 +18,9 @@ ...@@ -17,7 +18,9 @@
#include <string.h> #include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#if !defined(TOKU_WINDOWS)
#include <unistd.h> #include <unistd.h>
#endif
typedef struct field { typedef struct field {
char *type; char *type;
...@@ -314,11 +317,11 @@ generate_dispatch (void) { ...@@ -314,11 +317,11 @@ generate_dispatch (void) {
DO_ROLLBACKS(lt, fprintf(hf, " case RT_%s: funprefix ## %s (&(s)->u.%s); break;\\\n", lt->name, lt->name, lt->name)); DO_ROLLBACKS(lt, fprintf(hf, " case RT_%s: funprefix ## %s (&(s)->u.%s); break;\\\n", lt->name, lt->name, lt->name));
fprintf(hf, " }})\n"); fprintf(hf, " }})\n");
fprintf(hf, "#define logtype_dispatch_assign(s, funprefix, var, args...) do { switch((s)->cmd) {\\\n"); fprintf(hf, "#define logtype_dispatch_assign(s, funprefix, var, ...) do { switch((s)->cmd) {\\\n");
DO_LOGTYPES(lt, fprintf(hf, " case LT_%s: var = funprefix ## %s (&(s)->u.%s, ## args); break;\\\n", lt->name, lt->name, lt->name)); DO_LOGTYPES(lt, fprintf(hf, " case LT_%s: var = funprefix ## %s (&(s)->u.%s, __VA_ARGS__); break;\\\n", lt->name, lt->name, lt->name));
fprintf(hf, " }} while (0)\n"); fprintf(hf, " }} while (0)\n");
fprintf(hf, "#define rolltype_dispatch_assign(s, funprefix, var, args...) do { \\\n"); fprintf(hf, "#define rolltype_dispatch_assign(s, funprefix, var, ...) do { \\\n");
fprintf(hf, " switch((s)->cmd) {\\\n"); fprintf(hf, " switch((s)->cmd) {\\\n");
DO_ROLLBACKS(lt, { DO_ROLLBACKS(lt, {
fprintf(hf, " case RT_%s: var = funprefix ## %s (", lt->name, lt->name); fprintf(hf, " case RT_%s: var = funprefix ## %s (", lt->name, lt->name);
...@@ -328,7 +331,7 @@ generate_dispatch (void) { ...@@ -328,7 +331,7 @@ generate_dispatch (void) {
fprintf(hf, "(s)->u.%s.%s", lt->name, ft->name); fprintf(hf, "(s)->u.%s.%s", lt->name, ft->name);
fieldcount++; fieldcount++;
}); });
fprintf(hf, ",## args); break;\\\n"); fprintf(hf, ", __VA_ARGS__); break;\\\n");
}); });
fprintf(hf, " default: assert(0);} } while (0)\n"); fprintf(hf, " default: assert(0);} } while (0)\n");
......
newbrt/portability.h
View file @ 19b44bcf
...@@ -3,8 +3,51 @@ ...@@ -3,8 +3,51 @@
// Portability layer // Portability layer
#if defined(__INTEL_COMPILER)
#if !defined(__ICL) && !defined(__ICC)
#error Which intel compiler?
#endif
#if defined(__ICL) && defined(__ICC)
#error Cannot distinguish between windows and linux intel compiler
#endif
#if defined(__ICL)
//Windows Intel Compiler
#define TOKU_WINDOWS
//Define standard integer types.
typedef __int8 int8_t;
typedef unsigned __int8 u_int8_t;
typedef __int16 int16_t;
typedef unsigned __int16 u_int16_t;
typedef __int32 int32_t;
typedef unsigned __int32 u_int32_t;
typedef __int64 int64_t;
typedef unsigned __int64 u_int64_t;
//Define chmod
/*
static inline
int
chmod(const char *path, mode_t mode) {
//TODO: Write API to support what we really need.
//Linux version supports WRITE/EXECUTE/READ bits separately for user/group/world
//windows _chmod supports WRITE/READ bits separately for ?? one type (user? world?)
//See _chmod in sys/stat.h
//Supports setting read/write mode (not separately for user/group/world)
return 0;
}
*/
#define chmod(a,b) (void)0 /* Remove temporarily till compatibility layer exists */
#define FAKE_WINDOWS_STUBS
#ifdef FAKE_WINDOWS_STUBS
typedef size_t ssize_t;
#define PRId64 "lld"
#endif //FAKE_WINDOWS_STUBS
#if defined(__ICC) #endif //Windows Intel Compiler
// Intel compiler. // Intel compiler.
// Define ntohl using bswap. // Define ntohl using bswap.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7