[prev in list] [next in list] [prev in thread] [next in thread] 

List:       sr-dev
Subject:    Re: [sr-dev] [kamailio/kamailio] core: allow setting shm_mem_size in cfg if it still holds default v
From:       Maxim Malygin <notifications () github ! com>
Date:       2017-01-31 9:36:19
Message-ID: kamailio/kamailio/commit/25aeed98a773fb796de47703a72532e5c0345f6c/20676416 () github ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


Your patch will override memory size set by "-m" option in case it is 64mb (-m 64).
I created another patch for my environment by moving setting sm_mem_size to default \
size after yyparse().

```
--- kamailio-4.4.3.orig/main.c  2016-09-14 16:50:30.000000000 +0300
+++ kamailio-4.4.3/main.c       2017-01-26 18:30:55.000000000 +0300
@@ -2069,9 +2069,6 @@
                                        abort();
                }
        }
-       if (shm_mem_size == 0) {
-               shm_mem_size = SHM_MEM_POOL_SIZE;
-       }

        if (endianness_sanity_check() != 0){
                fprintf(stderr, "BUG: endianness sanity tests failed\n");
@@ -2136,6 +2133,11 @@

                goto error;
        }
+
+       if (shm_mem_size == 0) {
+               shm_mem_size = SHM_MEM_POOL_SIZE;
+       }
+
        if (cfg_warnings){
                fprintf(stderr, "%d config warnings\n", cfg_warnings);
        }

```

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/commit/25aeed98a773fb796de47703a72532e5c0345f6c#commitcomment-20676416



[Attachment #5 (text/html)]

<p>Your patch will override memory size set by "-m" option in case it is 64mb (-m \
64).<br> I created another patch for my environment by moving setting sm_mem_size to \
default size after yyparse().</p> <pre><code>--- kamailio-4.4.3.orig/main.c  \
                2016-09-14 16:50:30.000000000 +0300
+++ kamailio-4.4.3/main.c       2017-01-26 18:30:55.000000000 +0300
@@ -2069,9 +2069,6 @@
                                        abort();
                }
        }
-       if (shm_mem_size == 0) {
-               shm_mem_size = SHM_MEM_POOL_SIZE;
-       }

        if (endianness_sanity_check() != 0){
                fprintf(stderr, "BUG: endianness sanity tests failed\n");
@@ -2136,6 +2133,11 @@

                goto error;
        }
+
+       if (shm_mem_size == 0) {
+               shm_mem_size = SHM_MEM_POOL_SIZE;
+       }
+
        if (cfg_warnings){
                fprintf(stderr, "%d config warnings\n", cfg_warnings);
        }

</code></pre>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">&mdash;<br />You \
are receiving this because you are subscribed to this thread.<br />Reply to this \
email directly, <a href="https://github.com/kamailio/kamailio/commit/25aeed98a773fb796de47703a72532e5c0345f6c#commitcomment-20676416">view \
it on GitHub</a>, or <a \
href="https://github.com/notifications/unsubscribe-auth/AF36ZX6GIpMQCJUC1vnl_J5QCW7CRm45ks5rXwCTgaJpZM4LyaE6">mute \
the thread</a>.<img alt="" height="1" \
src="https://github.com/notifications/beacon/AF36ZZCbKaD2MSJ5RBDnVikMeQpVI6YHks5rXwCTgaJpZM4LyaE6.gif" \
width="1" /></p> <div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
  <link itemprop="url" \
href="https://github.com/kamailio/kamailio/commit/25aeed98a773fb796de47703a72532e5c0345f6c#commitcomment-20676416"></link>
  <meta itemprop="name" content="View Commit"></meta>
</div>
<meta itemprop="description" content="View this Commit on GitHub"></meta>
</div>

<script type="application/json" \
data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384d \
d78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/kamailio/kamailio","title":"kamailio/kamailio","subtitle":"GitHub \
repository","main_image_url":"https://cloud.githubusercontent.com/assets/143418/174958 \
39/a5054eac-5d88-11e6-95fc-7290892c7bb5.png","avatar_image_url":"https://cloud.githubu \
sercontent.com/assets/143418/15842166/7c72db34-2c0b-11e6-9aed-b52498112777.png","action":{"name":"Open \
in GitHub","url":"https://github.com/kamailio/kamailio"}},"updates":{"snippets":[{"icon":"PERSON","message":"@mmalygin \
on 25aeed9: Your patch will override memory size set by \"-m\" option in case it is \
64mb (-m 64).\r\nI created another patch for my environment by moving setting \
sm_mem_size to default size after yyparse().\r\n\r\n```\r\n--- \
kamailio-4.4.3.orig/main.c  2016-09-14 16:50:30.000000000 +0300\r\n+++ \
kamailio-4.4.3/main.c       2017-01-26 18:30:55.000000000 +0300\r\n@@ -2069,9 +2069,6 \
@@\r\n                                        abort();\r\n                }\r\n       \
}\r\n-       if (shm_mem_size == 0) {\r\n-               shm_mem_size = \
SHM_MEM_POOL_SIZE;\r\n-       }\r\n\r\n        if (endianness_sanity_check() != \
0){\r\n                fprintf(stderr, \"BUG: endianness sanity tests \
failed\\n\");\r\n@@ -2136,6 +2133,11 @@\r\n\r\n                goto error;\r\n        \
}\r\n+\r\n+       if (shm_mem_size == 0) {\r\n+               shm_mem_size = \
SHM_MEM_POOL_SIZE;\r\n+       }\r\n+\r\n        if (cfg_warnings){\r\n                \
fprintf(stderr, \"%d config warnings\\n\", cfg_warnings);\r\n        \
}\r\n\r\n```"}],"action":{"name":"View \
Commit","url":"https://github.com/kamailio/kamailio/commit/25aeed98a773fb796de47703a72532e5c0345f6c#commitcomment-20676416"}}}</script>



[Attachment #6 (text/plain)]

_______________________________________________
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev


[prev in list] [next in list] [prev in thread] [next in thread]