Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add interfaces to dynamically change symbol tables used by posix_spawn, execv, and execl. This is needed for testing.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5506 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2013-01-10 20:00:08 +00:00
parent b7369de8e4
commit 2aa149a02d
6 changed files with 207 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libc/unistd/Make.defs
+1 -1
View File
@@ -43,7 +43,7 @@ CSRCS += lib_chdir.c lib_getcwd.c
endif
ifeq ($(CONFIG_LIBC_EXECFUNCS),y)
CSRCS += lib_execl.c lib_execv.c
CSRCS += lib_execl.c lib_execv.c lib_execsymtab.c
endif
endif
libc/unistd/lib_execsymtab.c
+147
View File
@@ -0,0 +1,147 @@
/****************************************************************************
* libc/unistd/lib_execsymtab.c
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* 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.
* 3. Neither the name NuttX 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.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <assert.h>
#include <nuttx/arch.h>
#include <nuttx/binfmt/symtab.h>
#ifdef CONFIG_LIBC_EXECFUNCS
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* If CONFIG_LIBC_EXECFUNCS is defined in the configuration, then the
* following must also be defined:
*/
/* Symbol table used by exec[l|v] */
#ifndef CONFIG_EXECFUNCS_SYMTAB
# error "CONFIG_EXECFUNCS_SYMTAB must be defined"
#endif
/* Number of Symbols in the Table */
#ifndef CONFIG_EXECFUNCS_NSYMBOLS
# error "CONFIG_EXECFUNCS_NSYMBOLS must be defined"
#endif
/****************************************************************************
* Public Variables
****************************************************************************/
extern struct symtab_s CONFIG_EXECFUNCS_SYMTAB;
/****************************************************************************
* Private Data
****************************************************************************/
static FAR struct symtab_s *g_exec_symtab = &CONFIG_EXECFUNCS_SYMTAB;
static int g_exec_nsymbols = CONFIG_EXECFUNCS_NSYMBOLS;
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: exec_getsymtab
*
* Description:
* Get the current symbol table selection as an atomic operation.
*
* Input Parameters:
* symtab - The location to store the symbol table.
* nsymbols - The location to store the number of symbols in the symbol table.
*
* Returned Value:
* None
*
****************************************************************************/
void exec_getsymtab(FAR struct symtab_s **symtab, FAR int *nsymbols)
{
irqstate_t flags;
DEBUGASSERT(symtab && nsymbols);
/* Disable interrupts very briefly so that both the symbol table and its
* size are returned as a single atomic operation.
*/
flags = irqsave();
*symtab = g_exec_symtab;
*nsymbols = g_exec_nsymbols;
irqrestore(flags);
}
/****************************************************************************
* Name: exec_setsymtab
*
* Description:
* Select a new symbol table selection as an atomic operation.
*
* Input Parameters:
* symtab - The new symbol table.
* nsymbols - The number of symbols in the symbol table.
*
* Returned Value:
* None
*
****************************************************************************/
void exec_setsymtab(FAR const struct symtab_s *symtab, int nsymbols)
{
irqstate_t flags;
DEBUGASSERT(symtab);
/* Disable interrupts very briefly so that both the symbol table and its
* size are set as a single atomic operation.
*/
flags = irqsave();
g_exec_symtab = symtab;
g_exec_nsymbols = nsymbols;
irqrestore(flags);
}
#endif /* CONFIG_LIBC_EXECFUNCS */
libc/unistd/lib_execv.c
+7 -24
View File
@@ -51,27 +51,6 @@
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* If CONFIG_LIBC_EXECFUNCS is defined in the configuration, then the
* following must also be defined:
*/
/* Symbol table used by exec[l|v] */
#ifndef CONFIG_EXECFUNCS_SYMTAB
# error "CONFIG_EXECFUNCS_SYMTAB must be defined"
#endif
/* Number of Symbols in the Table */
#ifndef CONFIG_EXECFUNCS_NSYMBOLS
# error "CONFIG_EXECFUNCS_NSYMBOLS must be defined"
#endif
/****************************************************************************
* Public Variables
****************************************************************************/
extern struct symtab_s CONFIG_EXECFUNCS_SYMTAB;
/****************************************************************************
* Private Variables
@@ -140,13 +119,17 @@ extern struct symtab_s CONFIG_EXECFUNCS_SYMTAB;
int execv(FAR const char *path, FAR char *const argv[])
{
FAR struct symtab_s *symtab;
int nsymbols;
int ret;
/* Get the current symbol table selection */
exec_getsymtab(&symtab, &nsymbols);
/* Start the task */
ret = exec(path, (FAR const char **)argv,
&CONFIG_EXECFUNCS_SYMTAB, CONFIG_EXECFUNCS_NSYMBOLS);
ret = exec(path, (FAR const char **)argv, symtab, nsymbols);
if (ret < 0)
{
sdbg("exec failed: %d\n", errno);