move profiler code to common lib

personal/stbuehler/wip
Stefan Bühler 11 years ago
parent bd15bb8f82
commit bd5c2f4ebe
  1. 13
      src/CMakeLists.txt
  2. 5
      src/common/Makefile.am
  3. 0
      src/common/profiler.c
  4. 8
      src/common/wscript
  5. 4
      src/main/Makefile.am
  6. 7
      src/main/wscript

@ -188,6 +188,12 @@ SET(COMMON_SRC
waitqueue.c
)
IF(WITH_PROFILER)
SET(COMMON_SRC ${COMMON_SRC}
profiler.c
)
ENDIF(WITH_PROFILER)
ADD_PREFIX(COMMON_SRC common/)
SET(LIGHTTPD_SHARED_SRC
@ -235,13 +241,6 @@ IF(NOT WITHOUT_CONFIG_PARSER)
)
ENDIF(NOT WITHOUT_CONFIG_PARSER)
IF(WITH_PROFILER)
SET(LIGHTTPD_SHARED_SRC ${LIGHTTPD_SHARED_SRC}
profiler.c
)
ENDIF(WITH_PROFILER)
IF(WITH_LUA)
SET(LIGHTTPD_SHARED_SRC ${LIGHTTPD_SHARED_SRC}
actions_lua.c

@ -20,6 +20,11 @@ common_src= \
utils.c \
waitqueue.c
if WITH_PROFILER
common_src+= profiler.c
endif
EXTRA_liblighttpd2_common_la_SOURCES=$(lua_src) profiler.c
BUILT_SOURCES=ip_parsers.c
ip_parsers.c: ip_parsers.rl

@ -33,6 +33,14 @@ def build(bld):
utils.c
waitqueue.c
'''
if bld.env['WITH_PROFILER'] == 1:
if sys.platform.startswith('freebsd'):
libs += ['execinfo']
source += '''
profiler.c
'''
if sys.platform.startswith('freebsd'):
libs = ['kvm']
else:

@ -65,10 +65,6 @@ lua_src= \
if USE_LUA
lighttpd_shared_src+=$(lua_src)
endif
if WITH_PROFILER
lighttpd_shared_src+= profiler.c
endif
EXTRA_liblighttpd2_shared_la_SOURCES=$(lua_src) profiler.c
BUILT_SOURCES=config_parser.c http_range_parser.c http_request_parser.c http_response_parser.c url_parser.c

@ -58,13 +58,6 @@ def build(bld):
worker.c
'''
if bld.env['WITH_PROFILER'] == 1:
if sys.platform.startswith('freebsd'):
libs += ['execinfo']
source += '''
profiler.c
'''
if bld.env['USE_LUA'] == 1:
libs += ['lua']
source += '''

Loading…
Cancel
Save