Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
reduce polling and resume overhead by checking if inflight request exists
[vpp.git]
/
src
/
plugins
/
memif
/
private.h
diff --git
a/src/plugins/memif/private.h
b/src/plugins/memif/private.h
index
5c8a919
..
82056a1
100644
(file)
--- a/
src/plugins/memif/private.h
+++ b/
src/plugins/memif/private.h
@@
-16,6
+16,7
@@
*/
#include <vppinfra/lock.h>
*/
#include <vppinfra/lock.h>
+#include <vlib/log.h>
#define MEMIF_DEFAULT_SOCKET_FILENAME "memif.sock"
#define MEMIF_DEFAULT_RING_SIZE 1024
#define MEMIF_DEFAULT_SOCKET_FILENAME "memif.sock"
#define MEMIF_DEFAULT_RING_SIZE 1024
@@
-23,44
+24,29
@@
#define MEMIF_DEFAULT_TX_QUEUES 1
#define MEMIF_DEFAULT_BUFFER_SIZE 2048
#define MEMIF_DEFAULT_TX_QUEUES 1
#define MEMIF_DEFAULT_BUFFER_SIZE 2048
-#define MEMIF_MAX_M2S_RING (vec_len (vlib_mains)
- 1
)
-#define MEMIF_MAX_S2M_RING
(vec_len (vlib_mains) - 1)
-#define MEMIF_MAX_REGION 25
5
+#define MEMIF_MAX_M2S_RING (vec_len (vlib_mains))
+#define MEMIF_MAX_S2M_RING
256
+#define MEMIF_MAX_REGION 25
6
#define MEMIF_MAX_LOG2_RING_SIZE 14
#define MEMIF_MAX_LOG2_RING_SIZE 14
-#define MEMIF_DEBUG 0
-#if MEMIF_DEBUG == 1
-#define DBG(...) clib_warning(__VA_ARGS__)
-#define DBG_UNIX_LOG(...) clib_unix_warning(__VA_ARGS__)
-#else
-#define DBG(...)
-#define DBG_UNIX_LOG(...)
-#endif
-
-#if MEMIF_DEBUG == 1
#define memif_file_add(a, b) do { \
*a = clib_file_add (&file_main, b); \
#define memif_file_add(a, b) do { \
*a = clib_file_add (&file_main, b); \
- clib_warning ("clib_file_add fd %d private_data %u idx %u", \
+ vlib_log_warn ((&memif_main)->log_class, \
+ "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 { \
(b)->file_descriptor, (b)->private_data, *a); \
} while (0)
#define memif_file_del(a) do { \
- clib_warning ("clib_file_del idx %u",a - file_main.file_pool); \
+ vlib_log_warn ((&memif_main)->log_class, \
+ "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 { \
clib_file_del (&file_main, a); \
} while (0)
#define memif_file_del_by_index(a) do { \
-
clib_warning ("clib_file_del idx %u", a);
\
+
vlib_log_warn ((&memif_main)->log_class, "clib_file_del idx %u", a);
\
clib_file_del_by_index (&file_main, a); \
} while (0)
clib_file_del_by_index (&file_main, a); \
} while (0)
-#else
-#define memif_file_add(a, b) do { \
- *a = clib_file_add (&file_main, b); \
-} while (0)
-#define memif_file_del(a) clib_file_del(&file_main, a)
-#define memif_file_del_by_index(a) clib_file_del_by_index(&file_main, a)
-#endif
typedef struct
{
typedef struct
{
@@
-227,6
+213,8
@@
typedef struct
/* per thread data */
memif_per_thread_data_t *per_thread_data;
/* per thread data */
memif_per_thread_data_t *per_thread_data;
+ vlib_log_class_t log_class;
+
} memif_main_t;
extern memif_main_t memif_main;
} memif_main_t;
extern memif_main_t memif_main;