Merge pull request #2 from cinience/dev

Update deps, Del win code.

CMakeLists.txt

@@ -2,11 +2,9 @@ cmake_minimum_required(VERSION 2.6)
 
 project (saker C)
 
-option(ENABLE_DEBUG
-    "Set to OFF|ON (default is OFF) to control Debug or Release" ON)
-
-option(ENABLE_TESTS
-    "Set to OFF|ON (default is OFF) to control build of tests " ON)
+option(ENABLE_DEBUG "Set to OFF|ON (default is OFF) to control Debug or Release" ON)
+option(ENABLE_JEMALLOC "Set to OFF|ON (default is ON) to control use jemalloc or not" ON)
+option(ENABLE_TESTS "Set to OFF|ON (default is OFF) to control build of tests " ON)
 
 set(CMAKE_USE_RELATIVE_PATHS TRUE)
 
@@ -17,22 +15,67 @@ if (NOT CMAKE_BUILD_TYPE)
         set(CMAKE_BUILD_TYPE Release)  
     endif ()
 endif ()
-
+
+if (ENABLE_JEMALLOC)
+    set(DepLibs 
+        libjemalloc.a
+        )
+    set(CMAKE_C_FLAGS "-DUSE_JEMALLOC")
+endif ()
+
 if (UNIX)
     set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
     set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
+    # -std=gnu99 -pedantic -Wshadow -Wunreachable-code -Wstrict-prototypes
+    set(CMAKE_C_FLAGS "-Wall -Wno-unused-function -Wno-strict-aliasing -DLUA_COMPAT_ALL")
     set(CMAKE_C_FLAGS_DEBUG "-O0 -Wall -g3 -DDEBUG")
     set(CMAKE_C_FLAGS_RELEASE "-O2 -Wall -g2 -DNDEBUG")
-elseif (MSVC)
-    add_definitions("-D_CRT_SECURE_NO_WARNINGS")
-    add_definitions("-D_WIN32IOCP")
-    add_definitions("-D__x86_64__")
-    set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
-    set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib) 
 else ()
-    message(FATAL_ERROR,"must use msvc in windows or gcc in unix")
+    message(FATAL_ERROR, "must use gcc in unix")
 endif ()
 
+set(ThdInstallDir ${PROJECT_SOURCE_DIR}/cmake_build/thd-usr)
+set(ThdDir ${PROJECT_SOURCE_DIR}/deps)
+
+include_directories(${ThdInstallDir}/include)
+
+link_directories(${PROJECT_SOURCE_DIR}/lib)
+link_directories(${ThdInstallDir}/lib)
+
+set(HiRedisLib ${ThdInstallDir}/lib/libhiredis.a)
+set(LuaLib ${ThdInstallDir}/lib/liblua.a)
+set(JeMallocLib ${ThdInstallDir}/lib/libjemalloc.a)
+
+add_custom_command(OUTPUT ${HiRedisLib}
+                  PRE_BUILD 
+                  COMMAND make static
+                  COMMAND make PREFIX=${ThdInstallDir} install
+                  WORKING_DIRECTORY ${ThdDir}/hiredis
+                  COMMENT "build hiredis")
+
+add_custom_command(OUTPUT ${LuaLib}
+                  PRE_BUILD 
+                  COMMAND export CFLAGS="$CFLAGS -Wno-deprecated-declarations"
+                  COMMAND make ansi
+                  COMMAND make install INSTALL_TOP=${ThdInstallDir} LUA_COMPAT_ALL=1
+                  WORKING_DIRECTORY ${ThdDir}/lua-5.2.3
+                  COMMENT "build lualib")
+
+#set(JEMALLOC_CFLAGS "-std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops" $(CFLAGS))
+
+add_custom_command(OUTPUT ${JeMallocLib}
+                  PRE_BUILD 
+                  COMMAND chmod +x configure *sh
+                  COMMAND chmod +x include/jemalloc/*.sh 
+                  COMMAND chmod +x include/jemalloc/internal/*.sh 
+                  COMMAND ./configure --prefix=${ThdInstallDir} --with-jemalloc-prefix=je_ --enable-cc-silence 
+                  COMMAND make
+                  COMMAND make install
+                  WORKING_DIRECTORY ${ThdDir}/jemalloc-3.6.0
+                  COMMENT "build libjemalloc")
+
+add_custom_target(run ALL DEPENDS ${HiRedisLib} ${LuaLib} ${JeMallocLib})
+
 if (ENABLE_TESTS)
     include(CTest)
     ENABLE_TESTING()
@@ -41,15 +84,8 @@ else ()
     message(STATUS "Building without tests ")
 endif ()
 
-add_subdirectory(deps)
 add_subdirectory(src)
 add_subdirectory(src/client)
 
 message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator")
 message(STATUS "Installation target path: ${CMAKE_INSTALL_PREFIX}")
-#message(STATUS "C_FLAGS:  =${CMAKE_C_FLAGS}")
-#message(STATUS "CXX_FLAGS:=${CMAKE_CXX_FLAGS}")
-
-#add_test(NAME PreScheduler WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${EXECUTABLE_OUTPUT_PATH}/PreScheduler-testrunner -all)
-
-

deps/jemalloc-3.6.0/.gitignore

@@ -0,0 +1,72 @@
+/*.gcov.*
+
+/autom4te.cache/
+
+/bin/jemalloc.sh
+
+/config.stamp
+/config.log
+/config.status
+/configure
+
+/doc/html.xsl
+/doc/manpages.xsl
+/doc/jemalloc.xml
+/doc/jemalloc.html
+/doc/jemalloc.3
+
+/lib/
+
+/Makefile
+
+/include/jemalloc/internal/jemalloc_internal.h
+/include/jemalloc/internal/jemalloc_internal_defs.h
+/include/jemalloc/internal/private_namespace.h
+/include/jemalloc/internal/private_unnamespace.h
+/include/jemalloc/internal/public_namespace.h
+/include/jemalloc/internal/public_symbols.txt
+/include/jemalloc/internal/public_unnamespace.h
+/include/jemalloc/internal/size_classes.h
+/include/jemalloc/jemalloc.h
+/include/jemalloc/jemalloc_defs.h
+/include/jemalloc/jemalloc_macros.h
+/include/jemalloc/jemalloc_mangle.h
+/include/jemalloc/jemalloc_mangle_jet.h
+/include/jemalloc/jemalloc_protos.h
+/include/jemalloc/jemalloc_protos_jet.h
+/include/jemalloc/jemalloc_rename.h
+
+/src/*.[od]
+/src/*.gcda
+/src/*.gcno
+
+/test/test.sh
+test/include/test/jemalloc_test.h
+test/include/test/jemalloc_test_defs.h
+
+/test/integration/[A-Za-z]*
+!/test/integration/[A-Za-z]*.*
+/test/integration/*.[od]
+/test/integration/*.gcda
+/test/integration/*.gcno
+/test/integration/*.out
+
+/test/src/*.[od]
+/test/src/*.gcda
+/test/src/*.gcno
+
+/test/stress/[A-Za-z]*
+!/test/stress/[A-Za-z]*.*
+/test/stress/*.[od]
+/test/stress/*.gcda
+/test/stress/*.gcno
+/test/stress/*.out
+
+/test/unit/[A-Za-z]*
+!/test/unit/[A-Za-z]*.*
+/test/unit/*.[od]
+/test/unit/*.gcda
+/test/unit/*.gcno
+/test/unit/*.out
+
+/VERSION

deps/jemalloc/COPYING → deps/jemalloc-3.6.0/COPYING

@@ -1,10 +1,10 @@
 Unless otherwise specified, files in the jemalloc source distribution are
 subject to the following license:
 --------------------------------------------------------------------------------
-Copyright (C) 2002-2012 Jason Evans <[email protected]>.
+Copyright (C) 2002-2014 Jason Evans <[email protected]>.
 All rights reserved.
 Copyright (C) 2007-2012 Mozilla Foundation.  All rights reserved.
-Copyright (C) 2009-2012 Facebook, Inc.  All rights reserved.
+Copyright (C) 2009-2014 Facebook, Inc.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

deps/jemalloc/ChangeLog → deps/jemalloc-3.6.0/ChangeLog

@@ -3,8 +3,176 @@ bug fixes are all mentioned, but internal enhancements are omitted here for
 brevity (even though they are more fun to write about).  Much more detail can be
 found in the git revision history:
 
-    http://www.canonware.com/cgi-bin/gitweb.cgi?p=jemalloc.git
-    git://canonware.com/jemalloc.git
+    https://github.com/jemalloc/jemalloc
+
+* 3.6.0 (March 31, 2014)
+
+  This version contains a critical bug fix for a regression present in 3.5.0 and
+  3.5.1.
+
+  Bug fixes:
+  - Fix a regression in arena_chunk_alloc() that caused crashes during
+    small/large allocation if chunk allocation failed.  In the absence of this
+    bug, chunk allocation failure would result in allocation failure, e.g.  NULL
+    return from malloc().  This regression was introduced in 3.5.0.
+  - Fix backtracing for gcc intrinsics-based backtracing by specifying
+    -fno-omit-frame-pointer to gcc.  Note that the application (and all the
+    libraries it links to) must also be compiled with this option for
+    backtracing to be reliable.
+  - Use dss allocation precedence for huge allocations as well as small/large
+    allocations.
+  - Fix test assertion failure message formatting.  This bug did not manifect on
+    x86_64 systems because of implementation subtleties in va_list.
+  - Fix inconsequential test failures for hash and SFMT code.
+
+  New features:
+  - Support heap profiling on FreeBSD.  This feature depends on the proc
+    filesystem being mounted during heap profile dumping.
+
+* 3.5.1 (February 25, 2014)
+
+  This version primarily addresses minor bugs in test code.
+
+  Bug fixes:
+  - Configure Solaris/Illumos to use MADV_FREE.
+  - Fix junk filling for mremap(2)-based huge reallocation.  This is only
+    relevant if configuring with the --enable-mremap option specified.
+  - Avoid compilation failure if 'restrict' C99 keyword is not supported by the
+    compiler.
+  - Add a configure test for SSE2 rather than assuming it is usable on i686
+    systems.  This fixes test compilation errors, especially on 32-bit Linux
+    systems.
+  - Fix mallctl argument size mismatches (size_t vs. uint64_t) in the stats unit
+    test.
+  - Fix/remove flawed alignment-related overflow tests.
+  - Prevent compiler optimizations that could change backtraces in the
+    prof_accum unit test.
+
+* 3.5.0 (January 22, 2014)
+
+  This version focuses on refactoring and automated testing, though it also
+  includes some non-trivial heap profiling optimizations not mentioned below.
+
+  New features:
+  - Add the *allocx() API, which is a successor to the experimental *allocm()
+    API.  The *allocx() functions are slightly simpler to use because they have
+    fewer parameters, they directly return the results of primary interest, and
+    mallocx()/rallocx() avoid the strict aliasing pitfall that
+    allocm()/rallocm() share with posix_memalign().  Note that *allocm() is
+    slated for removal in the next non-bugfix release.
+  - Add support for LinuxThreads.
+
+  Bug fixes:
+  - Unless heap profiling is enabled, disable floating point code and don't link
+    with libm.  This, in combination with e.g. EXTRA_CFLAGS=-mno-sse on x64
+    systems, makes it possible to completely disable floating point register
+    use.  Some versions of glibc neglect to save/restore caller-saved floating
+    point registers during dynamic lazy symbol loading, and the symbol loading
+    code uses whatever malloc the application happens to have linked/loaded
+    with, the result being potential floating point register corruption.
+  - Report ENOMEM rather than EINVAL if an OOM occurs during heap profiling
+    backtrace creation in imemalign().  This bug impacted posix_memalign() and
+    aligned_alloc().
+  - Fix a file descriptor leak in a prof_dump_maps() error path.
+  - Fix prof_dump() to close the dump file descriptor for all relevant error
+    paths.
+  - Fix rallocm() to use the arena specified by the ALLOCM_ARENA(s) flag for
+    allocation, not just deallocation.
+  - Fix a data race for large allocation stats counters.
+  - Fix a potential infinite loop during thread exit.  This bug occurred on
+    Solaris, and could affect other platforms with similar pthreads TSD
+    implementations.
+  - Don't junk-fill reallocations unless usable size changes.  This fixes a
+    violation of the *allocx()/*allocm() semantics.
+  - Fix growing large reallocation to junk fill new space.
+  - Fix huge deallocation to junk fill when munmap is disabled.
+  - Change the default private namespace prefix from empty to je_, and change
+    --with-private-namespace-prefix so that it prepends an additional prefix
+    rather than replacing je_.  This reduces the likelihood of applications
+    which statically link jemalloc experiencing symbol name collisions.
+  - Add missing private namespace mangling (relevant when
+    --with-private-namespace is specified).
+  - Add and use JEMALLOC_INLINE_C so that static inline functions are marked as
+    static even for debug builds.
+  - Add a missing mutex unlock in a malloc_init_hard() error path.  In practice
+    this error path is never executed.
+  - Fix numerous bugs in malloc_strotumax() error handling/reporting.  These
+    bugs had no impact except for malformed inputs.
+  - Fix numerous bugs in malloc_snprintf().  These bugs were not exercised by
+    existing calls, so they had no impact.
+
+* 3.4.1 (October 20, 2013)
+
+  Bug fixes:
+  - Fix a race in the "arenas.extend" mallctl that could cause memory corruption
+    of internal data structures and subsequent crashes.
+  - Fix Valgrind integration flaws that caused Valgrind warnings about reads of
+    uninitialized memory in:
+    + arena chunk headers
+    + internal zero-initialized data structures (relevant to tcache and prof
+      code)
+  - Preserve errno during the first allocation.  A readlink(2) call during
+    initialization fails unless /etc/malloc.conf exists, so errno was typically
+    set during the first allocation prior to this fix.
+  - Fix compilation warnings reported by gcc 4.8.1.
+
+* 3.4.0 (June 2, 2013)
+
+  This version is essentially a small bugfix release, but the addition of
+  aarch64 support requires that the minor version be incremented.
+
+  Bug fixes:
+  - Fix race-triggered deadlocks in chunk_record().  These deadlocks were
+    typically triggered by multiple threads concurrently deallocating huge
+    objects.
+
+  New features:
+  - Add support for the aarch64 architecture.
+
+* 3.3.1 (March 6, 2013)
+
+  This version fixes bugs that are typically encountered only when utilizing
+  custom run-time options.
+
+  Bug fixes:
+  - Fix a locking order bug that could cause deadlock during fork if heap
+    profiling were enabled.
+  - Fix a chunk recycling bug that could cause the allocator to lose track of
+    whether a chunk was zeroed.  On FreeBSD, NetBSD, and OS X, it could cause
+    corruption if allocating via sbrk(2) (unlikely unless running with the
+    "dss:primary" option specified).  This was completely harmless on Linux
+    unless using mlockall(2) (and unlikely even then, unless the
+    --disable-munmap configure option or the "dss:primary" option was
+    specified).  This regression was introduced in 3.1.0 by the
+    mlockall(2)/madvise(2) interaction fix.
+  - Fix TLS-related memory corruption that could occur during thread exit if the
+    thread never allocated memory.  Only the quarantine and prof facilities were
+    susceptible.
+  - Fix two quarantine bugs:
+    + Internal reallocation of the quarantined object array leaked the old
+      array.
+    + Reallocation failure for internal reallocation of the quarantined object
+      array (very unlikely) resulted in memory corruption.
+  - Fix Valgrind integration to annotate all internally allocated memory in a
+    way that keeps Valgrind happy about internal data structure access.
+  - Fix building for s390 systems.
+
+* 3.3.0 (January 23, 2013)
+
+  This version includes a few minor performance improvements in addition to the
+  listed new features and bug fixes.
+
+  New features:
+  - Add clipping support to lg_chunk option processing.
+  - Add the --enable-ivsalloc option.
+  - Add the --without-export option.
+  - Add the --disable-zone-allocator option.
+
+  Bug fixes:
+  - Fix "arenas.extend" mallctl to output the number of arenas.
+  - Fix chunk_recycle() to unconditionally inform Valgrind that returned memory
+    is undefined.
+  - Fix build break on FreeBSD related to alloca.h.
 
 * 3.2.0 (November 9, 2012)