X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fperformance-thread%2Fcommon%2Flthread_api.h;h=e6879ea5ce53778fa887c37038400a0fe49b6adb;hb=f74904ce98e84f48e8f3a96b7ad6b6347c3f44b6;hp=ec976103f949e264a4cc0f72529b3b84cb5af136;hpb=b700090c8cecf30c4bb9ac022cc4f9a44ae959de;p=dpdk.git diff --git a/examples/performance-thread/common/lthread_api.h b/examples/performance-thread/common/lthread_api.h index ec976103f9..e6879ea5ce 100644 --- a/examples/performance-thread/common/lthread_api.h +++ b/examples/performance-thread/common/lthread_api.h @@ -1,64 +1,8 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2015 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - /* - * Some portions of this software may have been derived from the - * https://github.com/halayli/lthread which carrys the following license. - * - * Copyright (C) 2012, Hasan Alayli - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * SPDX-License-Identifier: BSD-3-Clause + * Copyright 2015 Intel Corporation. + * Copyright 2012 Hasan Alayli */ - /** * @file lthread_api.h * @@ -124,6 +68,10 @@ #ifndef LTHREAD_H #define LTHREAD_H +#ifdef __cplusplus +extern "C" { +#endif + #include #include #include @@ -139,7 +87,7 @@ struct lthread_mutex; struct lthread_condattr; struct lthread_mutexattr; -typedef void (*lthread_func_t) (void *); +typedef void *(*lthread_func_t) (void *); /* * Define the size of stack for an lthread @@ -258,12 +206,12 @@ void lthread_run(void); * Creates an lthread and places it in the ready queue on a particular * lcore. * - * If no scheduler exists yet on the curret lcore then one is created. + * If no scheduler exists yet on the current lcore then one is created. * * @param new_lt * Pointer to an lthread pointer that will be initialized * @param lcore - * the lcore the thread should be started on or the current clore + * the lcore the thread should be started on or the current lcore * -1 the current lcore * 0 - LTHREAD_MAX_LCORES any other lcore * @param lthread_func @@ -521,7 +469,7 @@ void /** * Set lthread TLS * - * This function is modelled on pthread_set_sepcific() + * This function is modelled on pthread_set_specific() * It associates a thread-specific value with a key obtained via a previous * call to lthread_key_create(). * Different threads may bind different values to the same key. These values @@ -801,7 +749,7 @@ int lthread_cond_wait(struct lthread_cond *c, uint64_t reserved); * Signal a condition variable * * The function unblocks one thread waiting for the condition variable cond. - * If no threads are waiting on cond, the rte_lthead_cond_signal() function + * If no threads are waiting on cond, the rte_lthread_cond_signal() function * has no effect. * * @param cond @@ -817,7 +765,7 @@ int lthread_cond_signal(struct lthread_cond *c); * Broadcast a condition variable * * The function unblocks all threads waiting for the condition variable cond. - * If no threads are waiting on cond, the rte_lthead_cond_broadcast() + * If no threads are waiting on cond, the rte_lathed_cond_broadcast() * function has no effect. * * @param cond @@ -829,4 +777,8 @@ int lthread_cond_signal(struct lthread_cond *c); */ int lthread_cond_broadcast(struct lthread_cond *c); +#ifdef __cplusplus +} +#endif + #endif /* LTHREAD_H */