* limitations under the License.
*/
+#define _GNU_SOURCE
+#include <pthread.h>
+#include <sched.h>
+
#include <vppinfra/cpu.h>
#include <vlib/vlib.h>
#include <vlib/unix/unix.h>
uword main_heap_size = (1ULL << 30);
u8 *sizep;
u32 size;
+ int main_core = 1;
+ cpu_set_t cpuset;
#if __x86_64__
CLIB_UNUSED (const char *msg)
else if (*sizep == 'm' || *sizep == 'M')
main_heap_size <<= 20;
}
+ else if (!strncmp (argv[i], "main-core", 9))
+ {
+ if (i < (argc - 1))
+ {
+ errno = 0;
+ unsigned long x = strtol (argv[++i], 0, 0);
+ if (errno == 0)
+ main_core = x;
+ }
+ }
}
defaulted:
+ /* set process affinity for main thread */
+ CPU_ZERO (&cpuset);
+ CPU_SET (main_core, &cpuset);
+ pthread_setaffinity_np (pthread_self (), sizeof (cpu_set_t), &cpuset);
+
/* Set up the plugin message ID allocator right now... */
vl_msg_api_set_first_available_msg_id (VL_MSG_FIRST_AVAILABLE);
/* Allocate main heap */
- if (clib_mem_init (0, main_heap_size))
+ if (clib_mem_init_thread_safe (0, main_heap_size))
{
vm->init_functions_called = hash_create (0, /* value bytes */ 0);
vpe_main_init (vm);
* messages!
*/
-#if CLIB_DEBUG > 0
-
-static clib_error_t *
-test_crash_command_fn (vlib_main_t * vm,
- unformat_input_t * input, vlib_cli_command_t * cmd)
-{
- u64 *p = (u64 *) 0xdefec8ed;
-
- ELOG_TYPE_DECLARE (e) =
- {
- .format = "deliberate crash: touching %x",.format_args = "i4",};
-
- elog (&vm->elog_main, &e, 0xdefec8ed);
-
- *p = 0xdeadbeef;
-
- /* Not so much... */
- return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (test_crash_command, static) = {
- .path = "test crash",
- .short_help = "crash the bus!",
- .function = test_crash_command_fn,
-};
-/* *INDENT-ON* */
-
-#endif
-
/*
* fd.io coding-style-patch-verification: ON
*