<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21614">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gbproxy: Introduce new DOBJ log category; log object allocation/release<br><br>Related: OS#4472<br>Change-Id: I43bcbcda8667d193e7a17fd8e8e9109597b01484<br>---<br>M include/osmocom/sgsn/debug.h<br>M include/osmocom/sgsn/gb_proxy.h<br>M src/gbproxy/gb_proxy_main.c<br>M src/gbproxy/gb_proxy_peer.c<br>4 files changed, 29 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/14/21614/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sgsn/debug.h b/include/osmocom/sgsn/debug.h</span><br><span>index 29d500d..4e11639 100644</span><br><span>--- a/include/osmocom/sgsn/debug.h</span><br><span>+++ b/include/osmocom/sgsn/debug.h</span><br><span>@@ -40,6 +40,7 @@</span><br><span> DIUCS,</span><br><span> DSIGTRAN,</span><br><span> DGTP,</span><br><span style="color: hsl(120, 100%, 40%);">+ DOBJ,</span><br><span> Debug_LastEntry,</span><br><span> };</span><br><span> </span><br><span>diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h</span><br><span>index e61b991..8892cf4 100644</span><br><span>--- a/include/osmocom/sgsn/gb_proxy.h</span><br><span>+++ b/include/osmocom/sgsn/gb_proxy.h</span><br><span>@@ -142,6 +142,11 @@</span><br><span> #define LOGPBVC(BVC, LEVEL, FMT, ARGS...) \</span><br><span> LOGPBVC_CAT(BVC, DGPRS, LEVEL, FMT, ## ARGS)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define LOGPCELL_CAT(CELL, SUBSYS, LEVEL, FMT, ARGS...) \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(SUBSYS, LEVEL, "CELL(%05u) " FMT, (CELL)->bvci, ## ARGS)</span><br><span style="color: hsl(120, 100%, 40%);">+#define LOGPCELL(CELL, LEVEL, FMT, ARGS...) \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCELL_CAT(CELL, DGPRS, LEVEL, FMT, ## ARGS)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* gb_proxy_vty .c */</span><br><span> </span><br><span> int gbproxy_vty_init(void);</span><br><span>diff --git a/src/gbproxy/gb_proxy_main.c b/src/gbproxy/gb_proxy_main.c</span><br><span>index 52b1042..9c1daa1 100644</span><br><span>--- a/src/gbproxy/gb_proxy_main.c</span><br><span>+++ b/src/gbproxy/gb_proxy_main.c</span><br><span>@@ -214,6 +214,12 @@</span><br><span> .description = "GPRS BSS Gateway Protocol (BSSGP)",</span><br><span> .enabled = 1, .loglevel = LOGL_DEBUG,</span><br><span> },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DOBJ] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DOBJ",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "GbProxy object allocation/release",</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[38;5;121m"</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> };</span><br><span> </span><br><span> static const struct log_info gprs_log_info = {</span><br><span>diff --git a/src/gbproxy/gb_proxy_peer.c b/src/gbproxy/gb_proxy_peer.c</span><br><span>index ed7df32..c38b2f7 100644</span><br><span>--- a/src/gbproxy/gb_proxy_peer.c</span><br><span>+++ b/src/gbproxy/gb_proxy_peer.c</span><br><span>@@ -86,6 +86,11 @@</span><br><span> </span><br><span> hash_add(nse->bvcs, &bvc->list, bvc->bvci);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPBVC_CAT(bvc, DOBJ, LOGL_INFO, "BVC Created\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* We leave allocating the bvc->fi to the caller, as the FSM details depend</span><br><span style="color: hsl(120, 100%, 40%);">+ * on the type of BVC (SIG/PTP) and role (SGSN/BSS) */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return bvc;</span><br><span> }</span><br><span> </span><br><span>@@ -96,6 +101,8 @@</span><br><span> if (!bvc)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPBVC_CAT(bvc, DOBJ, LOGL_INFO, "BVC Destroying\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> hash_del(&bvc->list);</span><br><span> </span><br><span> rate_ctr_group_free(bvc->ctrg);</span><br><span>@@ -167,6 +174,8 @@</span><br><span> </span><br><span> hash_add(cfg->cells, &cell->list, cell->bvci);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCELL_CAT(cell, DOBJ, LOGL_INFO, "CELL Created\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return cell;</span><br><span> }</span><br><span> </span><br><span>@@ -201,6 +210,8 @@</span><br><span> if (!cell)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCELL_CAT(cell, DOBJ, LOGL_INFO, "CELL Destroying\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* remove from cfg.cells */</span><br><span> hash_del(&cell->list);</span><br><span> </span><br><span>@@ -225,6 +236,8 @@</span><br><span> for (i = 0; i < ARRAY_SIZE(cell->sgsn_bvc); i++) {</span><br><span> if (!cell->sgsn_bvc[i]) {</span><br><span> cell->sgsn_bvc[i] = bvc;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCELL_CAT(cell, DOBJ, LOGL_DEBUG, "CELL linked to SGSN\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPBVC_CAT(bvc, DOBJ, LOGL_DEBUG, "BVC linked to CELL\n");</span><br><span> return true;</span><br><span> }</span><br><span> }</span><br><span>@@ -255,6 +268,8 @@</span><br><span> </span><br><span> hash_init(nse->bvcs);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPNSE_CAT(nse, DOBJ, LOGL_INFO, "NSE Created\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return nse;</span><br><span> }</span><br><span> </span><br><span>@@ -267,6 +282,8 @@</span><br><span> if (!nse)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPNSE_CAT(nse, DOBJ, LOGL_INFO, "NSE Destroying\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> hash_del(&nse->list);</span><br><span> </span><br><span> hash_for_each_safe(nse->bvcs, i, tmp, bvc, list)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21614">change 21614</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21614"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I43bcbcda8667d193e7a17fd8e8e9109597b01484 </div>
<div style="display:none"> Gerrit-Change-Number: 21614 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>