vcl: fix VPPCOM_ATTR_GET_LIBC_EPFD elog

[vpp.git] / src / vcl / vppcom.c

diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c
index 3ba94be..167a745 100644 (file)
--- a/src/vcl/vppcom.c
+++ b/src/vcl/vppcom.c
@@ -1633,7 +1633,6 @@ vppcom_session_disconnect (u32 session_index)
     {
       if (is_server)
        {
-         svm_fifo_segment_main_t *sm = &svm_fifo_segment_main;
          svm_fifo_segment_private_t *seg;
 
          VCL_LOCK_AND_GET_SESSION (session_index, &session);
@@ -1649,7 +1648,7 @@ vppcom_session_disconnect (u32 session_index)
                          session->server_tx_fifo,
                          session->server_tx_fifo->refcnt);
 
-         seg = vec_elt_at_index (sm->segments, session->sm_seg_index);
+         seg = svm_fifo_segment_get_segment (session->sm_seg_index);
          svm_fifo_segment_free_fifo (seg, session->server_rx_fifo,
                                      FIFO_SEGMENT_RX_FREELIST);
          svm_fifo_segment_free_fifo (seg, session->server_tx_fifo,
@@ -4559,21 +4558,15 @@ vppcom_session_attr (uint32_t session_index, uint32_t op,
          /* *INDENT-OFF* */
          ELOG_TYPE_DECLARE (e) =
            {
-             .format = "VPPCOM_ATTR_GET_LIBC_EPFD: libc_epfd=%s%d buflen=%d",
-             .format_args = "t1i4i4",
-             .n_enum_strings = 2,
-             .enum_strings = {"", "-",},
+             .format = "VPPCOM_ATTR_GET_LIBC_EPFD: libc_epfd=%d",
+             .format_args = "i4",
            };
          CLIB_PACKED (struct {
-           u8 sign;
-           u32 data[2];
+           i32 data;
          }) * ed;
 
          ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
-
-         ed->sign = (session->libc_epfd < 0);
-         ed->data[0] = abs(session->libc_epfd);
-         ed->data[1] = *buflen;
+         ed->data = session->libc_epfd;
          /* *INDENT-ON* */
        }