sr-dev March 2010

sr-dev@lists.kamailio.org

24 participants
359 discussions

git:sr_3.0: mem: fix f_malloc big fragments bug
by Andrei Pelinescu-Onciul 11 Mar '10

11 Mar '10

Module: sip-router Branch: sr_3.0 Commit: b8592ad5ea877cf1299519ed209110cc59e87995 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b8592ad… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 11 21:08:20 2010 +0100 mem: fix f_malloc big fragments bug In some situation, when dealing with several big free fragments (>16k) f_malloc would wrongly choose a fragment with a smaller size then requested. This would create the impression that someone arbitrarily overwrites the memory. First symptoms were some tls crashes reported by Klaus Darilion klaus.darilion(a)nic.at. Reproduced using the malloc_test module. (cherry picked from commit c7099d0a1204120277cf662cc05ab35180d89538) --- mem/f_malloc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mem/f_malloc.c b/mem/f_malloc.c index c49a252..2c05fe6 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -337,7 +337,7 @@ void* fm_malloc(struct fm_block* qm, unsigned long size) hash=fm_bmp_first_set(qm, GET_HASH(size)); if (likely(hash>=0)){ f=&(qm->free_hash[hash].first); - if (likely(hash<=F_MALLOC_OPTIMIZE)) /* return first match */ + if (likely(hash<=F_MALLOC_OPTIMIZE/ROUNDTO)) /* return first match */ goto found; for(;(*f); f=&((*f)->u.nxt_free)) if ((*f)->size>=size) goto found; @@ -346,7 +346,7 @@ void* fm_malloc(struct fm_block* qm, unsigned long size) for(hash=GET_HASH(size);hash<F_HASH_SIZE;hash++){ f=&(qm->free_hash[hash].first); #if 0 - if (likely(hash<=F_MALLOC_OPTIMIZE)) /* return first match */ + if (likely(hash<=F_MALLOC_OPTIMIZE/ROUNDTO)) /* return first match */ goto found; #endif for(;(*f); f=&((*f)->u.nxt_free))

1 0

git:master: malloc_test: doc updates & generated README
by Andrei Pelinescu-Onciul 11 Mar '10

11 Mar '10

Module: sip-router Branch: master Commit: a5e2e4bc96fcdca24b814ca57887ef4e00b3cb1f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a5e2e4b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 11 21:06:17 2010 +0100 malloc_test: doc updates & generated README --- modules/malloc_test/README | 230 +++++++++++++++++++++++++++++++ modules/malloc_test/doc/malloc_test.xml | 7 +- modules/malloc_test/doc/params.xml | 9 +- modules/malloc_test/doc/rpc.xml | 229 ++++++++++++++++++++++++++++++ modules/malloc_test/malloc_test.c | 17 ++- 5 files changed, 483 insertions(+), 9 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a5e…

1 0

git:master: mem: fix f_malloc big fragments bug
by Andrei Pelinescu-Onciul 11 Mar '10

11 Mar '10

Module: sip-router Branch: master Commit: c7099d0a1204120277cf662cc05ab35180d89538 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c7099d0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 11 21:08:20 2010 +0100 mem: fix f_malloc big fragments bug In some situation, when dealing with several big free fragments (>16k) f_malloc would wrongly choose a fragment with a smaller size then requested. This would create the impression that someone arbitrarily overwrites the memory. First symptoms were some tls crashes reported by Klaus Darilion klaus.darilion(a)nic.at. Reproduced using the malloc_test module. --- mem/f_malloc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mem/f_malloc.c b/mem/f_malloc.c index c49a252..2c05fe6 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -337,7 +337,7 @@ void* fm_malloc(struct fm_block* qm, unsigned long size) hash=fm_bmp_first_set(qm, GET_HASH(size)); if (likely(hash>=0)){ f=&(qm->free_hash[hash].first); - if (likely(hash<=F_MALLOC_OPTIMIZE)) /* return first match */ + if (likely(hash<=F_MALLOC_OPTIMIZE/ROUNDTO)) /* return first match */ goto found; for(;(*f); f=&((*f)->u.nxt_free)) if ((*f)->size>=size) goto found; @@ -346,7 +346,7 @@ void* fm_malloc(struct fm_block* qm, unsigned long size) for(hash=GET_HASH(size);hash<F_HASH_SIZE;hash++){ f=&(qm->free_hash[hash].first); #if 0 - if (likely(hash<=F_MALLOC_OPTIMIZE)) /* return first match */ + if (likely(hash<=F_MALLOC_OPTIMIZE/ROUNDTO)) /* return first match */ goto found; #endif for(;(*f); f=&((*f)->u.nxt_free))

1 0

git:master: malloc_test: new module for testing/debugging memory problems
by Andrei Pelinescu-Onciul 11 Mar '10

11 Mar '10

Module: sip-router Branch: master Commit: 0ff010fa5777a2c9c8ef477079323828e2362781 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0ff010f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 11 19:38:04 2010 +0100 malloc_test: new module for testing/debugging memory problems malloc_test is a new module for stressing the memory allocators and easily simulating out-of-memory conditions or memory leaks. Implemented RPCs: mt.mem_alloc size - allocates size bytes mt.mem_free [size] - frees at least size bytes. If size is missing frees everything allocated by any malloc_test test function. mt.mem_used - amount of currently allocated mem. by malloc_test. mt.mem_rnd_alloc min max total [unit] - allocates total <unit> bytes in chunks with the size randomly chosen between min and max. <unit> is optional and can be one of b-bytes, k - kb, m - mb, g -gb. mt.mem_test_start min max total min_int max_int total_time [unit] starts a malloc test that will take total_time to execute. Memory allocations will be performed at intervals randomly chosen between min_int and max_int (in ms). Each allocation will have a randomly chosen size between min and max <unit> bytes. After total <unit> bytes are allocated, everything is released/freed again and the allocations are restarted. The total_time is expressed in milliseconds. Several tests can be run in the same time. mt.mem_test_stop id - stops the test identified by id. mt.mem_test_destroy id - destroys the test identified by id (besides stopping it, it also frees all the data, including the statistics). mt.mem_test_destroy_all - destroys all the running or stopped tests. mt.mem_test_list [id] - Prints data about test id (running time, total allocations, errors a.s.o.). If id is missing, it will lists all the tests. Script functions: mt_mem_alloc(size) - equivalent to the mt.mem_alloc RPC. mt_mem_free(size) - equivalent to the mt.mem_free RPC. --- modules/malloc_test/Makefile | 15 + modules/malloc_test/doc/Makefile | 4 + modules/malloc_test/doc/functions.xml | 56 ++ modules/malloc_test/doc/malloc_test.xml | 47 ++ modules/malloc_test/doc/params.xml | 48 ++ modules/malloc_test/malloc_test.c | 887 +++++++++++++++++++++++++++++++ 6 files changed, 1057 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=0ff…

1 0

git:master: modules/mediaproxy: Added support for ICE negotiation.
by Juha Heinanen 11 Mar '10

11 Mar '10

Module: sip-router Branch: master Commit: 1dd0a33bd1eab533d372f5faea0e38fb7a7a42b2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1dd0a33… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Mar 11 04:03:41 2010 +0200 modules/mediaproxy: Added support for ICE negotiation. Patch provided by Sal Ibarra Corretg. --- modules/mediaproxy/README | 402 +++++++++++++++----------- modules/mediaproxy/doc/mediaproxy_admin.xml | 55 ++++ modules/mediaproxy/mediaproxy.c | 290 +++++++++++++++++--- 3 files changed, 541 insertions(+), 206 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=1dd…

1 0

git:master: make: fix CPU reset in some conditions
by Andrei Pelinescu-Onciul 10 Mar '10

10 Mar '10

Module: sip-router Branch: master Commit: 0b2d2c6e99dac2bd171f1c24bfa6f285f6539273 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b2d2c6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Mar 10 17:30:39 2010 +0100 make: fix CPU reset in some conditions In some cases like trying to build a package with debug config (e.g. make cfg mode=debug; .... ; make deb), the CPU make variable was reset resulting in a build failure. This happens because in the debug config CPU is not set and hence is saved as empty. Trying to build a package will start a sub-make which will try to re-do the config without debugging (make cfg), but the CPU variable with and empty value will be inherited from the environment and thus the CPU?=something lines won't have any effect. The fix replaces CPU?=something with $(call set_if_empty,CPU,something) This works around having an empty CPU in the environment. Reported-by: Jan Janak <jan(a)iptel.org> --- Makefile.defs | 45 ++++++++++++++++++++++++--------------------- 1 files changed, 24 insertions(+), 21 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index a775bd9..1eb19f5 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -115,8 +115,11 @@ ifeq ($(quiet),verbose) $(info normal Makefile.defs exec) endif # verbose +# usage: $(call set_if_empty,VAR,value) +set_if_empty=$(if $($(1)),,$(eval override $(1)=$(2))) + # flavour: sip-router, ser or kamailio -FLAVOUR?=sip-router +$(call set_if_empty,FLAVOUR,sip-router) #prefix for various configs and scripts #config name/name-prefix for distributed configs @@ -816,7 +819,7 @@ ifeq ($(CC_NAME), gcc) CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) #if gcc 4.2+ ifeq ($(CC_SHORTVER), 4.2+) - CPU ?= athlon64 +$(call set_if_empty,CPU,athlon64) CFLAGS+=-m32 -minline-all-stringops \ -falign-loops \ -ftree-vectorize \ @@ -826,7 +829,7 @@ ifeq ($(CC_SHORTVER), 4.2+) else #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) - CPU ?= athlon64 +$(call set_if_empty,CPU,athlon64) CFLAGS+=-m32 -minline-all-stringops \ -falign-loops \ -ftree-vectorize \ @@ -835,7 +838,7 @@ ifeq ($(CC_SHORTVER), 4.x) else #if gcc 3.4+ ifeq ($(CC_SHORTVER), 3.4) - CPU ?= athlon +$(call set_if_empty,CPU,athlon) CFLAGS+=-m32 -minline-all-stringops \ -falign-loops \ -mtune=$(CPU) @@ -843,7 +846,7 @@ ifeq ($(CC_SHORTVER), 3.4) else #if gcc 3.0+ ifeq ($(CC_SHORTVER), 3.0) - CPU ?= athlon +$(call set_if_empty,CPU,athlon) CFLAGS+=-minline-all-stringops \ -falign-loops \ -mcpu=$(CPU) @@ -891,7 +894,7 @@ ifeq ($(CC_NAME), gcc) CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) #if gcc 4.2+ ifeq ($(CC_SHORTVER), 4.2+) - CPU ?= opteron +$(call set_if_empty,CPU,opteron) CFLAGS+=-m64 -minline-all-stringops \ -falign-loops \ -ftree-vectorize \ @@ -901,7 +904,7 @@ ifeq ($(CC_SHORTVER), 4.2+) else #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) - CPU ?= opteron +$(call set_if_empty,CPU,opteron) CFLAGS+=-m64 -minline-all-stringops \ -falign-loops \ -ftree-vectorize \ @@ -910,14 +913,14 @@ ifeq ($(CC_SHORTVER), 4.x) else #if gcc 3.4 ifeq ($(CC_SHORTVER), 3.4) - CPU ?= athlon64 +$(call set_if_empty,CPU,athlon64) CFLAGS+=-m64 -minline-all-stringops \ -falign-loops LDFLAGS+=-m64 else #if gcc 3.0 ifeq ($(CC_SHORTVER), 3.0) - CPU ?= athlon64 +$(call set_if_empty,CPU,athlon64) CFLAGS+=-minline-all-stringops \ -falign-loops #-mcpu=$(CPU) \ # not working on all x86_64 gccs @@ -968,7 +971,7 @@ ifeq ($(CC_NAME), gcc) #-Wmissing-prototypes #if gcc 4.2+ ifeq ($(CC_SHORTVER), 4.2+) - CPU ?= ultrasparc +$(call set_if_empty,CPU,ultrasparc) #use 32bit for now CFLAGS+=-m64 -mcpu=ultrasparc \ -mtune=$(CPU) \ @@ -982,7 +985,7 @@ ifeq ($(CC_SHORTVER), 4.2+) else #if gcc 4.x ifeq ($(CC_SHORTVER), 4.x) - CPU ?= ultrasparc +$(call set_if_empty,CPU,ultrasparc) #use 32bit for now CFLAGS+=-m64 -mcpu=ultrasparc \ -mtune=$(CPU) \ @@ -991,14 +994,14 @@ ifeq ($(CC_SHORTVER), 4.x) else #if gcc 3.4 ifeq ($(CC_SHORTVER), 3.4) - CPU ?= ultrasparc +$(call set_if_empty,CPU,ultrasparc) #use 32bit for now CFLAGS+=-m64 -mcpu=ultrasparc -mtune=$(CPU) LDFLAGS+=-m64 else #if gcc 3.0 ifeq ($(CC_SHORTVER), 3.0) - CPU ?= ultrasparc +$(call set_if_empty,CPU,ultrasparc) #use 32bit for now CFLAGS+=-m64 -mcpu=ultrasparc -mtune=$(CPU) \ # -mcpu=v9 or ultrasparc? # -mtune implied by -mcpu @@ -1059,7 +1062,7 @@ ifeq ($(CC_NAME), gcc) #-Wmissing-prototypes #if gcc 4.2+ ifeq ($(CC_SHORTVER), 4.2+) - CPU ?= v8 +$(call set_if_empty,CPU,v8) #use 32bit for now CFLAGS+= -mtune=$(CPU) \ -fno-strict-overflow \ @@ -1067,20 +1070,20 @@ ifeq ($(CC_SHORTVER), 4.2+) else #if gcc 4.x ifeq ($(CC_SHORTVER), 4.x) - CPU ?= v8 +$(call set_if_empty,CPU,v8) #use 32bit for now CFLAGS+= -mtune=$(CPU) \ -ftree-vectorize else #if gcc 3.4 ifeq ($(CC_SHORTVER), 3.4) - CPU ?= v8 +$(call set_if_empty,CPU,v8) #use 32bit for now CFLAGS+= -mtune=$(CPU) else #if gcc 3.0 ifeq ($(CC_SHORTVER), 3.0) - CPU ?= v8 +$(call set_if_empty,CPU,v8) #use 32bit for now CFLAGS+= -mtune=$(CPU) \ #-mno-epilogue #try to inline function exit code @@ -1400,14 +1403,14 @@ ifeq ($(CC_NAME), gcc) CFLAGS= -O9 -funroll-loops -fsigned-char $(PROFILE) #if gcc 4.2+ ifeq ($(CC_SHORTVER), 4.2+) - CPU ?= powerpc +$(call set_if_empty,CPU,powerpc) CFLAGS+=-ftree-vectorize \ -fno-strict-overflow \ -mtune=$(CPU) -maltivec else #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) - CPU ?= powerpc +$(call set_if_empty,CPU,powerpc) CFLAGS+=-ftree-vectorize \ -mtune=$(CPU) -maltivec else @@ -1449,14 +1452,14 @@ ifeq ($(CC_NAME), gcc) CFLAGS= -O9 -funroll-loops -fsigned-char $(PROFILE) #if gcc 4.2+ ifeq ($(CC_SHORTVER), 4.2+) - CPU ?= powerpc64 +$(call set_if_empty,CPU,powerpc64) CFLAGS+=-ftree-vectorize \ -fno-strict-overflow \ -mtune=$(CPU) -maltivec else #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) - CPU ?= powerpc64 +$(call set_if_empty,CPU,powerpc64) CFLAGS+=-ftree-vectorize \ -mtune=$(CPU) -maltivec else

1 0

git:master: cfg. parser: fix warnings
by Andrei Pelinescu-Onciul 10 Mar '10

10 Mar '10

Module: sip-router Branch: master Commit: 0dabc34afe64672f07f572acfcd9478fc3575c9d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0dabc34… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Mar 10 09:45:28 2010 +0100 cfg. parser: fix warnings - removed flex input warnings - workaround for bison conflicts warnings (%expect ...) --- cfg.lex | 1 + cfg.y | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/cfg.lex b/cfg.lex index 0e16b21..ffc8e1f 100644 --- a/cfg.lex +++ b/cfg.lex @@ -84,6 +84,7 @@ * 2010-02-17 added DST_BLST_{UDP,TCP,TLS,SCTP}_IMASK (andrei) */ +%option noinput %{ #include "dprint.h" diff --git a/cfg.y b/cfg.y index e193674..8bda2fc 100644 --- a/cfg.y +++ b/cfg.y @@ -101,6 +101,8 @@ * 2010-02-17 added blacklist imask (DST_BLST_*_IMASK) support (andrei) */ +%expect 5 + %{ #include <stdlib.h>

1 0

git:master: make: on-the-fly dependency generation
by Andrei Pelinescu-Onciul 10 Mar '10

10 Mar '10

Module: sip-router Branch: master Commit: 5a9014ee4977c6afbc4b0cf65a9fad6237c2e2a6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5a9014e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Mar 10 09:25:13 2010 +0100 make: on-the-fly dependency generation - support on-the-fly dependency file generation with gcc >=3.0 (the dependency files are generated while compiling the object file, eliminating another gcc+sed invocation) - support for using makedepend -f- for generating dependencies E.g.: make cfg MKDEP="makedepend -f-". In general gcc should be preferred if available (use this if you don't have gcc and your compiler doesn't generate good deps). --- Makefile.defs | 12 ++++++++++-- Makefile.rules | 22 +++++++++++++++++++--- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index d334f24..a775bd9 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -74,6 +74,9 @@ # from the host (andrei) # 2009-10-01 use -fsigned-char for gcc on ppc, ppc64, arm and arm6 # (on those archs char is unsigned by default) (andrei) +# 2010-03-10 added CC_MKDEP_OPTS, which contains to the list of options +# needed to generate dependencies on-the-fly while compiling +# or is empty if the compiler doesn't support it (andrei) quiet?=$(if $(filter 1 yes on,$(Q)),silent,verbose) @@ -351,7 +354,7 @@ ifneq (,$(findstring gcc, $(CC_LONGVER))) # -e 's/^[^0-9].*$[0-9][0-9]*\.[0-9][0-9]*$.*/\1/') # sed with POSIX.1 regex doesn't support |, + or ? # (darwin, solaris ...) => this complicated expression - MKDEP=$(CC) -MM + MKDEP=$(CC) -MM -MG #transform gcc version into 2.9x or 3.0 CC_SHORTVER:=$(shell echo "$(CC_VER)" | cut -d" " -f 2| \ sed -e 's/[^0-9]*-$.*$/\1/'| \ @@ -360,7 +363,11 @@ ifneq (,$(findstring gcc, $(CC_LONGVER))) 's/3\.[4-9]/3.4/' -e 's/4\.[0-1]\..*/4.x/' -e \ 's/4\.[0-1]/4.x/' -e 's/4\.[2-9]\..*/4.2+/' -e \ 's/4\.[2-9]$$/4.2+/') -endif +ifeq (,$(strip $(filter-out 3.0 3.4 4.x 4.2+,$(CC_SHORTVER)))) + # dependencies can be generated on-the-fly while compiling *.c + CC_MKDEP_OPTS=-MMD -MP +endif # 3.0 <= $(CC_SHORTVER) <= 4.x +endif # gcc ifneq (, $(findstring Sun, $(CC_LONGVER))) CC_NAME=suncc @@ -1947,6 +1954,7 @@ export exported_vars saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \ SRC_NAME RELEASE OS ARCH \ C_DEFS DEFS_RM PROFILE CC LD MKDEP MKTAGS LDFLAGS C_INCLUDES \ + CC_MKDEP_OPTS \ MOD_LDFLAGS LIB_LDFLAGS UTILS_LDFLAGS LIB_SONAME LD_RPATH \ LIB_SUFFIX LIB_PREFIX \ LIBS \ diff --git a/Makefile.rules b/Makefile.rules index 9fbf02b..f816f8b 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -25,6 +25,11 @@ # used only for "temporary" defines/includes inside modules or # libs, C_DEFS and C_INCLUDES are used for the common stuff) # (andrei) +# 2010-03-09 generate dependencies when compiling .o instead of on +# include .d and fix build errors when a .h is moved +# support for using MKDEP="makedepend-f-" (andrei) +# 2010-03-10 support for on the-fly dependency generation (while compiling, +# see CC_MKDEP_OPTS) (andrei) # check if the saved cfg corresponds with the current one @@ -59,6 +64,19 @@ cmd_CC=$(CC) $(CFLAGS) $(C_INCLUDES) $(INCLUDES) $(C_DEFS) $(DEFS) -c $< -o $@ cmd_LD=$(LD) $(LDFLAGS) $(objs) $(extra_objs) $(ALL_LIBS) $(SER_RPATH) \ -o $(NAME) +ifeq (,$(CC_MKDEP_OPTS)) +# if CCC_MKDEP_OPTS is empty => CC cannot generate dependencies on the fly +cmd_MKDEP=$(MKDEP) $(filter -D% -I%,$(CFLAGS)) $(C_INCLUDES) $(INCLUDES) \ + $(C_DEFS) $(DEFS) $< \ + | sed -e 's/\#.*//' -e '/:[ ]*$$/d' -e '/^[ ]*$$/d' \ + -e 's|.*:|$@: $$(wildcard |' -e 's/$[^\\]$$$/\1)/'> $*.d +else +# deps can be generated on the fly by cmd_CC +cmd_CC+=$(CC_MKDEP_OPTS) +# no MKDEP command any more +cmd_MKDEP= +endif # CC_MKDEP_OPTS + # what will be displayed if quiet==silent silent_cmd_CC=CC ($(CC)) [$(strip $(crt_type) $(NAME))] $@ silent_cmd_LD=LD ($(LD)) [$(strip $(crt_type) $(NAME))] $@ @@ -94,9 +112,7 @@ exec_cmd= $(if $($(quiet)_cmd_$(1)),\ #implicit rules %.o:%.c $(ALLDEP) $(call exec_cmd,CC) - @$(MKDEP) $(CFLAGS) $(C_INCLUDES) $(INCLUDES) $(C_DEFS) $(DEFS) $< \ - | sed -e 's/#.*//' -e '/:[ ]*$$/d' -e '/^[ ]*$$/d' \ - -e 's#.*:#$@: $$(wildcard #g' -e 's/$[^\\]$$$/\1)/'> $*.d + @$(call cmd_MKDEP) # use RPATH and SER_LIBS if needed (make install and the module depends # on some ser libs)

1 0

git:master: docbook: fix rm'ed files mentioned in .d build error
by Andrei Pelinescu-Onciul 10 Mar '10

10 Mar '10

Module: sip-router Branch: master Commit: 111a87fef0868021d6585d32b879bac6cb07b310 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=111a87f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Mar 10 10:42:15 2010 +0100 docbook: fix rm'ed files mentioned in .d build error When some .xml include file is deleted or removed, but the .d already exists, the build will fail trying to build the apparently missing file, requiring a make proper. This fix enclosed the prerequisites in $(wildcard ...), when generating the .d file. --- docbook/dep.xsl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/docbook/dep.xsl b/docbook/dep.xsl index 0415f96..f65480d 100644 --- a/docbook/dep.xsl +++ b/docbook/dep.xsl @@ -8,8 +8,9 @@ <xsl:template match="/"> <xsl:document href="{$output}" method="text" indent="no" omit-xml-declaration="yes"> - <xsl:value-of select="concat($output, ': ')"/> + <xsl:value-of select="concat($output, ':$(wildcard ')"/> <xsl:apply-templates mode="subroot"/> + <xsl:text>)
</xsl:text> </xsl:document> </xsl:template>

1 0

git:master: make: depends move/rm file fix & optimization
by Andrei Pelinescu-Onciul 10 Mar '10

10 Mar '10

Module: sip-router Branch: master Commit: 965e651fbe84d370c05a647e022023cecf2d02bd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=965e651… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Mar 9 21:57:25 2010 +0100 make: depends move/rm file fix & optimization - fix for make failing if the depends were made and a *.h is moved or deleted - avoid restarting make when depends change (make the depends at the same moment when the .o are generated) --- Makefile.rules | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile.rules b/Makefile.rules index a3003be..9fbf02b 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -94,11 +94,9 @@ exec_cmd= $(if $($(quiet)_cmd_$(1)),\ #implicit rules %.o:%.c $(ALLDEP) $(call exec_cmd,CC) - -%.d: %.c $(ALLDEP) - @set -e; $(MKDEP) $(CFLAGS) $(C_INCLUDES) $(INCLUDES) $(C_DEFS) $(DEFS) $<\ - | sed 's#$\($(*D)/$\{0,1\}$(*F)\)\.o[ :]*#$*.o $@ : #g' > $@; \ - test -s $@ || ( rm -f $@; false ) + @$(MKDEP) $(CFLAGS) $(C_INCLUDES) $(INCLUDES) $(C_DEFS) $(DEFS) $< \ + | sed -e 's/#.*//' -e '/:[ ]*$$/d' -e '/^[ ]*$$/d' \ + -e 's#.*:#$@: $$(wildcard #g' -e 's/$[^\\]$$$/\1)/'> $*.d # use RPATH and SER_LIBS if needed (make install and the module depends # on some ser libs) @@ -203,9 +201,6 @@ makecfg.lst: .PHONY: all all: $(NAME) every-module -.PHONY: dep -dep: $(depends) - .PHONY: static static: $(objs)

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2010