sr-dev December 2018

sr-dev@lists.kamailio.org

23 participants
313 discussions

git:master:135ce2b5: Makefile: remove SHM_MEM #define after change in commit 63cc0c1df10138

by Henning Westerholt

Module: kamailio Branch: master Commit: 135ce2b5b28bc033a282565c683e1d9c7fa2d636 URL: https://github.com/kamailio/kamailio/commit/135ce2b5b28bc033a282565c683e1d9… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T21:26:21+01:00 Makefile: remove SHM_MEM #define after change in commit 63cc0c1df10138 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/135ce2b5b28bc033a282565c683e1d9… Patch: https://github.com/kamailio/kamailio/commit/135ce2b5b28bc033a282565c683e1d9… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 221a67002e..3512666e0e 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -515,9 +515,6 @@ data_target = $(prefix)/$(data_dir) # compiles in some extra debugging code # -DDNS_IP_HACK # faster ip address resolver for ip strings (e.g "127.0.0.1") -# -DSHM_MEM -# compiles in shared mem. support, needed by some modules and -# by USE_SHM_MEM # -DSHM_MMAP # use mmap instead of SYSV shared memory # -DPKG_MALLOC @@ -665,7 +662,7 @@ ifneq ($(MEMPKG), sys) C_DEFS+= -DPKG_MALLOC endif -C_DEFS+= -DSHM_MEM -DSHM_MMAP \ +C_DEFS+= -DSHM_MMAP \ -DDNS_IP_HACK \ -DUSE_MCAST \ -DUSE_TCP \

5 years, 6 months

git:master:cabd13a6: core: additional change to commit 63cc0c1df10138 - also remove #ifndef SHM_MEM

by Henning Westerholt

Module: kamailio Branch: master Commit: cabd13a69a81cc2b7bdb7e9ce5f23288694be78e URL: https://github.com/kamailio/kamailio/commit/cabd13a69a81cc2b7bdb7e9ce5f2328… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T21:24:23+01:00 core: additional change to commit 63cc0c1df10138 - also remove #ifndef SHM_MEM --- Modified: src/core/tcp_main.c Modified: src/core/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/cabd13a69a81cc2b7bdb7e9ce5f2328… Patch: https://github.com/kamailio/kamailio/commit/cabd13a69a81cc2b7bdb7e9ce5f2328… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 3ac1289779..7266c63cea 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -28,10 +28,6 @@ #ifdef USE_TCP -#ifndef SHM_MEM -#error "shared memory support needed (add -DSHM_MEM to Makefile.defs)" -#endif - #define HANDLE_IO_INLINE #include "io_wait.h" /* include first to make sure the needed features are turned on (e.g. _GNU_SOURCE for POLLRDHUP) */ diff --git a/src/core/timer.c b/src/core/timer.c index fc6f49872c..92e26ba5f1 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -1017,11 +1017,6 @@ int register_timer(timer_function f, void* param, unsigned int interval) ticks_t get_ticks_raw() { -#ifndef SHM_MEM - LM_CRIT("no shared memory support compiled in" - ", returning 0 (probably wrong)"); - return 0; -#endif return *ticks; } @@ -1030,11 +1025,6 @@ ticks_t get_ticks_raw() /* returns tick in s (for compatibility with the old code) */ ticks_t get_ticks() { -#ifndef SHM_MEM - LM_CRIT("no shared memory support compiled in" - ", returning 0 (probably wrong)"); - return 0; -#endif return TICKS_TO_S(*ticks); }

5 years, 6 months

git:master:47b9c44f: core: remove the empty mem.c and shm_mem.c files, after change in 63cc0c1df1013

by Henning Westerholt

Module: kamailio Branch: master Commit: 47b9c44f06102b6dc26eb3ac06e49c63bfe6849b URL: https://github.com/kamailio/kamailio/commit/47b9c44f06102b6dc26eb3ac06e49c6… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T21:13:46+01:00 core: remove the empty mem.c and shm_mem.c files, after change in 63cc0c1df1013 --- Removed: src/core/mem/mem.c Removed: src/core/mem/shm_mem.c --- Diff: https://github.com/kamailio/kamailio/commit/47b9c44f06102b6dc26eb3ac06e49c6… Patch: https://github.com/kamailio/kamailio/commit/47b9c44f06102b6dc26eb3ac06e49c6… --- diff --git a/src/core/mem/mem.c b/src/core/mem/mem.c deleted file mode 100644 index 9af7e5052a..0000000000 --- a/src/core/mem/mem.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2001-2003 FhG Fokus - * - * This file is part of Kamailio, a free SIP server. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * - */ - -/** - * \file - * \brief Main definitions for memory manager - * - * Main definitions for memory manager, like malloc, free and realloc - * \ingroup mem - */ - - -#include <stdio.h> -#include <stdlib.h> -#include "../config.h" -#include "../dprint.h" -#include "../globals.h" -#include "mem.h" - -#ifdef PKG_MALLOC -#include "q_malloc.h" -#endif - -#include "shm_mem.h" diff --git a/src/core/mem/shm_mem.c b/src/core/mem/shm_mem.c deleted file mode 100644 index a94b79889e..0000000000 --- a/src/core/mem/shm_mem.c +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2001-2003 FhG Fokus - * - * This file is part of Kamailio, a free SIP server. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -/** - * \file - * \brief Shared memory functions - * \ingroup mem - */ - -

5 years, 6 months

git:master:0999f108: core: add doxygen file header to current memory manager

by Henning Westerholt

Module: kamailio Branch: master Commit: 0999f108c91bdcfed91878241345fb24da3fc2a7 URL: https://github.com/kamailio/kamailio/commit/0999f108c91bdcfed91878241345fb2… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T21:12:42+01:00 core: add doxygen file header to current memory manager --- Modified: src/core/mem/pkg.c Modified: src/core/mem/pkg.h Modified: src/core/mem/shm.c Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/0999f108c91bdcfed91878241345fb2… Patch: https://github.com/kamailio/kamailio/commit/0999f108c91bdcfed91878241345fb2… --- diff --git a/src/core/mem/pkg.c b/src/core/mem/pkg.c index f1e616eca6..57d7ea051d 100644 --- a/src/core/mem/pkg.c +++ b/src/core/mem/pkg.c @@ -16,6 +16,13 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/** + * \file + * \brief Main definitions for memory manager + * + * Main definitions for PKG memory manager, like malloc, free and realloc + * \ingroup mem + */ #include <string.h> #include <stdlib.h> diff --git a/src/core/mem/pkg.h b/src/core/mem/pkg.h index 0fe7f8942c..7b57719e46 100644 --- a/src/core/mem/pkg.h +++ b/src/core/mem/pkg.h @@ -16,6 +16,13 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/** + * \file + * \brief Main definitions for memory manager + * + * Main definitions for PKG memory manager, like malloc, free and realloc + * \ingroup mem + */ #ifndef _sr_pkg_h_ #define _sr_pkg_h_ diff --git a/src/core/mem/shm.c b/src/core/mem/shm.c index 2cecb1110e..b25fef1a51 100644 --- a/src/core/mem/shm.c +++ b/src/core/mem/shm.c @@ -16,6 +16,12 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/** + * \file + * \brief Shared memory functions + * \ingroup mem + */ + #include <stdlib.h> #include "../config.h" diff --git a/src/core/mem/shm.h b/src/core/mem/shm.h index e36a94accc..4143462617 100644 --- a/src/core/mem/shm.h +++ b/src/core/mem/shm.h @@ -16,6 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/** + * \file + * \brief Shared memory functions + * \ingroup mem + */ #ifndef _sr_shm_h_ #define _sr_shm_h_

5 years, 6 months

git:master:63cc0c1d: core: remove old memory managers, deactivated in 2015

by Henning Westerholt

Module: kamailio Branch: master Commit: 63cc0c1df10138428473f17726c8b5ee336755ce URL: https://github.com/kamailio/kamailio/commit/63cc0c1df10138428473f17726c8b5e… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T21:04:02+01:00 core: remove old memory managers, deactivated in 2015 - remove old memory PKG and SHM manager from core, it was deactivated in 2015 in commit 50df0feecc34e and bf3e80bdf711 from Daniel with an #ifdef 0 - modules should include for SHM memory the header "shm.h" instead of the old header "shm_mem.h", this is kept for compatibility reasons - no functional changes --- Modified: src/core/mem/mem.c Modified: src/core/mem/mem.h Modified: src/core/mem/shm_mem.c Modified: src/core/mem/shm_mem.h --- Diff: https://github.com/kamailio/kamailio/commit/63cc0c1df10138428473f17726c8b5e… Patch: https://github.com/kamailio/kamailio/commit/63cc0c1df10138428473f17726c8b5e…

5 years, 6 months

git:master:42d9b351: rtpengine: remove the SHM_MEM #define, after core change

by Henning Westerholt

Module: kamailio Branch: master Commit: 42d9b351f9b7fa4140ccd9cf7fc368483d74535a URL: https://github.com/kamailio/kamailio/commit/42d9b351f9b7fa4140ccd9cf7fc3684… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T20:47:49+01:00 rtpengine: remove the SHM_MEM #define, after core change --- Modified: src/modules/rtpengine/bencode.h --- Diff: https://github.com/kamailio/kamailio/commit/42d9b351f9b7fa4140ccd9cf7fc3684… Patch: https://github.com/kamailio/kamailio/commit/42d9b351f9b7fa4140ccd9cf7fc3684… --- diff --git a/src/modules/rtpengine/bencode.h b/src/modules/rtpengine/bencode.h index f5f775538f..272e8125c7 100644 --- a/src/modules/rtpengine/bencode.h +++ b/src/modules/rtpengine/bencode.h @@ -4,7 +4,7 @@ #include <sys/uio.h> #include <string.h> -#if defined(SHM_MEM) || defined(PKG_MALLOC) || defined(pkg_malloc) +#if defined(PKG_MALLOC) || defined(pkg_malloc) /* kamailio */ # include "../../core/mem/mem.h" # include "../../core/str.h"

5 years, 6 months

git:master:4f655313: main: small formatting fixes in "kamailio -v" output

by Henning Westerholt

Module: kamailio Branch: master Commit: 4f65531306e14758335867d69f74841c78ec8292 URL: https://github.com/kamailio/kamailio/commit/4f65531306e14758335867d69f74841… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T20:39:00+01:00 main: small formatting fixes in "kamailio -v" output --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/4f65531306e14758335867d69f74841… Patch: https://github.com/kamailio/kamailio/commit/4f65531306e14758335867d69f74841… --- diff --git a/src/main.c b/src/main.c index e22282b9ce..aaf5637e53 100644 --- a/src/main.c +++ b/src/main.c @@ -219,12 +219,12 @@ Options:\n\ void print_ct_constants(void) { #ifdef ADAPTIVE_WAIT - printf("ADAPTIVE_WAIT_LOOPS=%d, ", ADAPTIVE_WAIT_LOOPS); + printf("ADAPTIVE_WAIT_LOOPS %d, ", ADAPTIVE_WAIT_LOOPS); #endif /* - printf("SHM_MEM_SIZE=%d, ", SHM_MEM_SIZE); + printf("SHM_MEM_SIZE %dMB, ", SHM_MEM_SIZE); */ - printf("MAX_RECV_BUFFER_SIZE %d" + printf("MAX_RECV_BUFFER_SIZE %d," " MAX_URI_SIZE %d, BUF_SIZE %d, DEFAULT PKG_SIZE %uMB\n", MAX_RECV_BUFFER_SIZE, MAX_URI_SIZE, BUF_SIZE, PKG_MEM_SIZE);

5 years, 6 months

git:master:a2f74c4e: erlang: remove the SHM_MEM #define, after core change

by Henning Westerholt

Module: kamailio Branch: master Commit: a2f74c4ea76d570f4c8493664ebb94f3a1276276 URL: https://github.com/kamailio/kamailio/commit/a2f74c4ea76d570f4c8493664ebb94f… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T20:27:09+01:00 erlang: remove the SHM_MEM #define, after core change --- Modified: src/modules/erlang/erlang_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a2f74c4ea76d570f4c8493664ebb94f… Patch: https://github.com/kamailio/kamailio/commit/a2f74c4ea76d570f4c8493664ebb94f… --- diff --git a/src/modules/erlang/erlang_mod.c b/src/modules/erlang/erlang_mod.c index 15c05ce729..e4060698f9 100644 --- a/src/modules/erlang/erlang_mod.c +++ b/src/modules/erlang/erlang_mod.c @@ -283,7 +283,6 @@ static int child_init(int rank) if (rank == PROC_INIT) { -#ifdef SHM_MEM usocks[KSOCKET]=(int*)shm_malloc(sizeof(int)*no_cnodes); if (!usocks[KSOCKET]) { LM_ERR("Not enough memory\n"); @@ -295,19 +294,6 @@ static int child_init(int rank) LM_ERR("Not enough memory\n"); return -1; } -#else - usocks[KSOCKET]=(int*)pkg_malloc(sizeof(int)*no_cnodes); - if (!usocks[KSOCKET]) { - LM_ERR("Not enough memory\n"); - return -1; - } - - usocks[CSOCKET]=(int*)pkg_malloc(sizeof(int)*no_cnodes); - if (!usocks[CSOCKET]) { - LM_ERR("Not enough memory\n"); - return -1; - } -#endif for(i=0;i<no_cnodes;i++) { if (socketpair(AF_UNIX, SOCK_STREAM, 0, pair)) { @@ -397,13 +383,8 @@ static int child_init(int rank) */ static void mod_destroy(void) { -#ifdef SHM_MEM shm_free(usocks[0]); shm_free(usocks[1]); -#else - pkg_free(usocks[0]); - pkg_free(usocks[1]); -#endif free_tuple_fmt_buff(); free_atom_fmt_buff(); free_list_fmt_buff();

5 years, 6 months

git:master:f864b8c2: cdp: remove the SHM_MEM #define, after core change

by Henning Westerholt

Module: kamailio Branch: master Commit: f864b8c26aaadb862b3b25ab3a5cacd89e7868fe URL: https://github.com/kamailio/kamailio/commit/f864b8c26aaadb862b3b25ab3a5cacd… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T20:26:30+01:00 cdp: remove the SHM_MEM #define, after core change --- Modified: src/modules/cdp/globals.c Modified: src/modules/cdp/sem.h --- Diff: https://github.com/kamailio/kamailio/commit/f864b8c26aaadb862b3b25ab3a5cacd… Patch: https://github.com/kamailio/kamailio/commit/f864b8c26aaadb862b3b25ab3a5cacd… --- diff --git a/src/modules/cdp/globals.c b/src/modules/cdp/globals.c index 5eaf4c2a77..56062e84fa 100644 --- a/src/modules/cdp/globals.c +++ b/src/modules/cdp/globals.c @@ -61,7 +61,6 @@ // } //#endif // -//#ifdef SHM_MEM // // if (init_shm_mallocs()==-1) // goto error; @@ -69,7 +68,6 @@ // LM_DBG( "Memory status (shm):\n"); // shm_status(); // } -//#endif // return 1; //error: // return 0; diff --git a/src/modules/cdp/sem.h b/src/modules/cdp/sem.h index 71c7e41686..26057d9232 100644 --- a/src/modules/cdp/sem.h +++ b/src/modules/cdp/sem.h @@ -44,8 +44,6 @@ #ifndef __SEM_H #define __SEM_H -#ifdef SHM_MEM - // #include "../../core/mem/mem.h" // #include "../../core/mem/shm_mem.h" @@ -89,8 +87,4 @@ typedef sem_t gen_sem_t; #define sem_release(sem) sem_post(sem) -#else -//#error "locking requires shared memory support" -#endif - #endif

5 years, 6 months

git:master:127e1c4c: maim: remove the SHM_MEM #define, the core will not even comile without it

by Henning Westerholt

Module: kamailio Branch: master Commit: 127e1c4c6df088c15c10bc488eeaecc22a9e2ae1 URL: https://github.com/kamailio/kamailio/commit/127e1c4c6df088c15c10bc488eeaecc… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T20:25:58+01:00 maim: remove the SHM_MEM #define, the core will not even comile without it - remove the SHM_MEM #define, the purpose of this was to allow the compilation without SHM memory pool support - this did not worked for a long time, the core will not even compile without it (no locking, broken timer etc..). Additionally many modules need it. - remove 50 ifdef/endif blocks, no functional changes done --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/127e1c4c6df088c15c10bc488eeaecc… Patch: https://github.com/kamailio/kamailio/commit/127e1c4c6df088c15c10bc488eeaecc… --- diff --git a/src/main.c b/src/main.c index 4c31bdf13f..e22282b9ce 100644 --- a/src/main.c +++ b/src/main.c @@ -68,10 +68,8 @@ #include "core/udp_server.h" #include "core/globals.h" #include "core/mem/mem.h" -#ifdef SHM_MEM #include "core/mem/shm_mem.h" #include "core/shm_init.h" -#endif /* SHM_MEM */ #include "core/sr_module.h" #include "core/timer.h" #include "core/parser/msg_parser.h" @@ -224,9 +222,7 @@ void print_ct_constants(void) printf("ADAPTIVE_WAIT_LOOPS=%d, ", ADAPTIVE_WAIT_LOOPS); #endif /* -#ifdef SHM_MEM printf("SHM_MEM_SIZE=%d, ", SHM_MEM_SIZE); -#endif */ printf("MAX_RECV_BUFFER_SIZE %d" " MAX_URI_SIZE %d, BUF_SIZE %d, DEFAULT PKG_SIZE %uMB\n", @@ -249,9 +245,7 @@ void print_internals(void) printf(" MAX_URI_SIZE=%d\n", MAX_URI_SIZE); printf(" BUF_SIZE=%d\n", BUF_SIZE); printf(" DEFAULT PKG_SIZE=%uMB\n", PKG_MEM_SIZE); -#ifdef SHM_MEM printf(" DEFAULT SHM_SIZE=%uMB\n", SHM_MEM_SIZE); -#endif #ifdef ADAPTIVE_WAIT printf(" ADAPTIVE_WAIT_LOOPS=%d\n", ADAPTIVE_WAIT_LOOPS); #endif @@ -567,7 +561,6 @@ void cleanup(int show_status) } } #endif -#ifdef SHM_MEM if (pt) shm_free(pt); pt=0; if (show_status && memlog <= cfg_get(core, core_cfg, debug)){ @@ -582,7 +575,6 @@ void cleanup(int show_status) } /* zero all shmem alloc vars that we still use */ shm_destroy_manager(); -#endif destroy_lock_ops(); if (pid_file) unlink(pid_file); if (pgid_file) unlink(pgid_file); @@ -714,7 +706,6 @@ void handle_sigs(void) } } #endif -#ifdef SHM_MEM if (memlog <= cfg_get(core, core_cfg, debug)){ if (cfg_get(core, core_cfg, mem_summary) & 2) { LOG(memlog, "Memory status (shm):\n"); @@ -725,7 +716,6 @@ void handle_sigs(void) shm_sums(); } } -#endif break; case SIGCHLD: @@ -2461,10 +2451,8 @@ int main(int argc, char** argv) * Note: shm can now be initialized when parsing the config script, that's * why checking for a prior initialization is needed. * --andrei */ -#ifdef SHM_MEM if (!shm_initialized() && init_shm()<0) goto error; -#endif /* SHM_MEM */ pkg_print_manager(); shm_print_manager(); if (init_atomic_ops()==-1)

5 years, 6 months

← Newer
1
...
10
11
12
13
14
15
16
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2018