X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fmemif%2Fprivate.h;h=a938b85e7da1aa3c60ec38f73eb4d85783beaf89;hb=98311da8b42d1e97e4a6cc22cb2032ba84f08fad;hp=82056a1ecfb4acf0eb870d770281d6418f3eb53f;hpb=20728d40d91b89fe9f9d8d8c3f4ec16d51412c8b;p=vpp.git

diff --git a/src/plugins/memif/private.h b/src/plugins/memif/private.h
index 82056a1ecfb..a938b85e7da 100644
--- a/src/plugins/memif/private.h
+++ b/src/plugins/memif/private.h
@@ -30,21 +30,52 @@
 #define MEMIF_MAX_LOG2_RING_SIZE	14
 
 
+#define memif_log_debug(dev, f, ...) do {                               \
+  memif_if_t *_dev = (memif_if_t *) dev;                                \
+  if (_dev)                                                             \
+    vlib_log(VLIB_LOG_LEVEL_DEBUG, memif_main.log_class, "%U: " f,      \
+	     format_vnet_hw_if_index_name, vnet_get_main(),             \
+	     _dev->hw_if_index, ##__VA_ARGS__);                         \
+  else                                                                  \
+    vlib_log(VLIB_LOG_LEVEL_DEBUG, memif_main.log_class, f,             \
+             ##__VA_ARGS__);                                            \
+} while (0)
+
+#define memif_log_warn(dev, f, ...) do {                                \
+  memif_if_t *_dev = (memif_if_t *) dev;                                \
+  if (_dev)                                                             \
+    vlib_log(VLIB_LOG_LEVEL_WARNING, memif_main.log_class, "%U: " f,    \
+	     format_vnet_hw_if_index_name, vnet_get_main(),             \
+	     _dev->hw_if_index, ##__VA_ARGS__);                         \
+  else                                                                  \
+    vlib_log(VLIB_LOG_LEVEL_WARNING, memif_main.log_class, f,           \
+             ##__VA_ARGS__);                                            \
+} while (0)
+
+#define memif_log_err(dev, f, ...) do {                                 \
+  memif_if_t *_dev = (memif_if_t *) dev;                                \
+  if (_dev)                                                             \
+    vlib_log(VLIB_LOG_LEVEL_ERR, memif_main.log_class, "%U: " f,        \
+	     format_vnet_hw_if_index_name, vnet_get_main(),             \
+	     _dev->hw_if_index, ##__VA_ARGS__);                         \
+  else                                                                  \
+    vlib_log(VLIB_LOG_LEVEL_ERR, memif_main.log_class, f,               \
+             ##__VA_ARGS__);                                            \
+} while (0)
+
 #define memif_file_add(a, b) do {					\
   *a = clib_file_add (&file_main, b);					\
-  vlib_log_warn ((&memif_main)->log_class,				\
-		"clib_file_add fd %d private_data %u idx %u",		\
+  memif_log_warn (0, "clib_file_add fd %d private_data %u idx %u",	\
 		(b)->file_descriptor, (b)->private_data, *a);		\
 } while (0)
 
 #define memif_file_del(a) do {						\
-  vlib_log_warn ((&memif_main)->log_class,				\
-		"clib_file_del idx %u",a - file_main.file_pool);	\
+  memif_log_warn (0, "clib_file_del idx %u", a - file_main.file_pool);	\
   clib_file_del (&file_main, a);					\
 } while (0)
 
 #define memif_file_del_by_index(a) do {					\
-  vlib_log_warn ((&memif_main)->log_class, "clib_file_del idx %u", a);	\
+  memif_log_warn (0, "clib_file_del idx %u", a);			\
   clib_file_del_by_index (&file_main, a);				\
 } while (0)
 
@@ -82,6 +113,7 @@ typedef struct
 
 typedef struct
 {
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
   /* ring data */
   memif_ring_t *ring;
   memif_log2_ring_size_t log2_ring_size;
@@ -174,6 +206,7 @@ typedef struct
 
 typedef struct
 {
+  CLIB_ALIGN_MARK (pad, 16);	/* align up to 16 bytes for 32bit builds */
   void *data;
   u32 data_len;
   i16 buffer_offset;
@@ -277,6 +310,7 @@ clib_error_t *memif_msg_send_disconnect (memif_if_t * mif,
 					 clib_error_t * err);
 u8 *format_memif_device_name (u8 * s, va_list * args);
 
+
 /*
  * fd.io coding-style-patch-verification: ON
  *