增加APP的SmartOffload接口并修正了编译和调试中发现的若干问题。

1 files changed, 92 insertions, 89 deletions

diff --git a/include/external/marsio.h b/include/external/marsio.h
index 737573d..8ecd844 100644
--- a/include/external/marsio.h
+++ b/include/external/marsio.h
@@ -1,11 +1,11 @@
 /*
  *	\brief MARSIO Userspace ZeroCopy Driver Version 4
- *	
+ *
  *	This is the user api header file of MARSIOv4 ZeroCopy Driver
- *	
+ *
  *	\author	Qiuwen Lu<[email protected]>
  *			Institute of Information Engineering, Chinese Academy of Sciences
- *			
+ *
  *	\date	2016-12-01
  */
 
@@ -20,14 +20,14 @@ typedef enum
     /* 线程绑定模式，类型：uint32_t */
     MARSIO_OPT_THREAD_AFFINITY_MODE,
 
-    /* 处理SIG信号，缺省值：类型：uint32_t，关闭（0） 
-	 * 启用该选项后，将自动处理SIGINT、SIGTERM信号
-	 */
+    /* 处理SIG信号，缺省值：类型：uint32_t，关闭（0）
+     * 启用该选项后，将自动处理SIGINT、SIGTERM信号
+     */
     MARSIO_OPT_EXIT_WHEN_ERR,
 
     /* 拓展数据面线程绑定掩码，适应大于64个核处理器的硬件平台
-	 * 设置该掩码后，数据面线程数选项将被忽略
-	 */
+     * 设置该掩码后，数据面线程数选项将被忽略
+     */
     MARSIO_OPT_THREAD_MASK_IN_CPUSET,
 
 } marsio_opt_type_t;
@@ -132,133 +132,136 @@ struct mr_sendpath;
 struct mr_instance;
 struct mr_vdev;
 
-struct mr_instance *marsio_create();
-struct mr_instance *marsio_current();
+struct mr_instance * marsio_create();
+struct mr_instance * marsio_current();
 
-typedef int (*fn_sendpath_hook_t)(struct mr_sendpath *sendpath, marsio_buff_t *mbuf[], unsigned int nr_mbuf, void *arg);
+typedef int (*fn_sendpath_hook_t)(struct mr_sendpath * sendpath, marsio_buff_t * mbuf[], unsigned int nr_mbuf,
+                                  void * arg);
 
-int marsio_option_get(struct mr_instance *instance, int opt_type, void *out_opt, size_t out_opt_buffer);
-int marsio_option_set(struct mr_instance *instance, marsio_opt_type_t opt_type, void *opt, size_t sz_opt);
-int marsio_init(struct mr_instance *instance, const char *appsym);
-int marsio_thread_init(struct mr_instance *instance);
-int marsio_destory(struct mr_instance *instance);
+int marsio_option_get(struct mr_instance * instance, int opt_type, void * out_opt, size_t out_opt_buffer);
+int marsio_option_set(struct mr_instance * instance, marsio_opt_type_t opt_type, void * opt, size_t sz_opt);
+int marsio_init(struct mr_instance * instance, const char * appsym);
+int marsio_thread_init(struct mr_instance * instance);
+int marsio_destory(struct mr_instance * instance);
 
-struct mr_vdev *marsio_open_device(
-        struct mr_instance *instance, const char *devsym, unsigned int nr_rxstream, unsigned int nr_txstream);
+struct mr_vdev * marsio_open_device(struct mr_instance * instance, const char * devsym, unsigned int nr_rxstream,
+                                    unsigned int nr_txstream);
 
-void marsio_close_device(struct mr_vdev *vdev);
+void marsio_close_device(struct mr_vdev * vdev);
 
-struct mr_vdev *marsio_device_lookup(struct mr_instance *instance, const char *devsym);
+struct mr_vdev * marsio_device_lookup(struct mr_instance * instance, const char * devsym);
 
-int marsio_recv_burst(struct mr_vdev *vdev, queue_id_t qid, marsio_buff_t *mbufs[], int nr_mbufs);
-int marsio_recv_all_burst(struct mr_instance *instance, queue_id_t qid, marsio_buff_t *mbufs[], int nr_mbufs);
-int marsio_send_burst(struct mr_sendpath *sendpath, queue_id_t qid, marsio_buff_t *mbufs[], int nr_mbufs);
-int marsio_send_burst_with_options(
-        struct mr_sendpath *sendpath, queue_id_t sid, marsio_buff_t *mbufs[], int nr_mbufs, uint16_t options);
-void marsio_send_burst_flush(struct mr_sendpath *sendpath, queue_id_t sid);
+int marsio_recv_burst(struct mr_vdev * vdev, queue_id_t qid, marsio_buff_t * mbufs[], int nr_mbufs);
+int marsio_recv_all_burst(struct mr_instance * instance, queue_id_t qid, marsio_buff_t * mbufs[], int nr_mbufs);
+int marsio_send_burst(struct mr_sendpath * sendpath, queue_id_t qid, marsio_buff_t * mbufs[], int nr_mbufs);
+int marsio_send_burst_with_options(struct mr_sendpath * sendpath, queue_id_t sid, marsio_buff_t * mbufs[], int nr_mbufs,
+                                   uint16_t options);
+void marsio_send_burst_flush(struct mr_sendpath * sendpath, queue_id_t sid);
 
-int marsio_udp_header_construct(marsio_buff_t *buff, uint16_t s_port, uint16_t d_port);
-int marsio_ipv4_header_construct(marsio_buff_t *buff, uint32_t s_ip, uint32_t d_ip, uint8_t proto);
+int marsio_udp_header_construct(marsio_buff_t * buff, uint16_t s_port, uint16_t d_port);
+int marsio_ipv4_header_construct(marsio_buff_t * buff, uint32_t s_ip, uint32_t d_ip, uint8_t proto);
 
-struct mr_sendpath *marsio_sendpath_create_by_droute(struct mr_vdev *dest_device, struct in_addr addr);
-struct mr_sendpath *marsio_sendpath_create_by_route(struct mr_instance *instance, struct in_addr addr);
-struct mr_sendpath *marsio_sendpath_create_by_vdev(struct mr_vdev *dest_device);
+struct mr_sendpath * marsio_sendpath_create_by_droute(struct mr_vdev * dest_device, struct in_addr addr);
+struct mr_sendpath * marsio_sendpath_create_by_route(struct mr_instance * instance, struct in_addr addr);
+struct mr_sendpath * marsio_sendpath_create_by_vdev(struct mr_vdev * dest_device);
 
-struct mr_sendpath *marsio_sendpath_create(struct mr_instance *instance, int type, ...);
-int marsio_sendpath_option_set(struct mr_instance *instance, struct mr_sendpath *sendpath, int opt, ...);
-int marsio_sendpath_option_get(struct mr_instance *instance, struct mr_sendpath *sendpath, int opt, ...);
-void marsio_sendpath_destory(struct mr_sendpath *sendpath);
+struct mr_sendpath * marsio_sendpath_create(struct mr_instance * instance, int type, ...);
+int marsio_sendpath_option_set(struct mr_instance * instance, struct mr_sendpath * sendpath, int opt, ...);
+int marsio_sendpath_option_get(struct mr_instance * instance, struct mr_sendpath * sendpath, int opt, ...);
+void marsio_sendpath_destory(struct mr_sendpath * sendpath);
 
-//simply get control zone data ptr.
-void *marsio_buff_ctrlzone(marsio_buff_t *m, uint8_t id);
+// simply get control zone data ptr.
+void * marsio_buff_ctrlzone(marsio_buff_t * m, uint8_t id);
 
-//a safe way to read control zone data.
-void *marsio_buff_ctrlzone_data(marsio_buff_t *m, uint8_t id, uint8_t *size);
+// a safe way to read control zone data.
+void * marsio_buff_ctrlzone_data(marsio_buff_t * m, uint8_t id, uint8_t * size);
 
-//a safe way to set control zone data.
-void marsio_buff_ctrlzone_set(marsio_buff_t *m, uint8_t id, void *ptr_data, uint8_t size);
+// a safe way to set control zone data.
+void marsio_buff_ctrlzone_set(marsio_buff_t * m, uint8_t id, void * ptr_data, uint8_t size);
 
-void marsio_buff_reset(marsio_buff_t *m);
+void marsio_buff_reset(marsio_buff_t * m);
 
-marsio_buff_t *marsio_buff_getnext_seg(marsio_buff_t *m);
-marsio_buff_t *marsio_buff_getnext_pkt(marsio_buff_t *m);
+marsio_buff_t * marsio_buff_getnext_seg(marsio_buff_t * m);
+marsio_buff_t * marsio_buff_getnext_pkt(marsio_buff_t * m);
 
-void marsio_buff_append_pkt(marsio_buff_t *head, marsio_buff_t *next);
-void marsio_buff_append_seg(marsio_buff_t *head, marsio_buff_t *next);
-void marsio_buff_chain_pkt(marsio_buff_t *pkt, marsio_buff_t *next);
+void marsio_buff_append_pkt(marsio_buff_t * head, marsio_buff_t * next);
+void marsio_buff_append_seg(marsio_buff_t * head, marsio_buff_t * next);
+void marsio_buff_chain_pkt(marsio_buff_t * pkt, marsio_buff_t * next);
 
-uint16_t marsio_buff_headroom(const marsio_buff_t *m);
-uint16_t marsio_buff_tailroom(const marsio_buff_t *m);
+uint16_t marsio_buff_headroom(const marsio_buff_t * m);
+uint16_t marsio_buff_tailroom(const marsio_buff_t * m);
 
-marsio_buff_t *marsio_buff_getnext_seg(marsio_buff_t *m);
-marsio_buff_t *marsio_buff_getnext_pkt(marsio_buff_t *m);
+marsio_buff_t * marsio_buff_getnext_seg(marsio_buff_t * m);
+marsio_buff_t * marsio_buff_getnext_pkt(marsio_buff_t * m);
 
-char *marsio_buff_mtod(marsio_buff_t *m);
+char * marsio_buff_mtod(marsio_buff_t * m);
 
-uint32_t marsio_buff_buflen(marsio_buff_t *m);
+uint32_t marsio_buff_buflen(marsio_buff_t * m);
 
-uint32_t marsio_buff_datalen(marsio_buff_t *m);
+uint32_t marsio_buff_datalen(marsio_buff_t * m);
 
-char *marsio_buff_prepend(marsio_buff_t *m, uint16_t len);
+char * marsio_buff_prepend(marsio_buff_t * m, uint16_t len);
 
-char *marsio_buff_append(marsio_buff_t *m, uint16_t len);
+char * marsio_buff_append(marsio_buff_t * m, uint16_t len);
 
-char *marsio_buff_adj(marsio_buff_t *m, uint16_t len);
+char * marsio_buff_adj(marsio_buff_t * m, uint16_t len);
 
-int marsio_buff_trim(marsio_buff_t *m, uint16_t len);
+int marsio_buff_trim(marsio_buff_t * m, uint16_t len);
 
-char *marsio_buff_offset_set(marsio_buff_t *m, off_t offset, int is_relative);
+char * marsio_buff_offset_set(marsio_buff_t * m, off_t offset, int is_relative);
 
-off_t marsio_buff_offset_get(marsio_buff_t *m);
+off_t marsio_buff_offset_get(marsio_buff_t * m);
 
 /* 支持写时复制的报文修改裁剪函数 */
-marsio_buff_t *marsio_buff_prepend_cw(struct mr_instance *instance, marsio_buff_t *m, uint16_t len, void **ptr_out);
+marsio_buff_t * marsio_buff_prepend_cw(struct mr_instance * instance, marsio_buff_t * m, uint16_t len, void ** ptr_out);
 
-marsio_buff_t *marsio_buff_append_cw(struct mr_instance *instance, marsio_buff_t *m, uint16_t len, void **ptr_out);
+marsio_buff_t * marsio_buff_append_cw(struct mr_instance * instance, marsio_buff_t * m, uint16_t len, void ** ptr_out);
 
-marsio_buff_t *marsio_buff_adj_cw(struct mr_instance *instance, marsio_buff_t *m, uint16_t len, void **ptr_out);
+marsio_buff_t * marsio_buff_adj_cw(struct mr_instance * instance, marsio_buff_t * m, uint16_t len, void ** ptr_out);
 
-marsio_buff_t *marsio_buff_trim_cw(struct mr_instance *instance, marsio_buff_t *m, uint16_t len, void **ptr_out);
+marsio_buff_t * marsio_buff_trim_cw(struct mr_instance * instance, marsio_buff_t * m, uint16_t len, void ** ptr_out);
 
-uint16_t marsio_buff_headroom(const marsio_buff_t *m);
+uint16_t marsio_buff_headroom(const marsio_buff_t * m);
 
-uint16_t marsio_buff_tailroom(const marsio_buff_t *m);
+uint16_t marsio_buff_tailroom(const marsio_buff_t * m);
 
-uint32_t marsio_get_pkt_type(marsio_buff_t *m);
+uint32_t marsio_get_pkt_type(marsio_buff_t * m);
 
-void marsio_pktmbuf_dump(FILE *f, const marsio_buff_t *m, unsigned dump_len);
+void marsio_pktmbuf_dump(FILE * f, const marsio_buff_t * m, unsigned dump_len);
 
-marsio_buff_t *marsio_buff_clone_deep(struct mr_instance *instance, marsio_buff_t *md, int socket_id, int thread_id);
+marsio_buff_t * marsio_buff_clone_deep(struct mr_instance * instance, marsio_buff_t * md, int socket_id, int thread_id);
 
-marsio_buff_t *marsio_buff_clone_with_options(
-        struct mr_instance *instance, marsio_buff_t *md, int socket_id, int thread_id, uint16_t options);
+marsio_buff_t * marsio_buff_clone_with_options(struct mr_instance * instance, marsio_buff_t * md, int socket_id,
+                                               int thread_id, uint16_t options);
 
-int marsio_buff_malloc_device(
-        struct mr_vdev *vdev, marsio_buff_t *marsio_buff[], unsigned int nr_mbufs, int socket_id, int thread_id);
+int marsio_buff_malloc_device(struct mr_vdev * vdev, marsio_buff_t * marsio_buff[], unsigned int nr_mbufs,
+                              int socket_id, int thread_id);
 
-int marsio_buff_malloc_global(struct mr_instance *instance, marsio_buff_t *marsio_buff[], unsigned int nr_mbufs,
-        int socket_id, int thread_id);
+int marsio_buff_malloc_global(struct mr_instance * instance, marsio_buff_t * marsio_buff[], unsigned int nr_mbufs,
+                              int socket_id, int thread_id);
 
-void marsio_buff_free(struct mr_instance *instance, marsio_buff_t *marsio_buff[], unsigned int nr_mbufs, int socket_id,
-        int thread_id);
+void marsio_buff_free(struct mr_instance * instance, marsio_buff_t * marsio_buff[], unsigned int nr_mbufs,
+                      int socket_id, int thread_id);
 
-int marsio_buff_is_ctrlbuf(marsio_buff_t *m);
+int marsio_buff_is_ctrlbuf(marsio_buff_t * m);
 
-void marsio_buff_set_ctrlbuf(marsio_buff_t *m);
+void marsio_buff_set_ctrlbuf(marsio_buff_t * m);
 
-uint64_t marsio_buff_get_timestamp(marsio_buff_t *m);
-void marsio_buff_set_timestamp(marsio_buff_t *m, uint64_t timestamp);
-int marsio_buff_get_timestamp_ex(marsio_buff_t *m, enum mr_timestamp_type ts_type, struct timespec *ts);
+marsio_buff_t * marsio_buff_malloc_smartoffload(struct mr_vdev * vdev, const char * pkt, unsigned int pkt_len);
 
-void marsio_buff_set_rehash_index(marsio_buff_t *m, uint32_t hash);
-uint32_t marsio_buff_get_rehash_index(marsio_buff_t *m);
+uint64_t marsio_buff_get_timestamp(marsio_buff_t * m);
+void marsio_buff_set_timestamp(marsio_buff_t * m, uint64_t timestamp);
+int marsio_buff_get_timestamp_ex(marsio_buff_t * m, enum mr_timestamp_type ts_type, struct timespec * ts);
 
-int marsio_buff_get_metadata(marsio_buff_t *m, enum mr_buff_metadata_type type, void *data, unsigned int sz_data);
-int marsio_buff_set_metadata(marsio_buff_t *m, enum mr_buff_metadata_type type, void *data, unsigned int sz_data);
-int marsio_buff_unset_metadata(marsio_buff_t *m, enum mr_buff_metadata_type type);
+void marsio_buff_set_rehash_index(marsio_buff_t * m, uint32_t hash);
+uint32_t marsio_buff_get_rehash_index(marsio_buff_t * m);
 
-void *marsio_shared_mem_alloc(struct mr_instance *instance, size_t len);
-void marsio_shared_mem_free(struct mr_instance *instance, void *mem);
+int marsio_buff_get_metadata(marsio_buff_t * m, enum mr_buff_metadata_type type, void * data, unsigned int sz_data);
+int marsio_buff_set_metadata(marsio_buff_t * m, enum mr_buff_metadata_type type, void * data, unsigned int sz_data);
+int marsio_buff_unset_metadata(marsio_buff_t * m, enum mr_buff_metadata_type type);
+
+void * marsio_shared_mem_alloc(struct mr_instance * instance, size_t len);
+void marsio_shared_mem_free(struct mr_instance * instance, void * mem);
 
 #ifdef __cplusplus
 }