sr-dev January 2015

sr-dev@lists.kamailio.org

38 participants
530 discussions

git:master:e688d656: modules/cdp: new mod param: workerq_length_threshold_percentage
by Richard Good 12 Jan '15

12 Jan '15

Module: kamailio Branch: master Commit: e688d656427dd00d48f1e309c5d8ef991e432b67 URL: https://github.com/kamailio/kamailio/commit/e688d656427dd00d48f1e309c5d8ef9… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2015-01-12T15:08:08+02:00 modules/cdp: new mod param: workerq_length_threshold_percentage This is the threshold of the length of the worker queue as a percentage of the maximum queue size - when exceeded a warning is written to the log file. Nice to check if worker queue is growing. --- Modified: modules/cdp/doc/cdp_admin.xml Modified: modules/cdp/mod.c Modified: modules/cdp/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/e688d656427dd00d48f1e309c5d8ef9… Patch: https://github.com/kamailio/kamailio/commit/e688d656427dd00d48f1e309c5d8ef9… --- diff --git a/modules/cdp/doc/cdp_admin.xml b/modules/cdp/doc/cdp_admin.xml index cdf65d2..234e270 100644 --- a/modules/cdp/doc/cdp_admin.xml +++ b/modules/cdp/doc/cdp_admin.xml @@ -126,6 +126,24 @@ modparam("cdp", "latency_threshold", 1000) </programlisting> </example> </section> + <section> + <title>workerq_length_threshold_percentage (int)</title> + + <para>The threshold of the length of the worker queue as a percentage of + the maximum queue size - when exceeded a warning is written to the log + file. 0 means disabled</para> + + <para><emphasis> Default value is <quote>0</quote>. </emphasis></para> + + <example> + <title>Set <varname>workerq_length_threshold_percentage</varname> parameter</title> + + <programlisting format="linespecific">... +modparam("cdp", "workerq_length_threshold_percentage", 25) +... + </programlisting> + </example> + </section> </section> <section> diff --git a/modules/cdp/mod.c b/modules/cdp/mod.c index 6857d82..90900d3 100644 --- a/modules/cdp/mod.c +++ b/modules/cdp/mod.c @@ -62,6 +62,7 @@ char* config_file="DiameterPeer.xml"; /**< default DiameterPeer configuration f unsigned int latency_threshold = 500; /**< default threshold for Diameter calls (ms) */ unsigned int *latency_threshold_p = &latency_threshold; unsigned int workerq_latency_threshold = 100; /**< default threshold for putting a task into worker queue (ms) */ +unsigned int workerq_length_threshold_percentage = 0; /**< default threshold for worker queue length, percentage of max queue length - by default disabled */ extern dp_config *config; /**< DiameterPeer configuration structure */ @@ -165,6 +166,7 @@ static param_export_t cdp_params[] = { { "config_file", PARAM_STRING, &config_file}, /**< configuration filename */ { "latency_threshold", PARAM_INT, &latency_threshold}, /**<threshold above which we will log*/ { "workerq_latency_threshold", PARAM_INT, &workerq_latency_threshold},/**<time threshold putting job into queue*/ + { "workerq_length_threshold_percentage", PARAM_INT, &workerq_length_threshold_percentage},/**<queue length threshold - percentage of max queue length*/ { 0, 0, 0 } }; @@ -215,7 +217,7 @@ static int cdp_init( void ) LM_ERR("failed to register stat\n"); return -1; } - + if (register_module_stats( exports.name, mod_stats)!=0 ) { LM_ERR("failed to register core statistics\n"); return -1; diff --git a/modules/cdp/worker.c b/modules/cdp/worker.c index 5ab215c..4a45bc4 100644 --- a/modules/cdp/worker.c +++ b/modules/cdp/worker.c @@ -70,6 +70,7 @@ task_queue_t *tasks; /**< queue of tasks */ cdp_cb_list_t *callbacks; /**< list of callbacks for message processing */ extern unsigned int workerq_latency_threshold; /**<max delay for putting task into worker queue */ +extern unsigned int workerq_length_threshold_percentage; /**< default threshold for worker queue length, percentage of max queue length */ /** * Initializes the worker structures, like the task queue. */ @@ -207,6 +208,8 @@ void cb_remove(cdp_cb_t *cb) { int put_task(peer *p, AAAMessage *msg) { struct timeval start, stop; + int num_tasks, length_percentage; + long elapsed_useconds=0, elapsed_seconds=0, elapsed_millis=0; lock_get(tasks->lock); @@ -246,6 +249,13 @@ int put_task(peer *p, AAAMessage *msg) { LM_WARN("Error releasing tasks->empty semaphore > %s!\n", strerror(errno)); lock_release(tasks->lock); + if(workerq_length_threshold_percentage > 0) { + num_tasks = tasks->end - tasks->start; + length_percentage = num_tasks/tasks->max*100; + if(length_percentage > workerq_length_threshold_percentage) { + LM_WARN("Queue length has exceeded length threshold percentage [%i] and is length [%i]", length_percentage, num_tasks); + } + } //int num_tasks = tasks->end - tasks->start; //LM_ERR("Added task to task queue. Queue length [%i]", num_tasks);

3 5

git:master:e7c27cbb: rtpengine: fix $rtpstat for double setid operation and new dictionary layout
by Richard Fuchs 12 Jan '15

12 Jan '15

Module: kamailio Branch: master Commit: e7c27cbb89f1309ff917f04bc45072b089b2c496 URL: https://github.com/kamailio/kamailio/commit/e7c27cbb89f1309ff917f04bc45072b… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2015-01-12T10:20:22-05:00 rtpengine: fix $rtpstat for double setid operation and new dictionary layout --- Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/e7c27cbb89f1309ff917f04bc45072b… Patch: https://github.com/kamailio/kamailio/commit/e7c27cbb89f1309ff917f04bc45072b… --- diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index b5960b2..af181f9 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -2110,41 +2110,40 @@ start_recording_f(struct sip_msg* msg, char *foo, char *bar) return rtpengine_rtpp_set_wrap(msg, rtpengine_start_recording_wrap, NULL, 1); } -/* - * Returns the current RTP-Statistics from the RTP-Proxy - */ -static int -pv_get_rtpstat_f(struct sip_msg *msg, pv_param_t *param, - pv_value_t *res) -{ +static int rtpengine_rtpstat_wrap(struct sip_msg *msg, void *d, int more) { + void **parms; + pv_param_t *param; + pv_value_t *res; bencode_buffer_t bencbuf; - bencode_item_t *dict, *tot, *in, *out; + bencode_item_t *dict, *tot, *rtp, *rtcp; static char buf[256]; str ret; + parms = d; + param = parms[0]; + res = parms[1]; + dict = rtpp_function_call_ok(&bencbuf, msg, OP_QUERY, NULL, NULL); if (!dict) return -1; tot = bencode_dictionary_get_expect(dict, "totals", BENCODE_DICTIONARY); - in = bencode_dictionary_get_expect(tot, "input", BENCODE_DICTIONARY); - in = bencode_dictionary_get_expect(in, "rtp", BENCODE_DICTIONARY); - out = bencode_dictionary_get_expect(tot, "output", BENCODE_DICTIONARY); - out = bencode_dictionary_get_expect(out, "rtp", BENCODE_DICTIONARY); + rtp = bencode_dictionary_get_expect(tot, "RTP", BENCODE_DICTIONARY); + rtcp = bencode_dictionary_get_expect(tot, "RTCP", BENCODE_DICTIONARY); - if (!in || !out) + if (!rtp || !rtcp) goto error; ret.s = buf; ret.len = snprintf(buf, sizeof(buf), - "Input: %lli bytes, %lli packets, %lli errors; " - "Output: %lli bytes, %lli packets, %lli errors", - bencode_dictionary_get_integer(in, "bytes", -1), - bencode_dictionary_get_integer(in, "packets", -1), - bencode_dictionary_get_integer(in, "errors", -1), - bencode_dictionary_get_integer(out, "bytes", -1), - bencode_dictionary_get_integer(out, "packets", -1), - bencode_dictionary_get_integer(out, "errors", -1)); + "RTP: %lli bytes, %lli packets, %lli errors; " + "RTCP: %lli bytes, %lli packets, %lli errors", + bencode_dictionary_get_integer(rtp, "bytes", -1), + bencode_dictionary_get_integer(rtp, "packets", -1), + bencode_dictionary_get_integer(rtp, "errors", -1), + bencode_dictionary_get_integer(rtcp, "bytes", -1), + bencode_dictionary_get_integer(rtcp, "packets", -1), + bencode_dictionary_get_integer(rtcp, "errors", -1)); bencode_buffer_free(&bencbuf); return pv_get_strval(msg, param, res, &ret); @@ -2154,3 +2153,18 @@ pv_get_rtpstat_f(struct sip_msg *msg, pv_param_t *param, return -1; } +/* + * Returns the current RTP-Statistics from the RTP-Proxy + */ +static int +pv_get_rtpstat_f(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + void *parms[2]; + + parms[0] = param; + parms[1] = res; + + return rtpengine_rtpp_set_wrap(msg, rtpengine_rtpstat_wrap, parms, 1); +} +

1 0

git:master:b881e284: dmq_usrloc: renamed from usrloc_dmq
by Andrey Rybkin 12 Jan '15

12 Jan '15

Module: kamailio Branch: master Commit: b881e2846dd2cde67758c59ba1d629f30fa8064a URL: https://github.com/kamailio/kamailio/commit/b881e2846dd2cde67758c59ba1d629f… Author: Andrey Rybkin <rybkin.a(a)bks.tv> Committer: Andrey Rybkin <rybkin.a(a)bks.tv> Date: 2015-01-12T17:51:56+03:00 dmq_usrloc: renamed from usrloc_dmq --- Added: modules/dmq_usrloc/Makefile Added: modules/dmq_usrloc/README Added: modules/dmq_usrloc/dmq_usrloc.c Added: modules/dmq_usrloc/doc/Makefile Added: modules/dmq_usrloc/doc/dmq_usrloc.xml Added: modules/dmq_usrloc/doc/dmq_usrloc_admin.xml Added: modules/dmq_usrloc/usrloc_sync.c Added: modules/dmq_usrloc/usrloc_sync.h Removed: modules/usrloc_dmq/Makefile Removed: modules/usrloc_dmq/README Removed: modules/usrloc_dmq/doc/Makefile Removed: modules/usrloc_dmq/doc/usrloc_dmq.xml Removed: modules/usrloc_dmq/doc/usrloc_dmq_admin.xml Removed: modules/usrloc_dmq/usrloc_dmq.c Removed: modules/usrloc_dmq/usrloc_sync.c Removed: modules/usrloc_dmq/usrloc_sync.h --- Diff: https://github.com/kamailio/kamailio/commit/b881e2846dd2cde67758c59ba1d629f… Patch: https://github.com/kamailio/kamailio/commit/b881e2846dd2cde67758c59ba1d629f…

1 0

usrloc dmq module
by Daniel-Constantin Mierla 12 Jan '15

12 Jan '15

Hello, your pull request to merge the usrloc_dmq module was accepted few days ago. I wrote in the merge comment some remarks about few thinks to be cared of: - add the license text at the top of .c/.h files (license must be gplv2 or bsd, at your choice) - variables to be declared at the beginning of functions or blocks, to be sure it still compiles with old strict C compilers Giving a second thought and considering the current common naming patterns, I propose to rename the module from usrloc_dmq to dmq_usrloc (we have similar for pua_usrloc or pua_reginfo) -- the idea is that the main purpose of the module is extending dmq with a new data flow type, rather than usrloc specific extensions. Is that ok for you? If you don't have time for it in short term, I can do it. Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

2 4

git:master:06557a25: async: Clarify difference between modparam("async", "workers", x) and async_workers in core config
by Olle E. Johansson 12 Jan '15

12 Jan '15

Module: kamailio Branch: master Commit: 06557a25af96d3de05d0302f202e6c4cbd0b84e9 URL: https://github.com/kamailio/kamailio/commit/06557a25af96d3de05d0302f202e6c4… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-01-12T14:58:33+01:00 async: Clarify difference between modparam("async","workers",x) and async_workers in core config --- Modified: modules/async/README Modified: modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/06557a25af96d3de05d0302f202e6c4… Patch: https://github.com/kamailio/kamailio/commit/06557a25af96d3de05d0302f202e6c4… --- diff --git a/modules/async/README b/modules/async/README index 327dc68..ce4daf3 100644 --- a/modules/async/README +++ b/modules/async/README @@ -38,7 +38,8 @@ Daniel-Constantin Mierla 1.1. Set workers parameter 1.2. async_route usage 1.3. async_sleep usage - 1.4. async_task_route usage + 1.4. async_workers usage + 1.5. async_task_route usage Chapter 1. Admin Guide @@ -97,7 +98,7 @@ Chapter 1. Admin Guide 3.1. workers (int) Number of worker processes to be started to handle the asynchronous - tasks. + tasks for async_route() and async_sleep(). Default value is 1. @@ -170,6 +171,16 @@ exit; The task is executed as soon as a process from asynchronous framework is idle, there is no wait time for the task like for async_route(...). + To enable the core asynchronous framework, you need to set the + async_workers core parameter in the configuration file. See the core + cookbook for more information. + + Example 1.4. async_workers usage +... +; Enable 8 worker processes used by async and other modules +async_workers=8 +... + In case of internal errors, the function returns false, otherwise the function exits the execution of the script at that moment (return 0 behaviour). @@ -184,7 +195,7 @@ exit; This function can be used from REQUEST_ROUTE. - Example 1.4. async_task_route usage + Example 1.5. async_task_route usage ... async_task_route("RESUME"); ... diff --git a/modules/async/doc/async_admin.xml b/modules/async/doc/async_admin.xml index 18d9388..31ad797 100644 --- a/modules/async/doc/async_admin.xml +++ b/modules/async/doc/async_admin.xml @@ -70,7 +70,7 @@ <title><varname>workers</varname> (int)</title> <para> Number of worker processes to be started to handle the asynchronous - tasks. + tasks for async_route() and async_sleep(). </para> <para> <emphasis> @@ -175,6 +175,20 @@ exit; async_route(...). </para> <para> + To enable the core asynchronous framework, you need to set the + <emphasis>async_workers</emphasis> core parameter in the configuration + file. See the core cookbook for more information. + <example> + <title><function>async_workers</function> usage</title> + <programlisting format="linespecific"> +... +; Enable 8 worker processes used by async and other modules +async_workers=8 +... +</programlisting> + </example> + </para> + <para> In case of internal errors, the function returns false, otherwise the function exits the execution of the script at that moment (return 0 behaviour).

1 0

git:master:a8ecf651: Add GPLv2 license
by Andrey Rybkin 12 Jan '15

12 Jan '15

Module: kamailio Branch: master Commit: a8ecf651aca0629fdb3c8576d020e2e968b1f23e URL: https://github.com/kamailio/kamailio/commit/a8ecf651aca0629fdb3c8576d020e2e… Author: Andrey Rybkin <rybkin.a(a)bks.tv> Committer: Andrey Rybkin <rybkin.a(a)bks.tv> Date: 2015-01-12T16:46:13+03:00 Add GPLv2 license --- Modified: modules/usrloc_dmq/usrloc_dmq.c Modified: modules/usrloc_dmq/usrloc_sync.c Modified: modules/usrloc_dmq/usrloc_sync.h --- Diff: https://github.com/kamailio/kamailio/commit/a8ecf651aca0629fdb3c8576d020e2e… Patch: https://github.com/kamailio/kamailio/commit/a8ecf651aca0629fdb3c8576d020e2e… --- diff --git a/modules/usrloc_dmq/usrloc_dmq.c b/modules/usrloc_dmq/usrloc_dmq.c index 8291664..381d45f 100644 --- a/modules/usrloc_dmq/usrloc_dmq.c +++ b/modules/usrloc_dmq/usrloc_dmq.c @@ -1,3 +1,25 @@ +/* +* Copyright (C) 2014 Andrey Rybkin <rybkin.a(a)bks.tv> +* +* This file is part of Kamailio, a free SIP server. +* +* This file is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version +* +* +* This file is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +* +*/ + #include <stdio.h> #include "../../sr_module.h" #include "../../dprint.h" @@ -76,11 +98,11 @@ static int child_init(int rank) { if (rank == PROC_MAIN) { - LM_ERR("child_init PROC_MAIN\n"); + LM_DBG("child_init PROC_MAIN\n"); return 0; } if(rank == PROC_INIT || rank == PROC_TCP_MAIN) { - LM_ERR("child_init PROC_INIT\n"); + LM_DBG("child_init PROC_INIT\n"); return 0; } return 0; diff --git a/modules/usrloc_dmq/usrloc_sync.c b/modules/usrloc_dmq/usrloc_sync.c index 3f049ff..1b980ed 100644 --- a/modules/usrloc_dmq/usrloc_sync.c +++ b/modules/usrloc_dmq/usrloc_sync.c @@ -1,3 +1,25 @@ +/* +* Copyright (C) 2014 Andrey Rybkin <rybkin.a(a)bks.tv> +* +* This file is part of Kamailio, a free SIP server. +* +* This file is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version +* +* +* This file is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +* +*/ + #include "usrloc_sync.h" #include "../usrloc/usrloc.h" #include "../usrloc/ul_callback.h" diff --git a/modules/usrloc_dmq/usrloc_sync.h b/modules/usrloc_dmq/usrloc_sync.h index 383a62d..d5678a2 100644 --- a/modules/usrloc_dmq/usrloc_sync.h +++ b/modules/usrloc_dmq/usrloc_sync.h @@ -1,3 +1,25 @@ +/* +* Copyright (C) 2014 Andrey Rybkin <rybkin.a(a)bks.tv> +* +* This file is part of Kamailio, a free SIP server. +* +* This file is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version +* +* +* This file is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +* +*/ + #ifndef _DMQ_SYNC_USRLOC_H_ #define _DMQ_SYNC_USRLOC_H_

1 0

CURL vulnerability
by Olle E. Johansson 12 Jan '15

12 Jan '15

CURL is used in a few parts of Kamailio http://curl.haxx.se/docs/adv_20150108B.html THis is a case where a carriage return is embedded into an url. Action C suggest that we make sure those are stripped out before sending a URL to cURL. May be an easy fix while waiting for people to upgrade their cURL. Cheers, /O

2 1

git:master:85fcd786: Warning cleanup.
by Eloy Coto 12 Jan '15

12 Jan '15

Module: kamailio Branch: master Commit: 85fcd786e20ed1f06dad1746029a7056b0476a98 URL: https://github.com/kamailio/kamailio/commit/85fcd786e20ed1f06dad1746029a705… Author: Eloy Coto <eloy.coto(a)gmail.com> Committer: Eloy Coto <eloy.coto(a)gmail.com> Date: 2015-01-12T10:25:12Z Warning cleanup. --- Added: modules/statsd/lib_statsd.h Modified: modules/statsd/statsd.c Removed: modules/statsd/lib_statsd.c --- Diff: https://github.com/kamailio/kamailio/commit/85fcd786e20ed1f06dad1746029a705… Patch: https://github.com/kamailio/kamailio/commit/85fcd786e20ed1f06dad1746029a705…

2 1

git:master:7886ddc5: ratelimit: _SC_NPROCESSORS_ONLN is available on FreeBSD
by Daniel-Constantin Mierla 12 Jan '15

12 Jan '15

Module: kamailio Branch: master Commit: 7886ddc516f5a4cef1d3730306a2a2ded06d4986 URL: https://github.com/kamailio/kamailio/commit/7886ddc516f5a4cef1d3730306a2a2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-12T11:17:15+01:00 ratelimit: _SC_NPROCESSORS_ONLN is available on FreeBSD - used for getting number of cpus - reported on GH#24 --- Modified: modules/ratelimit/ratelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/7886ddc516f5a4cef1d3730306a2a2d… Patch: https://github.com/kamailio/kamailio/commit/7886ddc516f5a4cef1d3730306a2a2d… --- diff --git a/modules/ratelimit/ratelimit.c b/modules/ratelimit/ratelimit.c index 6bbe558..13961da 100644 --- a/modules/ratelimit/ratelimit.c +++ b/modules/ratelimit/ratelimit.c @@ -285,7 +285,7 @@ static int str_cpy(str * dest, str * src) return 0; } -#if defined (__OS_darwin) || defined (__OS_freebsd) +#ifdef __OS_darwin #include <sys/param.h> #include <sys/sysctl.h> #else @@ -295,7 +295,7 @@ static int str_cpy(str * dest, str * src) int get_num_cpus() { int count = 0; -#if defined (__OS_darwin) || defined (__OS_freebsd) +#ifdef __OS_darwin int nm[2]; size_t len;

1 0

git:master:cf65a6ad: pipelimit: _SC_NPROCESSORS_ONLN is available on FreeBSD
by Daniel-Constantin Mierla 12 Jan '15

12 Jan '15

Module: kamailio Branch: master Commit: cf65a6ad41396bf5e67d23e12720c420688d7880 URL: https://github.com/kamailio/kamailio/commit/cf65a6ad41396bf5e67d23e12720c42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-12T11:17:14+01:00 pipelimit: _SC_NPROCESSORS_ONLN is available on FreeBSD - used for getting number of cpus - reported on GH#24 --- Modified: modules/pipelimit/pipelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/cf65a6ad41396bf5e67d23e12720c42… Patch: https://github.com/kamailio/kamailio/commit/cf65a6ad41396bf5e67d23e12720c42… --- diff --git a/modules/pipelimit/pipelimit.c b/modules/pipelimit/pipelimit.c index 50d35f8..861d6b1 100644 --- a/modules/pipelimit/pipelimit.c +++ b/modules/pipelimit/pipelimit.c @@ -183,7 +183,7 @@ struct module_exports exports= { }; -#if defined (__OS_darwin) || defined (__OS_freebsd) +#ifdef __OS_darwin #include <sys/param.h> #include <sys/sysctl.h> #else @@ -193,7 +193,7 @@ struct module_exports exports= { int get_num_cpus() { int count = 0; -#if defined (__OS_darwin) || defined (__OS_freebsd) +#ifdef __OS_darwin int nm[2]; size_t len;

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
53
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2015