sr-dev September 2009

sr-dev@lists.kamailio.org

32 participants
207 discussions

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 64e3977d3b6b605711f68ea8bd820c16e5bdd7c2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=64e3977… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 30 20:28:03 2009 +0200 libsrdb1: fix bad include Removed unneeded #include </usr/include/limits.h> which breaks cross-compiling (#include <limits.h> is enough). --- lib/srdb1/db_ut.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/lib/srdb1/db_ut.c b/lib/srdb1/db_ut.c index 498ad7f..16e2f4f 100644 --- a/lib/srdb1/db_ut.c +++ b/lib/srdb1/db_ut.c @@ -35,7 +35,6 @@ #include "../../mem/mem.h" #include "../../dprint.h" #include <limits.h> -#include </usr/include/limits.h> #include <errno.h> #include <stdio.h> #include <stdlib.h>

14 years, 6 months

git:master: usrloc(s): gcc 2.9x var decls. fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 4cd5605bb9b28e6ffb872068d0aab833ea3d8811 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4cd5605… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 01:26:52 2009 +0200 usrloc(s): gcc 2.9x var decls. fixes variable declarations must be at the beginning of the function and not intercalated in the code. --- modules_s/usrloc/ul_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_s/usrloc/ul_mod.c b/modules_s/usrloc/ul_mod.c index 61307bd..0afc98f 100644 --- a/modules_s/usrloc/ul_mod.c +++ b/modules_s/usrloc/ul_mod.c @@ -207,7 +207,6 @@ static int mod_init(void) static int build_db_cmds(void) { - INFO("usrloc: build_db_cmds()\n"); db_fld_t del_contact_match[] = { {.name = uid_col.s, .type = DB_STR}, {.name = contact_col.s, .type = DB_STR}, @@ -234,6 +233,7 @@ static int build_db_cmds(void) dlist_t* ptr; int i; + INFO("usrloc: build_db_cmds()\n"); for(cmd_n = 0, ptr = root; ptr; cmd_n++, ptr = ptr->next); del_contact = pkg_malloc(cmd_n);

14 years, 6 months

git:master: libsrdb1: gcc 2.9x var decls. fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: b57080326a9215461a789323021d062b1a12c17f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b570803… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 01:11:48 2009 +0200 libsrdb1: gcc 2.9x var decls. fixes variable declarations must be at the beginning of the function and not intercalated in the code. --- lib/srdb1/db.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/srdb1/db.c b/lib/srdb1/db.c index 0cc7eeb..c4bf7cf 100644 --- a/lib/srdb1/db.c +++ b/lib/srdb1/db.c @@ -340,27 +340,26 @@ int db_table_version(const db_func_t* dbf, db1_con_t* connection, const str* tab db_val_t val[1]; db1_res_t* res = NULL; db_val_t* ver = 0; + str version = str_init(VERSION_TABLE); + str tmp1 = str_init(TABLENAME_COLUMN); + str tmp2 = str_init(VERSION_COLUMN); + int ret; if (!dbf||!connection || !table || !table->s) { LM_CRIT("invalid parameter value\n"); return -1; } - str version = str_init(VERSION_TABLE); - int ret; - if (dbf->use_table(connection, &version) < 0) { LM_ERR("error while changing table\n"); return -1; } - str tmp1 = str_init(TABLENAME_COLUMN); key[0] = &tmp1; VAL_TYPE(val) = DB1_STR; VAL_NULL(val) = 0; VAL_STR(val) = *table; - str tmp2 = str_init(VERSION_COLUMN); col[0] = &tmp2; if (dbf->query(connection, key, 0, val, col, 1, 1, 0, &res) < 0) {

14 years, 6 months

git:master: tm: gcc-2.9x warning fixes (%zd)

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: cb6fd5e3e98c2982774058059b333f6e1d90b8d3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cb6fd5e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 01:09:39 2009 +0200 tm: gcc-2.9x warning fixes (%zd) - %zd is not supported in the format string for gcc < 3.0 - fixed %.*s with non int length warnings (gcc 2.9x) --- modules/tm/t_msgbuilder.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c index a76c3db..c0160b9 100644 --- a/modules/tm/t_msgbuilder.c +++ b/modules/tm/t_msgbuilder.c @@ -514,8 +514,9 @@ static inline int get_uac_rs(sip_msg_t *msg, int is_req, struct rte **rtset) p = (rr_t*)ptr->parsed; while(p) { - if (! (t = (struct rte*)pkg_malloc(sizeof(struct rte)))) { - ERR("out of pkg mem (asked for: %zd).\n", sizeof(struct rte)); + if (! (t = pkg_malloc(sizeof(struct rte)))) { + ERR("out of pkg mem (asked for: %d).\n", + (int)sizeof(struct rte)); goto err; } if (is_req) { @@ -763,10 +764,10 @@ static int eval_uac_routing(sip_msg_t *rpl, const struct retr_buf *inv_rb, orig_inv.buf = inv_rb->buffer; orig_inv.len = inv_rb->buffer_len; DEBUG("reparsing retransmission buffer of original INVITE:\n%.*s\n", - orig_inv.len, orig_inv.buf); + (int)orig_inv.len, orig_inv.buf); if (parse_msg(orig_inv.buf, orig_inv.len, &orig_inv) != 0) { - ERR("failed to parse retr buffer (weird!): \n%.*s\n", orig_inv.len, - orig_inv.buf); + ERR("failed to parse retr buffer (weird!): \n%.*s\n", + (int)orig_inv.len, orig_inv.buf); return -1; } @@ -774,14 +775,14 @@ static int eval_uac_routing(sip_msg_t *rpl, const struct retr_buf *inv_rb, if ((parse_headers(&orig_inv, HDR_TO_F, 0) < 0) || (! orig_inv.to)) { /* the bug is at message assembly */ BUG("failed to parse INVITE retr. buffer and/or extract 'To' HF:" - "\n%.*s\n", orig_inv.len, orig_inv.buf); + "\n%.*s\n", (int)orig_inv.len, orig_inv.buf); goto end; } if (((struct to_body *)orig_inv.to->parsed)->tag_value.len) { DEBUG("building ACK for in-dialog INVITE (using RS in orig. INV.)\n"); if (parse_headers(&orig_inv, HDR_EOH_F, 0) < 0) { BUG("failed to parse INVITE retr. buffer to EOH:" - "\n%.*s\n", orig_inv.len, orig_inv.buf); + "\n%.*s\n", (int)orig_inv.len, orig_inv.buf); goto end; } sipmsg = &orig_inv; @@ -863,8 +864,8 @@ eval_flags: * it can be done along with rte chunk, independent of Route * header parser's allocator (using pkg/shm) */ chklen = sizeof(struct rte) + sizeof(rr_t); - if (! (t = (struct rte *)pkg_malloc(chklen))) { - ERR("out of pkg memory (%zd required)\n", chklen); + if (! (t = pkg_malloc(chklen))) { + ERR("out of pkg memory (%d required)\n", (int)chklen); goto end; } /* this way, .free_rr is also set to 0 (!!!) */

14 years, 6 months

git:master: compiler_opts: __builtin_prefetch supported from gcc 3.1

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: a22f9ee5231623236574d7728905940e72fdb7b9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a22f9ee… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 00:56:49 2009 +0200 compiler_opts: __builtin_prefetch supported from gcc 3.1 --- compiler_opt.h | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/compiler_opt.h b/compiler_opt.h index 95301a4..7fe2c21 100644 --- a/compiler_opt.h +++ b/compiler_opt.h @@ -44,25 +44,37 @@ #ifndef __compiler_opt_h #define __compiler_opt_h +/* likely/unlikely */ #if __GNUC__ >= 3 + #define likely(expr) __builtin_expect(!!(expr), 1) #define unlikely(expr) __builtin_expect(!!(expr), 0) -#define prefetch(addr) __builtin_prefetch((addr)) -#define prefetch_w(addr) __builtin_prefetch((addr), 1) -#define prefetch_loc_r(addr, loc) __builtin_prefetch((addr), 0, (loc)) -#define prefetch_loc_w(addr, loc) __builtin_prefetch((addr), 1, (loc)) - #else /* __GNUC__ */ #warning "No compiler optimizations supported try gcc 4.x" #define likely(expr) (expr) #define unlikely(expr) (expr) +#endif /* __GNUC__ */ + + + +/* prefetch* */ +#if ( __GNUC__ > 3 ) || ( __GNUC__ == 3 && __GNUC_MINOR__ >= 1 ) + +#define prefetch(addr) __builtin_prefetch((addr)) +#define prefetch_w(addr) __builtin_prefetch((addr), 1) +#define prefetch_loc_r(addr, loc) __builtin_prefetch((addr), 0, (loc)) +#define prefetch_loc_w(addr, loc) __builtin_prefetch((addr), 1, (loc)) + +#else + #define prefetch(addr) #define prefetch_w(addr) #define prefetch_loc_r(addr, loc) #define prefetch_loc_w(addr, loc) -#endif /* __GNUC__ */ + +#endif /* __GNUC__ > 3 || ( __GNUC__ == 3 && __GNUC_MINOR__ >= 1 ) */ #endif

14 years, 6 months

git:master: permissions(s): gcc 2.9x fixes: 0-len arrays & anonymous unions

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 19cb04ddf374356fcd90f244bcdb86bde45d530f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=19cb04d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 01:16:08 2009 +0200 permissions(s): gcc 2.9x fixes: 0-len arrays & anonymous unions - replaced flexible arrays (array[]) in structs with 0 length arrays (array[0]). Flexible array members are supported in C99, but not by gcc 2.9x. - anonymous union members cannot be accessed when compiling with gcc 2.9x. --- modules_s/permissions/ip_tree.h | 2 +- modules_s/permissions/permissions.c | 36 +++++++++++++++++----------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/modules_s/permissions/ip_tree.h b/modules_s/permissions/ip_tree.h index 15b7bb9..1b3abc1 100644 --- a/modules_s/permissions/ip_tree.h +++ b/modules_s/permissions/ip_tree.h @@ -88,7 +88,7 @@ struct ip_tree_leaf { unsigned int prefix_match_len; /* next prefix_match_len must be equal to next bit in IP address being compared */ struct ip_tree_leaf *next[2]; /* tree goes on in leaf based on first bit following prefix_match, if next[0] && next[1] are null then IP matches - it's subnet address */ - unsigned char prefix_match[]; /* match_bits div 8 + 1, the same representation as ip address */ + unsigned char prefix_match[0]; /* match_bits div 8 + 1, the same representation as ip address */ }; struct ip_tree_find { diff --git a/modules_s/permissions/permissions.c b/modules_s/permissions/permissions.c index fb6d606..2ce457d 100644 --- a/modules_s/permissions/permissions.c +++ b/modules_s/permissions/permissions.c @@ -574,7 +574,7 @@ struct ip_set_param { struct { struct ip_set_list_item *ip_set; } global; - }; + }u; }; #define MODULE_NAME "permissions" @@ -621,7 +621,7 @@ static int w_ip_is_trusted(struct sip_msg* msg, char* _ip_set, char* _ip) { int kind; kind = ((struct ip_set_param*)_ip_set)->kind; if (kind == IP_SET_PARAM_KIND_LOCAL) { - if (get_str_fparam(&ip_set_s, msg, ((struct ip_set_param*)_ip_set)->local.fparam) < 0) { + if (get_str_fparam(&ip_set_s, msg, ((struct ip_set_param*)_ip_set)->u.local.fparam) < 0) { ERR(MODULE_NAME": ip_is_trusted: Error while obtaining ip_set parameter value\n"); return -1; } @@ -634,10 +634,10 @@ static int w_ip_is_trusted(struct sip_msg* msg, char* _ip_set, char* _ip) { kind = IP_SET_PARAM_KIND_GLOBAL; goto force_global; } - ip_set = &((struct ip_set_param*)_ip_set)->local.ip_set; + ip_set = &((struct ip_set_param*)_ip_set)->u.local.ip_set; } else { - isli = ((struct ip_set_param*)_ip_set)->global.ip_set; + isli = ((struct ip_set_param*)_ip_set)->u.global.ip_set; force_global: if (!isli->ip_set) return -1; /* empty ip set */ @@ -693,28 +693,28 @@ static int w_ip_is_trusted(struct sip_msg* msg, char* _ip_set, char* _ip) { /* test if ip_set string has changed since last call */ if (kind == IP_SET_PARAM_KIND_LOCAL) { - if (((struct ip_set_param*)_ip_set)->local.s.len != ip_set_s.len || - memcmp(((struct ip_set_param*)_ip_set)->local.s.s, ip_set_s.s, ip_set_s.len) != 0) { + if (((struct ip_set_param*)_ip_set)->u.local.s.len != ip_set_s.len || + memcmp(((struct ip_set_param*)_ip_set)->u.local.s.s, ip_set_s.s, ip_set_s.len) != 0) { ip_set_init(&new_ip_set, 0); if (ip_set_add_list(&new_ip_set, ip_set_s) < 0) { ip_set_destroy(&new_ip_set); return -1; }; - if (((struct ip_set_param*)_ip_set)->local.sz < ip_set_s.len) { + if (((struct ip_set_param*)_ip_set)->u.local.sz < ip_set_s.len) { void *p; - p = pkg_realloc(((struct ip_set_param*)_ip_set)->local.s.s, ip_set_s.len); + p = pkg_realloc(((struct ip_set_param*)_ip_set)->u.local.s.s, ip_set_s.len); if (!p) { ip_set_destroy(&new_ip_set); return E_OUT_OF_MEM; } - ((struct ip_set_param*)_ip_set)->local.s.s = p; - ((struct ip_set_param*)_ip_set)->local.sz = ip_set_s.len; + ((struct ip_set_param*)_ip_set)->u.local.s.s = p; + ((struct ip_set_param*)_ip_set)->u.local.sz = ip_set_s.len; } - memcpy(((struct ip_set_param*)_ip_set)->local.s.s, ip_set_s.s, ip_set_s.len); - ((struct ip_set_param*)_ip_set)->local.s.len = ip_set_s.len; - ip_set_destroy(&((struct ip_set_param*)_ip_set)->local.ip_set); - ((struct ip_set_param*)_ip_set)->local.ip_set = new_ip_set; + memcpy(((struct ip_set_param*)_ip_set)->u.local.s.s, ip_set_s.s, ip_set_s.len); + ((struct ip_set_param*)_ip_set)->u.local.s.len = ip_set_s.len; + ip_set_destroy(&((struct ip_set_param*)_ip_set)->u.local.ip_set); + ((struct ip_set_param*)_ip_set)->u.local.ip_set = new_ip_set; } } /* ip_set_print(stderr, &ip_set); */ @@ -740,8 +740,8 @@ static int fixup_ip_is_trusted(void** param, int param_no) { s.len = strlen(s.s); if (is_ip_set_name(&s)) { - p->global.ip_set = ip_set_list_find_by_name(s); - if (!p->global.ip_set) { + p->u.global.ip_set = ip_set_list_find_by_name(s); + if (!p->u.global.ip_set) { ERR(MODULE_NAME": fixup_ip_is_trusted: ip set '%.*s' is not declared\n", s.len, s.s); goto err; } @@ -749,8 +749,8 @@ static int fixup_ip_is_trusted(void** param, int param_no) { } else { ret = fixup_var_str_12(param, param_no); if (ret < 0) goto err; - ip_set_init(&p->local.ip_set, 0); - p->local.fparam = *param; + ip_set_init(&p->u.local.ip_set, 0); + p->u.local.fparam = *param; *param = p; p->kind = IP_SET_PARAM_KIND_LOCAL; }

14 years, 6 months

git:master: avp_db(s): gcc 2.9x var decls. fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 142eae1df4416122dc9e81c97d1fd4634e446a68 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=142eae1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 01:14:58 2009 +0200 avp_db(s): gcc 2.9x var decls. fixes variable declarations must be at the beginning of the function and not intercalated in the code. --- modules_s/avp_db/extra_attrs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_s/avp_db/extra_attrs.c b/modules_s/avp_db/extra_attrs.c index c90562b..19c8f93 100644 --- a/modules_s/avp_db/extra_attrs.c +++ b/modules_s/avp_db/extra_attrs.c @@ -447,6 +447,7 @@ static int avpdb_post_script_cb(struct sip_msg *msg, unsigned int flags, void *p int init_extra_avp_locks() { int i; + registered_table_t *t = tables; /* zero all 'lock counters' */ memset(lock_counters, 0, sizeof(lock_counters)); @@ -461,7 +462,6 @@ int init_extra_avp_locks() } /* initializes mutexes for extra AVPs */ - registered_table_t *t = tables; i = 0; while (t) { t->group_mutex_idx = get_hash1_raw(t->table_name, strlen(t->table_name)) % LOCK_CNT;

14 years, 6 months

git:master: core: LOG() gcc 2.9x fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 20ce876472b6216207ec2e75aff2434097a835a8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=20ce876… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 00:58:15 2009 +0200 core: LOG() gcc 2.9x fixes In gcc versions older then 3.0 ## before a variable argument when the argument is empty will "eat" the _entire_ preceding sequence of non-whitespace characters (not only the ','). The fix just adds a space in front of ',' in all the macros calls that use var args and ##. --- dprint.h | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dprint.h b/dprint.h index 8f9d743..f8dd5cc 100644 --- a/dprint.h +++ b/dprint.h @@ -212,33 +212,34 @@ int log_facility_fixup(void *handle, str *gname, str *name, void **val); if (unlikely(log_stderr)) { \ fprintf(stderr, "%2d(%d) %s: %s" fmt, \ process_no, my_pid(), \ - LOG_LEVEL2NAME(level),(prefix), ## args);\ + LOG_LEVEL2NAME(level), \ + (prefix) , ## args);\ } else { \ syslog(LOG2SYSLOG_LEVEL(level) |\ (((facility) != DEFAULT_FACILITY) ? \ (facility) : \ cfg_get(core, core_cfg, log_facility)), \ "%s: %s" fmt, LOG_LEVEL2NAME(level),\ - (prefix), ## args); \ + (prefix) , ## args); \ } \ } else { \ if (log_stderr) { \ fprintf(stderr, "%2d(%d) %s" fmt, \ process_no, my_pid(), \ - (prefix), ## args); \ + (prefix) , ## args); \ } else { \ if ((level)<L_ALERT) \ syslog(LOG2SYSLOG_LEVEL(L_ALERT) | \ (((facility) != DEFAULT_FACILITY) ? \ (facility) : \ cfg_get(core, core_cfg, log_facility)),\ - "%s" fmt, (prefix), ## args); \ + "%s" fmt, (prefix) , ## args); \ else \ syslog(LOG2SYSLOG_LEVEL(L_DBG) | \ (((facility) != DEFAULT_FACILITY) ? \ (facility) : \ cfg_get(core, core_cfg, log_facility)),\ - "%s" fmt, (prefix), ## args); \ + "%s" fmt, (prefix) , ## args); \ } \ } \ DPRINT_CRIT_EXIT; \ @@ -246,9 +247,9 @@ int log_facility_fixup(void *handle, str *gname, str *name, void **val); } while(0) # define LOG(level, fmt, args...) \ - LOG_(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) + LOG_(DEFAULT_FACILITY, (level), LOC_INFO, fmt , ## args) # define LOG_FC(facility, level, fmt, args...) \ - LOG_((facility), (level), LOC_INFO, fmt, ## args) + LOG_((facility), (level), LOC_INFO, fmt , ## args) # endif /* __SUNPRO_C */ #endif /* NO_LOG */ @@ -276,22 +277,22 @@ int log_facility_fixup(void *handle, str *gname, str *name, void **val); # define DEBUG(...) DBG(__VA_ARGS__) #else /* ! __SUNPRO_C */ -# define ALERT(fmt, args...) LOG(L_ALERT, fmt, ## args) -# define BUG(fmt, args...) LOG(L_BUG, fmt, ## args) -# define ERR(fmt, args...) LOG(L_ERR, fmt, ## args) -# define WARN(fmt, args...) LOG(L_WARN, fmt, ## args) -# define NOTICE(fmt, args...) LOG(L_NOTICE, fmt, ## args) -# define INFO(fmt, args...) LOG(L_INFO, fmt, ## args) -# define CRIT(fmt, args...) LOG(L_CRIT2, fmt, ## args) +# define ALERT(fmt, args...) LOG(L_ALERT, fmt , ## args) +# define BUG(fmt, args...) LOG(L_BUG, fmt , ## args) +# define ERR(fmt, args...) LOG(L_ERR, fmt , ## args) +# define WARN(fmt, args...) LOG(L_WARN, fmt , ## args) +# define NOTICE(fmt, args...) LOG(L_NOTICE, fmt , ## args) +# define INFO(fmt, args...) LOG(L_INFO, fmt , ## args) +# define CRIT(fmt, args...) LOG(L_CRIT2, fmt , ## args) # ifdef NO_DEBUG # define DBG(fmt, args...) # else -# define DBG(fmt, args...) LOG(L_DBG, fmt, ## args) +# define DBG(fmt, args...) LOG(L_DBG, fmt , ## args) # endif /* obsolete, do not use */ -# define DEBUG(fmt, args...) DBG(fmt, ## args) +# define DEBUG(fmt, args...) DBG(fmt , ## args) #endif /* __SUNPRO_C */

14 years, 6 months

git:master: pike(s): gcc 2.9x var decls. fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: c60ba81953e59f57ad3d11f4ec2918120f7b924e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c60ba81… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 01:26:13 2009 +0200 pike(s): gcc 2.9x var decls. fixes variable declarations must be at the beginning of the function and not intercalated in the code. --- modules_s/pike/rpc.c | 6 ++---- modules_s/pike/top.c | 10 +++++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules_s/pike/rpc.c b/modules_s/pike/rpc.c index 95ed557..25b0687 100644 --- a/modules_s/pike/rpc.c +++ b/modules_s/pike/rpc.c @@ -99,9 +99,6 @@ static char *concat(char *buff, size_t buffsize, const char *first, int second) static void pike_top(rpc_t *rpc, void *c) { - - DBG("pike: top"); - int i; void *handle; struct TopListItem_t *top_list_root; @@ -117,9 +114,10 @@ static void pike_top(rpc_t *rpc, void *c) size_t leaf_hits_curr_size = 0; size_t expires_size = 0; size_t status_size = 0; - char *stropts; int options = 0; + + DBG("pike: top"); /* obtain params */ if (rpc->scan(c, "s", &stropts) <= 0) diff --git a/modules_s/pike/top.c b/modules_s/pike/top.c index 6de82eb..cb42546 100644 --- a/modules_s/pike/top.c +++ b/modules_s/pike/top.c @@ -46,9 +46,13 @@ static char *print_addr(unsigned char *ip, int iplen) int pike_top_add_entry( unsigned char *ip_addr, int addr_len, unsigned int leaf_hits[2], unsigned int hits[2], unsigned int expires, node_status_t status ) { - print_addr(ip_addr, addr_len); - DBG("pike_top_add_enrty(ip: %s, leaf_hits[%d,%d], hits[%d,%d], expires: %d, status: %d)", buff, leaf_hits[0], leaf_hits[1], hits[0], hits[1], expires, status); struct TopListItem_t *new_item = (struct TopListItem_t *)malloc(sizeof(struct TopListItem_t)); + + print_addr(ip_addr, addr_len); + DBG("pike_top_add_enrty(ip: %s, leaf_hits[%d,%d], hits[%d,%d]," + " expires: %d, status: %d)", + buff, leaf_hits[0], leaf_hits[1], hits[0], hits[1], + expires, status); assert(new_item != 0); memset( (void *)new_item, 0, sizeof(struct TopListItem_t) ); @@ -73,9 +77,9 @@ int pike_top_add_entry( unsigned char *ip_addr, int addr_len, unsigned int leaf_ void pike_top_list_clear() { - top_list_iter = top_list_root; struct TopListItem_t *ptr; + top_list_iter = top_list_root; while (top_list_iter) { ptr = top_list_iter->next; free(top_list_iter);

14 years, 6 months

git:master: makefile: arch detection uses gcc

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: c46e79709216c4975abc83869fbce9fa696eac74 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c46e797… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 30 20:18:23 2009 +0200 makefile: arch detection uses gcc Target architecture detection switched from using the host to using the target architecture of the compiler, if the compiler is gcc. Extra options (CC_EXTRA_OPTS) are taken into account (e.g. make config CC_EXTRA_OPTS=-m32 will result in i386 on a gcc configured with default x86_64 arch.). This should make cross-compiling much easier and should also fix problems with systems with 64-bit kernels and 32-bits userland or vice versa (e.g. snow leopard which by default boots a 32-bit kernel, but its gcc produces only 64-bit binaries). --- Makefile.defs | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 89 insertions(+), 10 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index e46aa03..eb659be 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -69,7 +69,9 @@ # 2009-03-10 replaced DEFS with C_DEFS and INCLUDES with C_INCLUDES (DEFS # and INCLUDES are now used only for "temporary" defines/includes # inside modules or libs) (andrei) -# 2009-09-20 for gcc 4.2+ use -fno-strict-overflow (andrei) +# 2009-09-29 for gcc 4.2+ use -fno-strict-overflow (andrei) +# 2009-09-30 find the target architecture from the compiler and not +# from the host (andrei) # check if already included/exported @@ -129,18 +131,18 @@ else GETARCH=uname -m endif -ARCH := $(shell $(GETARCH) |sed -e s/i.86/i386/ -e s/sun4[uv]/sparc64/ \ +HOST_ARCH := $(shell $(GETARCH) |sed -e s/i.86/i386/ -e s/sun4[uv]/sparc64/ \ -e s/armv[3-5].*/arm/ -e s/armv6.*/arm6/ \ -e "s/Power Macintosh/ppc/" \ -e "s/cobalt/mips2/" \ -e s/amd64/x86_64/ -e s/sparcv9/sparc64/ ) # fix sparc -> sparc64 -ifeq ($(ARCH),sparc) +ifeq ($(HOST_ARCH),sparc) ifeq ($(shell uname -m),sun4u) - ARCH := sparc64 + HOST_ARCH := sparc64 endif ifeq ($(shell uname -m),sun4v) - ARCH := sparc64 + HOST_ARCH := sparc64 endif endif @@ -340,6 +342,84 @@ $(warning Unknown compiler $(CC)\; supported compilers: \ gcc, sun cc, intel icc ) endif +# ARCH detection +# predefined compiler macros for different architectures +# (see http://predef.sourceforge.net/prearch.html for a more complete list) +i386_macros= i386 __i386__ __i486__ __i586__ __i686__ \ + __i386 _M_IX86 __X86__ _X86_ +x86_64_macros= __amd64__ __amd64 __x86_64__ __x86_64 _M_X64 + +sparc_macros= __sparc__ __sparc __sparcv8 +sparc64_macros= __sparcv9 __sparc_v9__ + +arm_macros= __arm__ __thumb__ +arm6_macros= __ARM_ARCH_6__ + +ppc_macros= __powerpc __powerpc__ __POWERPC__ __ppc__ _ARCH_PPC +ppc64_macros= __ppc64__ _ARCH_PPC64 + +mips_macros= __mips__ __mips _MIPS_ARCH_MIPS1 +mips2_macros= _MIPS_ISA_MIPS2 _MIPS_ISA_MIPS3 _MIPS_ISA_MIPS4 \ + _MIPS_ARCH_MIPS2 _MIPS_ARCH_MIPS3 _MIPS_ARCH_MIPS4 +mips64_macros= _MIPS_ISA_MIPS64 _MIPS_ARCH_MIPS64 + +alpha_macros= __alpha__ __alpha _M_ALPHA_ + +ifeq ($(CC_NAME),gcc) +#if gcc use gcc arch +predef_macros:=$(shell $(CC) -dM -E -x c $(CC_EXTRA_OPTS) $(extra_defs) \ + $(CFLAGS) /dev/null) + +ifneq ($(strip $(filter $(i386_macros), $(predef_macros))),) +CC_ARCH=i386 +else ifneq ($(strip $(filter $(x86_64_macros), $(predef_macros))),) +CC_ARCH=x86_64 +else ifneq ($(strip $(filter $(sparc_macros), $(predef_macros))),) + +ifneq ($(strip $(filter $(sparc64_macros), $(predef_macros))),) +CC_ARCH=sparc64 +else # sparc64_macros +CC_ARCH=sparc +endif # sparc64_macros + +else ifneq ($(strip $(filter $(arm_macros), $(predef_macros))),) + +ifneq ($(strip $(filter $(arm6_macros), $(predef_macros))),) +CC_ARCH=arm6 +else # arm6_macros +CC_ARCH=arm +endif # arm6_macros + +else ifneq ($(strip $(filter $(ppc64_macros), $(predef_macros))),) +CC_ARCH=ppc64 +else ifneq ($(strip $(filter $(ppc_macros), $(predef_macros))),) +CC_ARCH=ppc +else ifneq ($(strip $(filter $(mips_macros), $(predef_macros))),) + +ifneq ($(strip $(filter $(mips64_macros), $(predef_macros))),) +CC_ARCH=mips64 +else ifneq ($(strip $(filter $(mips2_macros), $(predef_macros))),) +CC_ARCH=mips2 +else # mips2_macros +CC_ARCH=mips +endif # mips64_macros + +else ifneq ($(strip $(filter $(alpha_macros), $(predef_macros))),) +CC_ARCH=alpha +else + +$(warn "Unknown target compiler architecture") + +endif # predefined macros tests (x86_macros, ...) + +endif # gcc + +ifdef CC_ARCH +$(info "target architecture <$(CC_ARCH)>, host architecture <$(HOST_ARCH)>") +ARCH:=$(CC_ARCH) +else +ARCH:=$(HOST_ARCH) +endif # compile-time options # @@ -671,7 +751,8 @@ ifeq ($(ARCH), i386) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) + CFLAGS=-m32 -g -O9 -funroll-loops -Wcast-align $(PROFILE) + LDFLAGS+=-m32 #if gcc 4.2+ ifeq ($(CC_SHORTVER), 4.2+) CPU ?= athlon64 @@ -908,8 +989,7 @@ ifeq ($(CC_NAME), gcc) ifeq ($(CC_SHORTVER), 4.2+) CPU ?= v8 #use 32bit for now - CFLAGS+= -minline-all-stringops \ - -mtune=$(CPU) \ + CFLAGS+= -mtune=$(CPU) \ -fno-strict-overflow \ -ftree-vectorize else @@ -917,8 +997,7 @@ else ifeq ($(CC_SHORTVER), 4.x) CPU ?= v8 #use 32bit for now - CFLAGS+= -minline-all-stringops \ - -mtune=$(CPU) \ + CFLAGS+= -mtune=$(CPU) \ -ftree-vectorize else #if gcc 3.4

14 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2009