Change in libosmocore[master]: msgb_put: more elaborate logging of head/tailroom failure
neels has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/16164 )
Change subject: msgb_put: more elaborate logging of head/tailroom failure
..
msgb_put: more elaborate logging of head/tailroom failure
Change-Id: I55b68098e1037c74ebe5faa86e34bd4494f5b726
---
M include/osmocom/core/msgb.h
1 file changed, 12 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h
index 1833a6c..cc76e3a 100644
--- a/include/osmocom/core/msgb.h
+++ b/include/osmocom/core/msgb.h
@@ -239,7 +239,11 @@
{
unsigned char *tmp = msgb->tail;
if (msgb_tailroom(msgb) < (int) len)
- MSGB_ABORT(msgb, "Not enough tailroom msgb_put (%u < %u)\n",
+ MSGB_ABORT(msgb, "Not enough tailroom msgb_put"
+ " (allocated %u, head at %u, len %u, tailroom %u <
want tailroom %u)\n",
+ msgb->data_len - sizeof(struct msgb),
+ msgb->head - msgb->_data,
+ msgb->len,
msgb_tailroom(msgb), len);
msgb->tail += len;
msgb->len += len;
@@ -335,8 +339,13 @@
static inline unsigned char *msgb_push(struct msgb *msgb, unsigned int len)
{
if (msgb_headroom(msgb) < (int) len)
- MSGB_ABORT(msgb, "Not enough headroom msgb_push (%u < %u)\n",
- msgb_headroom(msgb), len);
+ MSGB_ABORT(msgb, "Not enough headroom msgb_push"
+ " (allocated %u, head at %u < want headroom %u, len
%u, tailroom %u)\n",
+ msgb->data_len - sizeof(struct msgb),
+ msgb->head - msgb->_data,
+ len,
+ msgb->len,
+ msgb_tailroom(msgb));
msgb->data -= len;
msgb->len += len;
return msgb->data;
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16164
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I55b68098e1037c74ebe5faa86e34bd4494f5b726
Gerrit-Change-Number: 16164
Gerrit-PatchSet: 3
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in libosmocore[master]: msgb_put: more elaborate logging of head/tailroom failure
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16164 ) Change subject: msgb_put: more elaborate logging of head/tailroom failure .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/16164/2/include/osmocom/core/msgb.h File include/osmocom/core/msgb.h: https://gerrit.osmocom.org/c/libosmocore/+/16164/2/include/osmocom/core/msgb.h@243 PS2, Line 243: " (allocated %u, head at %u, len %u, tailroom %u < want tailroom %u)\n", > Ah it's fine, sorry. yeah, the difference is a count -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I55b68098e1037c74ebe5faa86e34bd4494f5b726 Gerrit-Change-Number: 16164 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 24 Nov 2019 18:56:34 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in libosmocore[master]: msgb_put: more elaborate logging of head/tailroom failure
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16164 ) Change subject: msgb_put: more elaborate logging of head/tailroom failure .. Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/16164/2/include/osmocom/core/msgb.h File include/osmocom/core/msgb.h: https://gerrit.osmocom.org/c/libosmocore/+/16164/2/include/osmocom/core/msgb.h@243 PS2, Line 243: " (allocated %u, head at %u, len %u, tailroom %u < want tailroom %u)\n", > isn't msgb->head - msgb->_data a pointer? then use %p instead of %u. Ah it's fine, sorry. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I55b68098e1037c74ebe5faa86e34bd4494f5b726 Gerrit-Change-Number: 16164 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 22 Nov 2019 14:50:12 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in libosmocore[master]: msgb_put: more elaborate logging of head/tailroom failure
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16164 ) Change subject: msgb_put: more elaborate logging of head/tailroom failure .. Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/16164/2/include/osmocom/core/msgb.h File include/osmocom/core/msgb.h: https://gerrit.osmocom.org/c/libosmocore/+/16164/2/include/osmocom/core/msgb.h@243 PS2, Line 243: " (allocated %u, head at %u, len %u, tailroom %u < want tailroom %u)\n", isn't msgb->head - msgb->_data a pointer? then use %p instead of %u. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I55b68098e1037c74ebe5faa86e34bd4494f5b726 Gerrit-Change-Number: 16164 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 22 Nov 2019 14:47:08 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: msgb_put: more elaborate logging of head/tailroom failure
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16164 ) Change subject: msgb_put: more elaborate logging of head/tailroom failure .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I55b68098e1037c74ebe5faa86e34bd4494f5b726 Gerrit-Change-Number: 16164 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 22 Nov 2019 12:32:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: msgb_put: more elaborate logging of head/tailroom failure
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/16164 )
Change subject: msgb_put: more elaborate logging of head/tailroom failure
..
msgb_put: more elaborate logging of head/tailroom failure
Change-Id: I55b68098e1037c74ebe5faa86e34bd4494f5b726
---
M include/osmocom/core/msgb.h
1 file changed, 12 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/64/16164/1
diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h
index 1833a6c..cc76e3a 100644
--- a/include/osmocom/core/msgb.h
+++ b/include/osmocom/core/msgb.h
@@ -239,7 +239,11 @@
{
unsigned char *tmp = msgb->tail;
if (msgb_tailroom(msgb) < (int) len)
- MSGB_ABORT(msgb, "Not enough tailroom msgb_put (%u < %u)\n",
+ MSGB_ABORT(msgb, "Not enough tailroom msgb_put"
+ " (allocated %u, head at %u, len %u, tailroom %u <
want tailroom %u)\n",
+ msgb->data_len - sizeof(struct msgb),
+ msgb->head - msgb->_data,
+ msgb->len,
msgb_tailroom(msgb), len);
msgb->tail += len;
msgb->len += len;
@@ -335,8 +339,13 @@
static inline unsigned char *msgb_push(struct msgb *msgb, unsigned int len)
{
if (msgb_headroom(msgb) < (int) len)
- MSGB_ABORT(msgb, "Not enough headroom msgb_push (%u < %u)\n",
- msgb_headroom(msgb), len);
+ MSGB_ABORT(msgb, "Not enough headroom msgb_push"
+ " (allocated %u, head at %u < want headroom %u, len
%u, tailroom %u)\n",
+ msgb->data_len - sizeof(struct msgb),
+ msgb->head - msgb->_data,
+ len,
+ msgb->len,
+ msgb_tailroom(msgb));
msgb->data -= len;
msgb->len += len;
return msgb->data;
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16164
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I55b68098e1037c74ebe5faa86e34bd4494f5b726
Gerrit-Change-Number: 16164
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
