From cb034b9b374927c7552e36dcbc306d8456b2a0cb Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Wed, 28 Dec 2016 18:38:59 +0100 Subject: Move java,lua api and remaining plugins to src/ Change-Id: I1c3b87e886603678368428ae56a6bd3327cbc90d Signed-off-by: Damjan Marion --- src/examples/sample-plugin/sample/sample.h | 40 ++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 src/examples/sample-plugin/sample/sample.h (limited to 'src/examples/sample-plugin/sample/sample.h') diff --git a/src/examples/sample-plugin/sample/sample.h b/src/examples/sample-plugin/sample/sample.h new file mode 100644 index 00000000..d268d482 --- /dev/null +++ b/src/examples/sample-plugin/sample/sample.h @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2015 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef __included_sample_h__ +#define __included_sample_h__ + +#include +#include +#include + +#include +#include +#include + +typedef struct { + /* API message ID base */ + u16 msg_id_base; + + /* convenience */ + vlib_main_t * vlib_main; + vnet_main_t * vnet_main; + ethernet_main_t * ethernet_main; +} sample_main_t; + +sample_main_t sample_main; + +vlib_node_registration_t sample_node; + +#endif /* __included_sample_h__ */ -- cgit 1.2.3-korg From a18c7c0d5c117aab65b2be1facd646ec393a1a80 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Tue, 17 Jan 2017 22:38:58 +0100 Subject: sample-plugin: fix build Change-Id: I8a2c91c4148981db31317ef9d2c5c2c28942daa9 Signed-off-by: Damjan Marion --- src/examples/sample-plugin/Makefile.am | 2 +- src/examples/sample-plugin/sample/sample.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/examples/sample-plugin/sample/sample.h') diff --git a/src/examples/sample-plugin/Makefile.am b/src/examples/sample-plugin/Makefile.am index e221f8c1..47642055 100644 --- a/src/examples/sample-plugin/Makefile.am +++ b/src/examples/sample-plugin/Makefile.am @@ -41,7 +41,7 @@ SUFFIXES = .api.h .api | vppapigen --input - --json $@ apidir = $(prefix)/sample/ -api_DATA = sample.api.json +api_DATA = sample/sample.api.json noinst_HEADERS = \ sample/sample_all_api_h.h \ diff --git a/src/examples/sample-plugin/sample/sample.h b/src/examples/sample-plugin/sample/sample.h index d268d482..6137ffff 100644 --- a/src/examples/sample-plugin/sample/sample.h +++ b/src/examples/sample-plugin/sample/sample.h @@ -35,6 +35,6 @@ typedef struct { sample_main_t sample_main; -vlib_node_registration_t sample_node; +extern vlib_node_registration_t sample_node; #endif /* __included_sample_h__ */ -- cgit 1.2.3-korg From a4cb12b30d51be3463315688179297404783fe8d Mon Sep 17 00:00:00 2001 From: Anlu Yan Date: Tue, 14 Feb 2017 18:07:40 -0800 Subject: Fix sample plugin breakage. Add vat_helper_macros.h to be installed in /usr/include/vlibapi Define a version for the sample plugin (separate from the VPP versioning). Hook up vnet_main in plugin init. Change-Id: I293b9dc824d0813ea2bb8747d535e4210a88b385 Signed-off-by: Anlu Yan --- src/examples/sample-plugin/sample/sample.c | 27 +++++++-------------------- src/examples/sample-plugin/sample/sample.h | 4 ++-- src/vlib-api.am | 2 +- 3 files changed, 10 insertions(+), 23 deletions(-) (limited to 'src/examples/sample-plugin/sample/sample.h') diff --git a/src/examples/sample-plugin/sample/sample.c b/src/examples/sample-plugin/sample/sample.c index 603cb2d0..7588dbc0 100644 --- a/src/examples/sample-plugin/sample/sample.c +++ b/src/examples/sample-plugin/sample/sample.c @@ -79,26 +79,11 @@ do { \ #define foreach_sample_plugin_api_msg \ _(SAMPLE_MACSWAP_ENABLE_DISABLE, sample_macswap_enable_disable) -/* - * This routine exists to convince the vlib plugin framework that - * we haven't accidentally copied a random .dll into the plugin directory. - * - * Also collects global variable pointers passed from the vpp engine - */ - -clib_error_t * -vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h, - int from_early_init) -{ - sample_main_t * sm = &sample_main; - clib_error_t * error = 0; - - sm->vlib_main = vm; - sm->vnet_main = h->vnet_main; - sm->ethernet_main = h->ethernet_main; - - return error; -} +/* *INDENT-OFF* */ +VLIB_PLUGIN_REGISTER () = { + .version = SAMPLE_PLUGIN_BUILD_VER, +}; +/* *INDENT-ON* */ /* Action function shared between message handler and debug CLI */ @@ -229,6 +214,8 @@ static clib_error_t * sample_init (vlib_main_t * vm) clib_error_t * error = 0; u8 * name; + sm->vnet_main = vnet_get_main (); + name = format (0, "sample_%08x%c", api_version, 0); /* Ask for a correctly-sized block of API message decode slots */ diff --git a/src/examples/sample-plugin/sample/sample.h b/src/examples/sample-plugin/sample/sample.h index 6137ffff..c9778f74 100644 --- a/src/examples/sample-plugin/sample/sample.h +++ b/src/examples/sample-plugin/sample/sample.h @@ -28,13 +28,13 @@ typedef struct { u16 msg_id_base; /* convenience */ - vlib_main_t * vlib_main; vnet_main_t * vnet_main; - ethernet_main_t * ethernet_main; } sample_main_t; sample_main_t sample_main; extern vlib_node_registration_t sample_node; +#define SAMPLE_PLUGIN_BUILD_VER "1.0" + #endif /* __included_sample_h__ */ diff --git a/src/vlib-api.am b/src/vlib-api.am index 6312f93d..c05929b1 100644 --- a/src/vlib-api.am +++ b/src/vlib-api.am @@ -34,7 +34,7 @@ libvlibapi_la_SOURCES = \ vlibapi/api_shared.c \ vlibapi/node_serialize.c -nobase_include_HEADERS += vlibapi/api.h vlibapi/api_helper_macros.h +nobase_include_HEADERS += vlibapi/api.h vlibapi/api_helper_macros.h vlibapi/vat_helper_macros.h libvlibmemoryclient_la_DEPENDENCIES = libvppinfra.la libsvm.la libvlib.la libvlibmemory.la libvlibapi.la libvlibmemoryclient_la_LIBADD = $(libvlibmemoryclient_la_DEPENDENCIES) -lpthread -- cgit 1.2.3-korg