Compare commits
33 Commits
libnode-2_
...
libnode-2_
| Author | SHA1 | Date | |
|---|---|---|---|
|
7afac7d349 | ||
|
|
e1409ab6d8 | ||
|
|
702c0f117d | ||
|
|
0d4b1d3125 | ||
|
|
ec7a688881 | ||
|
|
90eb853801 | ||
|
|
8cfdf696d1 | ||
|
|
986c67d2fc | ||
|
|
b7ce3250e1 | ||
|
|
6a6ae07870 | ||
|
|
b477d4b154 | ||
|
|
334f0cbeb1 | ||
|
|
676814b6cf | ||
|
|
f7c1f8bc5f | ||
|
|
652ab987a4 | ||
|
|
0431691352 | ||
|
|
3ad6e01702 | ||
|
|
4bf44a1fff | ||
|
|
aa69e7e7b1 | ||
|
|
29f7064ed0 | ||
|
|
97d57e391f | ||
|
|
d1778a5431 | ||
|
|
416ee6de00 | ||
|
|
8c1000401d | ||
|
|
11f4f585b3 | ||
|
|
0990ad102d | ||
|
|
da9d517e9a | ||
|
|
d50da065a6 | ||
|
|
f8f96b1ec8 | ||
|
|
b49d497bfb | ||
|
|
80665f9931 | ||
|
|
1d9539466d | ||
|
|
3ce278d6e5 |
@@ -1,7 +1,7 @@
|
||||
# $RCSfile: Makefile.rule,v $
|
||||
# $Revision: 1.4 $
|
||||
# $Revision: 1.5 $
|
||||
# $Name: $
|
||||
# $Date: 2003/07/16 23:37:37 $
|
||||
# $Date: 2010/06/06 21:28:14 $
|
||||
# $Author: agibert $
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
@@ -20,7 +20,7 @@ default:all
|
||||
# Here are all the rules allowing to compile sources files
|
||||
# c -> o
|
||||
%.o:%.c
|
||||
$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
|
||||
$(CC) $(CFLAGS) $(INCLUDE) -fPIC -c $< -o $@
|
||||
|
||||
# c -> executable
|
||||
.c :
|
||||
|
||||
12
Makefile.var
12
Makefile.var
@@ -1,7 +1,7 @@
|
||||
# $RCSfile: Makefile.var,v $
|
||||
# $Revision: 1.2 $
|
||||
# $Revision: 1.4 $
|
||||
# $Name: $
|
||||
# $Date: 2003/07/16 22:55:51 $
|
||||
# $Date: 2005/01/19 23:30:05 $
|
||||
# $Author: agibert $
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
@@ -11,7 +11,13 @@
|
||||
|
||||
|
||||
PROG_NAME=libnode
|
||||
PROG_VERSION_NAME=libnode-2.0.5-1
|
||||
PROG_TAG=$Name: $
|
||||
|
||||
ifeq ($(words $(PROG_TAG)),2)
|
||||
PROG_VERSION_NAME=$(subst _,.,$(word 2, $(PROG_TAG)))
|
||||
else
|
||||
PROG_VERSION_NAME=$(PROG_NAME)
|
||||
endif
|
||||
|
||||
CC=/usr/bin/gcc
|
||||
AR=/usr/bin/ar
|
||||
|
||||
14
ReadMe.txt
14
ReadMe.txt
@@ -1,27 +1,27 @@
|
||||
# $RCSfile: ReadMe.txt,v $
|
||||
# $Revision: 2.6 $
|
||||
# $Revision: 2.10 $
|
||||
# $Name: $
|
||||
# $Date: 2003/07/27 23:10:55 $
|
||||
# $Date: 2010/06/06 21:38:28 $
|
||||
# $Author: agibert $
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Welcome to LibNode 2.0.x !
|
||||
Welcome to LibNode 2.2.x !
|
||||
|
||||
|
||||
|
||||
This release of LibNode supports the following OS:
|
||||
- Linux 2.2.X and 2.4.x (tested on RedHat & Mandrake),
|
||||
- Linux 2.2.x, 2.4.x and 2.6.x (tested on RedHat & Mandriva),
|
||||
- Solaris 2.6,
|
||||
- Windows NT4 & 2000.
|
||||
- Windows NT4, 2000 and XP.
|
||||
|
||||
|
||||
|
||||
The support of LibVer is now optional (To enable it, use: make _LIBVER_SUPPORT=1 all).
|
||||
|
||||
LibShm and LibDataStr are no more supported.
|
||||
LibNode support LibShMem 2.0.0 and LibDataStr 2.0.0 !
|
||||
|
||||
|
||||
|
||||
@@ -41,4 +41,4 @@ Enjoy it!
|
||||
Your LibNode Team.
|
||||
|
||||
arnaud@rx3.net
|
||||
http://www.rx3.org/dvp/libnode
|
||||
http://www.rx3.org/dvp/?dvp=libnode
|
||||
|
||||
@@ -1,13 +1,52 @@
|
||||
# $RCSfile: ReleaseNotes.txt,v $
|
||||
# $Revision: 2.16 $
|
||||
# $Revision: 2.22 $
|
||||
# $Name: $
|
||||
# $Date: 2004/08/24 20:30:23 $
|
||||
# $Date: 2010/06/06 21:30:59 $
|
||||
# $Author: agibert $
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
LibNode V 2.2.0-1 - A. Gibert - 06/06/10
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
All: Add support C99 va_arg for curent gcc (4.4.1),
|
||||
Add -fPIC flag in .c to .o makefile rule,
|
||||
LibNode: Add ND_VA_* macros to help manager varargs,
|
||||
Update Managers to use ND_VA_* macros,
|
||||
Improve LibShMem support by restricting OpenStruct tracking on local DataStruct (Manager_Ptr != NULL),
|
||||
Add example manager template in public node.h file,
|
||||
NDDemo0: Add LibNode 2.2 support: Use ND_VA_* macros in manager,
|
||||
NDBench: Add LibNode 2.2 support: Use ND_VA_* macros in manager.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
LibNode V 2.1.0-1 - A. Gibert - 24/01/05
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
All: This new LibNode branch (2.1.x) should support the forthcoming new LibShMem branch (2.0.x),
|
||||
LibNode: Add symbol lookup support for manager, allocator and desallocator functions call,
|
||||
New Allocator and desallocator API interace,
|
||||
Code cleanup,
|
||||
NDBench: DS_Open now support an arg in order to use or not symbol lookup,
|
||||
Add test-*-s.ndb batch files witch use symbol lookup.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
LibNode V 2.0.7-1 - A. Gibert - 20/01/05
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
All: Add to Makefile.var auto version label detection from CVS Tag.
|
||||
This should be the final release of the 2.0 branch,
|
||||
This new release is developped for the MICOT/Target project (Banque de France - Paris).
|
||||
LibNode: Minor bug fixes in ND_*_Info_Print() functions and ND_Library_StdErr_Set alias defines.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
LibNode V 2.0.6-1 - A. Gibert - 24/08/04
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
9
ToDo.txt
9
ToDo.txt
@@ -1,15 +1,14 @@
|
||||
# $RCSfile: ToDo.txt,v $
|
||||
# $Revision: 2.3 $
|
||||
# $Revision: 2.5 $
|
||||
# $Name: $
|
||||
# $Date: 2003/07/27 23:14:10 $
|
||||
# $Date: 2005/01/24 01:19:50 $
|
||||
# $Author: agibert $
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
- Check LibShMem/LibDataStr support (via symbol lookup support),
|
||||
- Add Cache Value option,
|
||||
- More debug !
|
||||
- New English documentation (man/tex),
|
||||
- Improve API consitency,
|
||||
- Re-enable LibShm/LibDataStr support (via NDT_DataStruct implementation).
|
||||
- Improve API consitency.
|
||||
|
||||
@@ -10,12 +10,13 @@ include ../Makefile.rule
|
||||
|
||||
|
||||
|
||||
DEP_STATIC = ../lib/libnode.a
|
||||
DEP_DYNAMIC = ../lib/libnode.so
|
||||
INCLUDE = -I . -I ../include
|
||||
LIBDIR = -L . -L ../lib
|
||||
LIB_STATIC = ../lib/libnode.a
|
||||
LIB_DYNAMIC = -lnode
|
||||
DEP_STATIC += ../lib/libnode.a
|
||||
DEP_DYNAMIC += ../lib/libnode.so
|
||||
INCLUDE += -I . -I ../include
|
||||
LIBDIR += -L . -L ../lib
|
||||
LIB_STATIC += ../lib/libnode.a -ldl
|
||||
LIB_DYNAMIC += -lnode -ldl
|
||||
CFLAGS += -rdynamic
|
||||
|
||||
ifdef _LIBVER_SUPPORT
|
||||
DEP_STATIC += ../../libver/ver.h ../../libver/libver.a
|
||||
@@ -27,11 +28,11 @@ ifdef _LIBVER_SUPPORT
|
||||
LIB_STATIC += ../../libver/lib/libver.a
|
||||
LIB_DYNAMIC += -lver
|
||||
else
|
||||
LIB_STATIC += -ldl ../../libver/lib/libver.a
|
||||
LIB_DYNAMIC += -ldl -lver
|
||||
LIB_STATIC += ../../libver/lib/libver.a
|
||||
LIB_DYNAMIC += -lver
|
||||
endif
|
||||
|
||||
CFLAGS += -D_LIBVER_SUPPORT -rdynamic
|
||||
CFLAGS += -D_LIBVER_SUPPORT
|
||||
endif
|
||||
|
||||
ND_CHECK_FLAGS = -DND_MODE=0
|
||||
|
||||
165
demo/nddemo0.c
165
demo/nddemo0.c
@@ -1,9 +1,9 @@
|
||||
/*---------------------------------------------------------------------------------*/
|
||||
/* $RCSfile: nddemo0.c,v $ */
|
||||
/*---------------------------------------------------------------------------------*/
|
||||
/* $Revision: 2.8 $ */
|
||||
/* $Revision: 2.9 $ */
|
||||
/* $Name: $ */
|
||||
/* $Date: 2004/08/23 22:48:37 $ */
|
||||
/* $Date: 2010/06/06 21:27:12 $ */
|
||||
/* $Author: agibert $ */
|
||||
/*---------------------------------------------------------------------------------*/
|
||||
|
||||
@@ -64,7 +64,7 @@ typedef struct Demo_Value
|
||||
/* Prototypes */
|
||||
/*---------------------------------------------------------------------------------*/
|
||||
|
||||
NDT_Status Demo_DS_Manager( NDT_Root *, NDT_Index_Id, NDT_Node *, NDT_Command, va_list);
|
||||
NDT_Status Demo_DS_Manager( NDT_Root *, NDT_Index_Id, NDT_Node *, NDT_Command, va_list *);
|
||||
void DataStruct_Load( NDT_Root *, FILE *);
|
||||
void DataStruct_Load( NDT_Root *, FILE *);
|
||||
void Demo( char *, short);
|
||||
@@ -80,7 +80,7 @@ int main( int, char **);
|
||||
/* */
|
||||
/*---------------------------------------------------------------------------------*/
|
||||
|
||||
NDT_Status Demo_DS_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Node *Node_Ptr, NDT_Command Command, va_list Args)
|
||||
NDT_Status Demo_DS_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Node *Node_Ptr, NDT_Command Command, va_list *Args_Ptr)
|
||||
{
|
||||
NDT_Command_Name Command_Name;
|
||||
|
||||
@@ -89,12 +89,12 @@ NDT_Status Demo_DS_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_No
|
||||
{
|
||||
case NDD_CMD_MANAGER_VERSION:
|
||||
{
|
||||
NDT_Version_Name *Version_Name_Ptr = (NDT_Version_Name *)va_arg( Args, NDT_Version_Name *);
|
||||
ND_VA_ARG_GET( Version_Name_Ptr, *Args_Ptr, NDT_Version_Name *);
|
||||
|
||||
|
||||
Command_Name = "NDD_CMD_MANAGER_VERSION";
|
||||
|
||||
*Version_Name_Ptr = "$Revision: 2.8 $ $Name: $ $Date: 2004/08/23 22:48:37 $ $Author: agibert $";
|
||||
*Version_Name_Ptr = "$Revision: 2.9 $ $Name: $ $Date: 2010/06/06 21:27:12 $ $Author: agibert $";
|
||||
|
||||
return( NDS_OK);
|
||||
}
|
||||
@@ -102,15 +102,15 @@ NDT_Status Demo_DS_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_No
|
||||
case NDD_CMD_INDEX_GET:
|
||||
{
|
||||
/*
|
||||
NDT_Index_Id *Reply_Index_Id_Ptr = (NDT_Index_Id *)va_arg( Args, NDT_Index_Id *);
|
||||
NDT_Command *Reply_Command_Ptr = (NDT_Command *)va_arg( Args, NDT_Command *);
|
||||
NDT_Command Cmd = (NDT_Command)va_arg( Args, NDT_Command);
|
||||
void *Value_ptr = (void *)va_arg( Args, void *);
|
||||
ND_VA_ARG_GET( Reply_Index_Id_Ptr, *Args_Ptr, NDT_Index_Id *);
|
||||
ND_VA_ARG_GET( Reply_Command_Ptr, *Args_Ptr, NDT_Command *);
|
||||
ND_VA_ARG_GET( Cmd, *Args_Ptr, NDT_Command);
|
||||
ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *);
|
||||
*/
|
||||
NDT_Index_Id *Reply_Index_Id_Ptr = (NDT_Index_Id *)va_arg( Args, NDT_Index_Id *);
|
||||
NDT_Command *Reply_Command_Ptr = (NDT_Command *)va_arg( Args, NDT_Command *);
|
||||
NDT_Command Cmd = (NDT_Command)va_arg( Args, NDT_Command);
|
||||
Demo_Value *Value_ptr = (Demo_Value *)va_arg( Args, Demo_Value *);
|
||||
ND_VA_ARG_GET( Reply_Index_Id_Ptr, *Args_Ptr, NDT_Index_Id *);
|
||||
ND_VA_ARG_GET( Reply_Command_Ptr, *Args_Ptr, NDT_Command *);
|
||||
ND_VA_ARG_GET( Cmd, *Args_Ptr, NDT_Command);
|
||||
ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, Demo_Value *);
|
||||
|
||||
|
||||
Command_Name = "NDD_CMD_INDEX_GET";
|
||||
@@ -159,12 +159,15 @@ NDT_Status Demo_DS_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_No
|
||||
case NDD_CMD_VALUE_ALLOC:
|
||||
{
|
||||
/*
|
||||
void **Value_Ptr_Ptr = (void **)va_arg( Args, void **);
|
||||
va_list user_args = (va_list)va_arg( Args, va_list);
|
||||
user_type user_data = (user_type)va_arg( user_args, user_type);
|
||||
... = (...)va_arg( user_args, ...);
|
||||
ND_VA_ARG_GET( Value_Ptr_Ptr, *Args_Ptr, void **);
|
||||
|
||||
ND_VA_LIST_OPEN( user_args, *Args_Ptr);
|
||||
ND_VA_ARG_GET( user_data, user_args, user_type);
|
||||
ND_VA_ARG_GET( ..., user_args, ...);
|
||||
|
||||
ND_VA_LIST_CLOSE( user_args);
|
||||
*/
|
||||
Demo_Value **Value_Ptr_Ptr = va_arg( Args, Demo_Value **);
|
||||
ND_VA_ARG_GET( Value_Ptr_Ptr, *Args_Ptr, Demo_Value **);
|
||||
|
||||
|
||||
Command_Name = "NDD_CMD_VALUE_ALLOC";
|
||||
@@ -187,12 +190,15 @@ NDT_Status Demo_DS_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_No
|
||||
case NDD_CMD_VALUE_FREE:
|
||||
{
|
||||
/*
|
||||
void *Value_Ptr = (void *)va_arg( Args, void *);
|
||||
va_list user_args = (va_list)va_arg( Args, va_list);
|
||||
user_type user_data = (user_type)va_arg( user_args, user_type);
|
||||
... = (...)va_arg( user_args, ...);
|
||||
ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *);
|
||||
|
||||
ND_VA_LIST_OPEN( user_args, *Args_Ptr);
|
||||
ND_VA_ARG_GET( user_data, user_args, user_type);
|
||||
ND_VA_ARG_GET( ..., user_args, ...);
|
||||
|
||||
ND_VA_LIST_CLOSE( user_args);
|
||||
*/
|
||||
Demo_Value *Value_Ptr = (Demo_Value *)va_arg( Args, Demo_Value *);
|
||||
ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, Demo_Value *);
|
||||
|
||||
|
||||
Command_Name = "NDD_CMD_VALUE_FREE";
|
||||
@@ -205,14 +211,17 @@ NDT_Status Demo_DS_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_No
|
||||
case NDD_CMD_VALUE_COMP:
|
||||
{
|
||||
/*
|
||||
void *Value1_Ptr = (void *)va_arg( Args, void *);
|
||||
void *Value2_Ptr = (void *)va_arg( Args, void *);
|
||||
va_list user_args = (va_list)va_arg( Args, va_list);
|
||||
user_type user_data = (user_type)va_arg( user_args, user_type);
|
||||
... = (...)va_arg( user_args, ...);
|
||||
ND_VA_ARG_GET( Value1_Ptr, *Args_Ptr, void *);
|
||||
ND_VA_ARG_GET( Value2_Ptr, *Args_Ptr, void *);
|
||||
|
||||
ND_VA_LIST_OPEN( user_args, *Args_Ptr);
|
||||
ND_VA_ARG_GET( user_data, user_args, user_type);
|
||||
ND_VA_ARG_GET( ..., user_args, ...);
|
||||
|
||||
ND_VA_LIST_CLOSE( user_args);
|
||||
*/
|
||||
Demo_Value *Value1_Ptr = va_arg( Args, Demo_Value *);
|
||||
Demo_Value *Value2_Ptr = va_arg( Args, Demo_Value *);
|
||||
ND_VA_ARG_GET( Value1_Ptr, *Args_Ptr, Demo_Value *);
|
||||
ND_VA_ARG_GET( Value2_Ptr, *Args_Ptr, Demo_Value *);
|
||||
|
||||
|
||||
Command_Name = "NDD_CMD_VALUE_COMP";
|
||||
@@ -302,12 +311,17 @@ NDT_Status Demo_DS_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_No
|
||||
case NDD_CMD_VALUE_ADD:
|
||||
{
|
||||
/*
|
||||
void *Value_Ptr = (void *)va_arg( Args, void *);
|
||||
va_list user_args = (va_list)va_arg( Args, va_list);
|
||||
user_type user_data = (user_type)va_arg( user_args, user_type);
|
||||
... = (...)va_arg( user_args, ...);
|
||||
ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *);
|
||||
|
||||
ND_VA_LIST_OPEN( user_args, *Args_Ptr);
|
||||
|
||||
ND_VA_ARG_GET( user_data, user_args, user_type);
|
||||
ND_VA_ARG_GET( ..., user_args, ...);
|
||||
|
||||
ND_VA_LIST_CLOSE( user_args);
|
||||
*/
|
||||
|
||||
|
||||
Command_Name = "NDD_CMD_VALUE_ADD";
|
||||
|
||||
return( NDS_OK);
|
||||
@@ -316,36 +330,54 @@ NDT_Status Demo_DS_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_No
|
||||
case NDD_CMD_VALUE_REMOVE:
|
||||
{
|
||||
/*
|
||||
void *Value_Ptr = (void *)va_arg( Args, void *);
|
||||
va_list user_args = (va_list)va_arg( Args, va_list);
|
||||
user_type user_data = (user_type)va_arg( user_args, user_type);
|
||||
... = (...)va_arg( user_args, ...);
|
||||
ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *);
|
||||
|
||||
ND_VA_LIST_OPEN( user_args, *Args_Ptr);
|
||||
|
||||
ND_VA_ARG_GET( user_data, user_args, user_type);
|
||||
ND_VA_ARG_GET( ..., user_args, ...);
|
||||
|
||||
ND_VA_LIST_CLOSE( user_args);
|
||||
*/
|
||||
|
||||
|
||||
Command_Name = "NDD_CMD_VALUE_REMOVE";
|
||||
|
||||
return( NDS_OK);
|
||||
}
|
||||
|
||||
|
||||
case NDD_CMD_VALUE_PRINT:
|
||||
{
|
||||
/*
|
||||
NDT_Node *Next_Node_Ptr = (NDT_Node *)va_arg( Args, NDT_Node *);
|
||||
va_list lib_args = (va_list)va_arg( Args, va_list);
|
||||
FILE *Out = (FILE *)va_arg( lib_args, FILE *);
|
||||
NDT_Recursive_Mode Recursive_Mode = (NDT_Recursive_Mode)va_arg( lib_args, NDT_Recursive_Mode);
|
||||
NDT_Recursive_Depth Recursive_Depth = (NDT_Recursive_Depth)va_arg( lib_args, NDT_Recursive_Depth);
|
||||
va_list user_args = (va_list)va_arg( lib_args, va_list);
|
||||
user_type user_data = (user_type)va_arg( user_args, user_type);
|
||||
... = (...)va_arg( user_args, ...);
|
||||
ND_VA_ARG_GET( Next_Node_Ptr, *Args_Ptr, NDT_Node *);
|
||||
|
||||
void *Value_Ptr = Node_Ptr->Value;
|
||||
ND_VA_LIST_OPEN( lib_args, *Args_Ptr);
|
||||
|
||||
ND_VA_ARG_GET( Out, lib_args, FILE *);
|
||||
ND_VA_ARG_GET( Recursive_Mode, lib_args, NDT_Recursive_Mode);
|
||||
ND_VA_ARG_GET( Recursive_Depth, lib_args, NDT_Recursive_Depth);
|
||||
ND_VA_ARG_GET( Recursive_Offset, lib_args, NDT_Recursive_Offset);
|
||||
|
||||
ND_VA_LIST_OPEN( user_args, lib_args);
|
||||
|
||||
ND_VA_ARG_GET( user_data, user_args, user_type);
|
||||
ND_VA_ARG_GET( ..., user_args, ...);
|
||||
|
||||
ND_VA_LIST_CLOSE( user_args);
|
||||
ND_VA_LIST_CLOSE( lib_args);
|
||||
*/
|
||||
NDT_Node *Next_Node_Ptr = (NDT_Node *)va_arg( Args, NDT_Node *);
|
||||
va_list lib_args = (va_list)va_arg( Args, va_list);
|
||||
FILE *Out = (FILE *)va_arg( lib_args, FILE *);
|
||||
NDT_Recursive_Mode Recursive_Mode = (NDT_Recursive_Mode)va_arg( lib_args, NDT_Recursive_Mode);
|
||||
NDT_Recursive_Depth Recursive_Depth = (NDT_Recursive_Depth)va_arg( lib_args, NDT_Recursive_Depth);
|
||||
ND_VA_ARG_GET( Next_Node_Ptr, *Args_Ptr, NDT_Node *);
|
||||
|
||||
ND_VA_LIST_OPEN( lib_args, *Args_Ptr);
|
||||
|
||||
ND_VA_ARG_GET( Out, lib_args, FILE *);
|
||||
ND_VA_ARG_GET( Recursive_Mode, lib_args, NDT_Recursive_Mode);
|
||||
ND_VA_ARG_GET( Recursive_Depth, lib_args, NDT_Recursive_Depth);
|
||||
ND_VA_ARG_GET( Recursive_Offset, lib_args, NDT_Recursive_Offset);
|
||||
|
||||
ND_VA_LIST_CLOSE( lib_args);
|
||||
|
||||
|
||||
Demo_Value *Value_Ptr = Node_Ptr->Value;
|
||||
|
||||
@@ -361,18 +393,25 @@ NDT_Status Demo_DS_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_No
|
||||
case NDD_CMD_INFO_PRINT:
|
||||
{
|
||||
/*
|
||||
NDT_Node *Next_Node_Ptr = (NDT_Node *)va_arg( Args, NDT_Node *);
|
||||
va_list lib_args = (va_list)va_arg( Args, va_list);
|
||||
FILE *Out = (FILE *)va_arg( lib_args, FILE *);
|
||||
NDT_Recursive_Mode Recursive_Mode = (NDT_Recursive_Mode)va_arg( lib_args, NDT_Recursive_Mode);
|
||||
NDT_Recursive_Depth Recursive_Depth = (NDT_Recursive_Depth)va_arg( lib_args, NDT_Recursive_Depth);
|
||||
va_list user_args = (va_list)va_arg( lib_args, va_list);
|
||||
user_type user_data = (user_type)va_arg( user_args, user_type);
|
||||
... = (...)va_arg( user_args, ...);
|
||||
ND_VA_ARG_GET( Next_Node_Ptr, *Args_Ptr, NDT_Node *);
|
||||
|
||||
void *Value_Ptr = Node_Ptr->Value;
|
||||
ND_VA_LIST_OPEN( lib_args, *Args_Ptr);
|
||||
|
||||
ND_VA_ARG_GET( Out, lib_args, FILE *);
|
||||
ND_VA_ARG_GET( Recursive_Mode, lib_args, NDT_Recursive_Mode);
|
||||
ND_VA_ARG_GET( Recursive_Depth, lib_args, NDT_Recursive_Depth);
|
||||
ND_VA_ARG_GET( Recursive_Offset, lib_args, NDT_Recursive_Offset);
|
||||
|
||||
ND_VA_LIST_OPEN( user_args, lib_args);
|
||||
|
||||
ND_VA_ARG_GET( user_data, user_args, user_type);
|
||||
ND_VA_ARG_GET( ..., user_args, ...);
|
||||
|
||||
ND_VA_LIST_CLOSE( user_args);
|
||||
ND_VA_LIST_CLOSE( lib_args);
|
||||
*/
|
||||
|
||||
|
||||
Command_Name = "NDD_CMD_INFO_PRINT";
|
||||
|
||||
return( NDS_OK);
|
||||
@@ -409,7 +448,7 @@ void DataStruct_Load( NDT_Root *ds_ptr, FILE *demo_file)
|
||||
while( !feof( demo_file))
|
||||
{
|
||||
str = fgets( input_string, STRING_SIZE, demo_file);
|
||||
if( ( (const int)str != EOF) && ( str != NULL))
|
||||
if( str != NULL)
|
||||
{
|
||||
if( strlen( input_string) >= STRING_LEN)
|
||||
{
|
||||
|
||||
462
include/node.h
462
include/node.h
@@ -1,9 +1,9 @@
|
||||
/*---------------------------------------------------------------------------------*/
|
||||
/* $RCSfile: node.h,v $ */
|
||||
/*---------------------------------------------------------------------------------*/
|
||||
/* $Revision: 2.9 $ */
|
||||
/* $Revision: 2.13 $ */
|
||||
/* $Name: $ */
|
||||
/* $Date: 2004/08/23 22:47:22 $ */
|
||||
/* $Date: 2010/06/06 21:26:31 $ */
|
||||
/* $Author: agibert $ */
|
||||
/*---------------------------------------------------------------------------------*/
|
||||
|
||||
@@ -151,6 +151,349 @@ typedef int NDT_Index_Type;
|
||||
|
||||
|
||||
|
||||
/* Manager Template */
|
||||
|
||||
// NDT_Status ND_Example_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Node *Node_Ptr, NDT_Command Command, va_list *Args_Ptr)
|
||||
// {
|
||||
// NDT_Command_Name Command_Name;
|
||||
//
|
||||
//
|
||||
// switch( Command)
|
||||
// {
|
||||
// case NDD_CMD_MANAGER_VERSION:
|
||||
// {
|
||||
// ND_VA_ARG_GET( Version_Name_Ptr, *Args_Ptr, NDT_Version_Name *);
|
||||
//
|
||||
//
|
||||
// Command_Name = "NDD_CMD_MANAGER_VERSION";
|
||||
//
|
||||
// *Version_Name_Ptr = "$Revision: 2.13 $ $Name: $ $Date: 2010/06/06 21:26:31 $ $Author: agibert $";
|
||||
//
|
||||
// return( NDS_OK);
|
||||
// }
|
||||
//
|
||||
// case NDD_CMD_INDEX_GET:
|
||||
// {
|
||||
// /*
|
||||
// ND_VA_ARG_GET( Reply_Index_Id_Ptr, *Args_Ptr, NDT_Index_Id *);
|
||||
// ND_VA_ARG_GET( Reply_Command_Ptr, *Args_Ptr, NDT_Command *);
|
||||
// ND_VA_ARG_GET( Cmd, *Args_Ptr, NDT_Command);
|
||||
// ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *);
|
||||
// */
|
||||
// ND_VA_ARG_GET( Reply_Index_Id_Ptr, *Args_Ptr, NDT_Index_Id *);
|
||||
// ND_VA_ARG_GET( Reply_Command_Ptr, *Args_Ptr, NDT_Command *);
|
||||
// ND_VA_ARG_GET( Cmd, *Args_Ptr, NDT_Command);
|
||||
// ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *);
|
||||
//
|
||||
//
|
||||
// Command_Name = "NDD_CMD_INDEX_GET";
|
||||
//
|
||||
// switch(Cmd)
|
||||
// {
|
||||
// /*
|
||||
// case NDT_CMD_SOME_USER_CMD:
|
||||
// {
|
||||
// *Reply_Index_Id_Ptr = 0;
|
||||
// *Reply_Command_Ptr = NDD_CMD_SOME_OTHER_CMD;
|
||||
// break;
|
||||
// }
|
||||
//
|
||||
// ...
|
||||
// */
|
||||
//
|
||||
// default:
|
||||
// {
|
||||
// *Reply_Index_Id_Ptr = Index_Id;
|
||||
// *Reply_Command_Ptr = Cmd;
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// return( NDS_OK);
|
||||
// }
|
||||
//
|
||||
// case NDD_CMD_VALUE_ALLOC:
|
||||
// {
|
||||
// /*
|
||||
// ND_VA_ARG_GET( Value_Ptr_Ptr, *Args_Ptr, void **);
|
||||
//
|
||||
// ND_VA_LIST_OPEN( user_args, *Args_Ptr);
|
||||
//
|
||||
// ND_VA_ARG_GET( user_data, user_args, user_type);
|
||||
// ND_VA_ARG_GET( ..., user_args, ...);
|
||||
//
|
||||
// ND_VA_LIST_CLOSE( user_args);
|
||||
// */
|
||||
//
|
||||
//
|
||||
// Command_Name = "NDD_CMD_VALUE_ALLOC";
|
||||
//
|
||||
// /*
|
||||
// if( ( *Value_Ptr_Ptr = (void *)malloc( sizeof(void))) == NULL)
|
||||
// {
|
||||
// return(NDS_ERRMEM);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// ...
|
||||
//
|
||||
// return( NDS_OK);
|
||||
// }
|
||||
// */
|
||||
// }
|
||||
//
|
||||
// case NDD_CMD_VALUE_FREE:
|
||||
// {
|
||||
// /*
|
||||
// ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *);
|
||||
//
|
||||
// ND_VA_LIST_OPEN( user_args, *Args_Ptr);
|
||||
//
|
||||
// ND_VA_ARG_GET( user_data, user_args, user_type);
|
||||
// ND_VA_ARG_GET( ..., user_args, ...);
|
||||
//
|
||||
// ND_VA_LIST_CLOSE( user_args);
|
||||
// */
|
||||
//
|
||||
//
|
||||
// Command_Name = "NDD_CMD_VALUE_FREE";
|
||||
//
|
||||
// /*
|
||||
// free( Value_Ptr);
|
||||
//
|
||||
// return( NDS_OK);
|
||||
// */
|
||||
// }
|
||||
//
|
||||
// case NDD_CMD_VALUE_COMP:
|
||||
// {
|
||||
// /*
|
||||
// ND_VA_ARG_GET( Value1_Ptr, *Args_Ptr, void *);
|
||||
// ND_VA_ARG_GET( Value2_Ptr, *Args_Ptr, void *);
|
||||
//
|
||||
// ND_VA_LIST_OPEN( user_args, *Args_Ptr);
|
||||
//
|
||||
// ND_VA_ARG_GET( user_data, user_args, user_type);
|
||||
// ND_VA_ARG_GET( ..., user_args, ...);
|
||||
//
|
||||
// ND_VA_LIST_CLOSE( user_args);
|
||||
// */
|
||||
//
|
||||
//
|
||||
// Command_Name = "NDD_CMD_VALUE_COMP";
|
||||
//
|
||||
// switch( Index_Id)
|
||||
// {
|
||||
// case 0:
|
||||
// {
|
||||
// int rc;
|
||||
//
|
||||
//
|
||||
// rc = strcmp( Value1_Ptr->..., Value2_Ptr->...);
|
||||
//
|
||||
// if( rc < 0)
|
||||
// {
|
||||
// return(NDS_LOWER);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// if( rc > 0)
|
||||
// {
|
||||
// return(NDS_GREATER);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// return(NDS_EQUAL);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// case 1:
|
||||
// {
|
||||
// int val1 = atoi(Value1_Ptr->...);
|
||||
// int val2 = atoi(Value2_Ptr->...);
|
||||
//
|
||||
//
|
||||
// if( val1 < val2)
|
||||
// {
|
||||
// return(NDS_LOWER);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// if( val1 > val2)
|
||||
// {
|
||||
// return(NDS_GREATER);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// return(NDS_EQUAL);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// case 2:
|
||||
// {
|
||||
// ...
|
||||
// }
|
||||
//
|
||||
// default:
|
||||
// {
|
||||
// printf( "Unknown COMP idx (%d) !\n", Index_Id);
|
||||
// return( NDS_KO);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// return( NDS_OK);
|
||||
// }
|
||||
//
|
||||
// case NDD_CMD_VALUE_ADD:
|
||||
// {
|
||||
// /*
|
||||
// ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *);
|
||||
//
|
||||
// ND_VA_LIST_OPEN( user_args, *Args_Ptr);
|
||||
//
|
||||
// ND_VA_ARG_GET( user_data, user_args, user_type);
|
||||
// ND_VA_ARG_GET( ..., user_args, ...);
|
||||
//
|
||||
// ND_VA_LIST_CLOSE( user_args);
|
||||
// */
|
||||
//
|
||||
//
|
||||
// Command_Name = "NDD_CMD_VALUE_ADD";
|
||||
//
|
||||
// /*
|
||||
// return( NDS_OK);
|
||||
// */
|
||||
// }
|
||||
//
|
||||
// case NDD_CMD_VALUE_REMOVE:
|
||||
// {
|
||||
// /*
|
||||
// ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *);
|
||||
//
|
||||
// ND_VA_LIST_OPEN( user_args, *Args_Ptr);
|
||||
//
|
||||
// ND_VA_ARG_GET( user_data, user_args, user_type);
|
||||
// ND_VA_ARG_GET( ..., user_args, ...);
|
||||
//
|
||||
// ND_VA_LIST_CLOSE( user_args);
|
||||
// */
|
||||
//
|
||||
//
|
||||
// Command_Name = "NDD_CMD_VALUE_REMOVE";
|
||||
// /*
|
||||
// return( NDS_OK);
|
||||
// */
|
||||
// }
|
||||
//
|
||||
// case NDD_CMD_VALUE_PRINT:
|
||||
// {
|
||||
// /*
|
||||
// ND_VA_ARG_GET( Next_Node_Ptr, *Args_Ptr, NDT_Node *);
|
||||
//
|
||||
// ND_VA_LIST_OPEN( lib_args, *Args_Ptr);
|
||||
//
|
||||
// ND_VA_ARG_GET( Out, lib_args, FILE *);
|
||||
// ND_VA_ARG_GET( Recursive_Mode, lib_args, NDT_Recursive_Mode);
|
||||
// ND_VA_ARG_GET( Recursive_Depth, lib_args, NDT_Recursive_Depth);
|
||||
// ND_VA_ARG_GET( Recursive_Offset, lib_args, NDT_Recursive_Offset);
|
||||
//
|
||||
// ND_VA_LIST_OPEN( user_args, lib_args);
|
||||
//
|
||||
// ND_VA_ARG_GET( user_data, user_args, user_type);
|
||||
// ND_VA_ARG_GET( ..., user_args, ...);
|
||||
//
|
||||
// ND_VA_LIST_CLOSE( user_args);
|
||||
// ND_VA_LIST_CLOSE( lib_args);
|
||||
//
|
||||
// void *Value_Ptr = Node_Ptr->Value;
|
||||
// */
|
||||
//
|
||||
//
|
||||
// Command_Name = "NDD_CMD_VALUE_PRINT";
|
||||
//
|
||||
// /*
|
||||
// fprintf( Out, "...\n", Value_Ptr->..., ...);
|
||||
//
|
||||
// return( NDS_OK);
|
||||
// */
|
||||
// }
|
||||
//
|
||||
// case NDD_CMD_INFO_PRINT:
|
||||
// {
|
||||
// /*
|
||||
// ND_VA_ARG_GET( Next_Node_Ptr, *Args_Ptr, NDT_Node *);
|
||||
//
|
||||
// ND_VA_LIST_OPEN( lib_args, *Args_Ptr);
|
||||
//
|
||||
// ND_VA_ARG_GET( Out, lib_args, FILE *);
|
||||
// ND_VA_ARG_GET( Recursive_Mode, lib_args, NDT_Recursive_Mode);
|
||||
// ND_VA_ARG_GET( Recursive_Depth, lib_args, NDT_Recursive_Depth);
|
||||
// ND_VA_ARG_GET( Recursive_Offset, lib_args, NDT_Recursive_Offset);
|
||||
//
|
||||
// ND_VA_LIST_OPEN( user_args, lib_args);
|
||||
//
|
||||
// ND_VA_ARG_GET( user_data, user_args, user_type);
|
||||
// ND_VA_ARG_GET( ..., user_args, ...);
|
||||
//
|
||||
// ND_VA_LIST_CLOSE( user_args);
|
||||
// ND_VA_LIST_CLOSE( lib_args);
|
||||
// */
|
||||
//
|
||||
//
|
||||
// Command_Name = "NDD_CMD_INFO_PRINT";
|
||||
//
|
||||
// /*
|
||||
// return( NDS_OK);
|
||||
// */
|
||||
// }
|
||||
//
|
||||
// case NDD_CMD_USER_TRAVERSE:
|
||||
// {
|
||||
// /*
|
||||
// ND_VA_ARG_GET( Next_Node_Ptr, *Args_Ptr, NDT_Node *);
|
||||
//
|
||||
// ND_VA_LIST_OPEN( user_args, *Args_Ptr);
|
||||
//
|
||||
// ND_VA_ARG_GET( user_data, user_args, user_type);
|
||||
// ND_VA_ARG_GET( ..., user_args, ...);
|
||||
//
|
||||
// ND_VA_LIST_CLOSE( user_args);
|
||||
//
|
||||
//
|
||||
// void *Value_Ptr = Node_Ptr->Value;
|
||||
// */
|
||||
//
|
||||
//
|
||||
// Command_Name = "NDD_CMD_USER_TRAVERSE";
|
||||
//
|
||||
// /*
|
||||
// return( NDS_OK);
|
||||
// */
|
||||
// }
|
||||
//
|
||||
// default:
|
||||
// {
|
||||
// printf( "ND_Default_Manager() called with an undefined command %d\n", Command);
|
||||
// return(NDS_ERRAPI);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// printf( "ND_Default_Manager() called with command %d (%s)\n", Command, Command_Name);
|
||||
// return(NDS_OK);
|
||||
// }
|
||||
|
||||
|
||||
|
||||
/* Var Args Manager Macros */
|
||||
|
||||
#define ND_VA_LIST_OPEN( VA_List_Target, VA_List_Source) va_list VA_List_Target; va_copy( VA_List_Target, *va_arg( VA_List_Source, va_list *))
|
||||
#define ND_VA_LIST_CLOSE( VA_List) va_end( VA_List)
|
||||
#define ND_VA_ARG_GET( Arg, VA_List, Type) Type Arg = va_arg( VA_List, Type)
|
||||
|
||||
|
||||
|
||||
/* Commandes du manager */
|
||||
|
||||
typedef int NDT_Command;
|
||||
@@ -216,7 +559,7 @@ struct NDT_Node;
|
||||
|
||||
typedef char *NDT_Manager_Name;
|
||||
|
||||
typedef NDT_Status NDT_Manager( struct NDT_Root *, NDT_Index_Id, struct NDT_Node *, NDT_Command, va_list);
|
||||
typedef NDT_Status NDT_Manager( struct NDT_Root *, NDT_Index_Id, struct NDT_Node *, NDT_Command, va_list *);
|
||||
|
||||
|
||||
/* Pointeur de fonction sur l'allocateur */
|
||||
@@ -226,7 +569,7 @@ typedef NDT_Status NDT_Manager( struct NDT_Root *, NDT_Index_Id, struct NDT_Nod
|
||||
|
||||
typedef char *NDT_Allocator_Name;
|
||||
|
||||
typedef NDT_Status NDT_Allocator(size_t, void **, void *);
|
||||
typedef NDT_Status NDT_Allocator( void **, size_t, void *);
|
||||
|
||||
|
||||
/* Pointeur de fonction sur le désallocateur */
|
||||
@@ -236,7 +579,7 @@ typedef NDT_Status NDT_Allocator(size_t, void **, void *);
|
||||
|
||||
typedef char *NDT_Desallocator_Name;
|
||||
|
||||
typedef NDT_Status NDT_Desallocator(void *, void *);
|
||||
typedef NDT_Status NDT_Desallocator( void *, void *);
|
||||
|
||||
|
||||
|
||||
@@ -260,8 +603,8 @@ typedef struct NDT_Index
|
||||
|
||||
typedef struct NDT_Root
|
||||
{
|
||||
// NDT_Root_Type Type; /* Root Structure Type */
|
||||
// NDT_DataStruct_Type DS_Type; /* Type de la structure (liste, arbre ... ) */
|
||||
/* NDT_Root_Type Type;*/ /* Root Structure Type */
|
||||
/* NDT_DataStruct_Type DS_Type;*/ /* Type de la structure (liste, arbre ... ) */
|
||||
|
||||
NDT_Manager *Manager_Ptr; /* Pointeur sur la fonction manager */
|
||||
char Manager_Name[NDD_MANAGER_NAME_SIZE_MAX]; /* Nom de la fonction manager */
|
||||
@@ -271,7 +614,7 @@ typedef struct NDT_Root
|
||||
char Desallocator_Name[NDD_DESALLOCATOR_NAME_SIZE_MAX]; /* Nom de la fonction de désallocation */
|
||||
|
||||
short Own_Value; /* Indique si la structure est propriétaire de ses valeurs */
|
||||
void *User; /* Pointeur utilisable librement par l'utilisateur */
|
||||
void *User_Ptr; /* Pointeur utilisable librement par l'utilisateur */
|
||||
|
||||
NDT_Index_Nb Index_Nb;
|
||||
NDT_Index_Nb Index_Open_Count;
|
||||
@@ -334,7 +677,7 @@ typedef int NDT_Recursive_Offset;
|
||||
|
||||
#define ND_Library_Open ND_Library_Open_I
|
||||
#define ND_Library_Close ND_Library_Close_I
|
||||
#define ND_Library_StdErr_Set ND_Library_Stderr_Set_I
|
||||
#define ND_Library_StdErr_Set ND_Library_StdErr_Set_I
|
||||
|
||||
#define ND_DataStruct_Open ND_DataStruct_Open_I
|
||||
#define ND_DataStruct_Close ND_DataStruct_Close_I
|
||||
@@ -384,7 +727,7 @@ typedef int NDT_Recursive_Offset;
|
||||
|
||||
#define ND_Library_Open ND_Library_Open_C
|
||||
#define ND_Library_Close ND_Library_Close_C
|
||||
#define ND_Library_StdErr_Set ND_Library_Stderr_Set_C
|
||||
#define ND_Library_StdErr_Set ND_Library_StdErr_Set_C
|
||||
|
||||
#define ND_DataStruct_Open ND_DataStruct_Open_C
|
||||
#define ND_DataStruct_Close ND_DataStruct_Close_C
|
||||
@@ -436,7 +779,7 @@ typedef int NDT_Recursive_Offset;
|
||||
|
||||
/*------------------------------------------------------------------------------*/
|
||||
|
||||
# if defined(_MSC_VER) && !defined(LIBNODE_STATIC)
|
||||
# if defined(_WIN32) && !defined(LIBNODE_STATIC)
|
||||
# ifndef _LIBNODE_C_
|
||||
# define NDD_DLL_API __declspec(dllimport)
|
||||
# else
|
||||
@@ -467,8 +810,8 @@ NDD_DLL_API NDT_Status ND_Library_Close_C( void);
|
||||
/*------------------------------------------------------------------------------*/
|
||||
/* Définition de la sortie standard des messages d'erreur de la librairie */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDD_DLL_API NDT_Status ND_Library_StdErr_Set_I( FILE *Out);
|
||||
NDD_DLL_API NDT_Status ND_Library_StdErr_Set_C( FILE *Out);
|
||||
NDD_DLL_API NDT_Status ND_Library_StdErr_Set_I( FILE *);
|
||||
NDD_DLL_API NDT_Status ND_Library_StdErr_Set_C( FILE *);
|
||||
|
||||
|
||||
|
||||
@@ -492,8 +835,8 @@ NDD_DLL_API NDT_Status ND_DataStruct_Open_C( NDT_Root **, NDT_Index_Nb, NDT_In
|
||||
/*------------------------------------------------------------------------------*/
|
||||
/* (O) Root: pointeur sur la racine de la structure de données */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Close_I( NDT_Root *Root);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Close_C( NDT_Root *Root);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Close_I( NDT_Root *);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Close_C( NDT_Root *);
|
||||
|
||||
|
||||
|
||||
@@ -502,8 +845,8 @@ NDD_DLL_API NDT_Status ND_DataStruct_Close_C( NDT_Root *Root);
|
||||
/*------------------------------------------------------------------------------*/
|
||||
/* (O) Root: pointeur sur la racine de la structure de données */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Flush_I( NDT_Root *Root);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Flush_C( NDT_Root *Root);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Flush_I( NDT_Root *);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Flush_C( NDT_Root *);
|
||||
|
||||
|
||||
|
||||
@@ -517,8 +860,8 @@ NDD_DLL_API NDT_Status ND_DataStruct_Flush_C( NDT_Root *Root);
|
||||
/* (O) Nb_Corrected : pointeur sur le nombre d'erreurs */
|
||||
/* (I) Out : flux de sortie du rapport */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Check_I( NDT_Root *Root, int *Nb_Detected, int *Nb_Corrected, FILE *Out);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Check_C( NDT_Root *Root, int *Nb_Detected, int *Nb_Corrected, FILE *Out);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Check_I( NDT_Root *, int *, int *, FILE *);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Check_C( NDT_Root *, int *, int *, FILE *);
|
||||
|
||||
|
||||
|
||||
@@ -529,8 +872,8 @@ NDD_DLL_API NDT_Status ND_DataStruct_Check_C( NDT_Root *Root, int *Nb_Detecte
|
||||
/*------------------------------------------------------------------------------*/
|
||||
/* (I) Root: pointeur sur la racine de la structure de données */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Reorg_I( NDT_Root *Root);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Reorg_C( NDT_Root *Root);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Reorg_I( NDT_Root *);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Reorg_C( NDT_Root *);
|
||||
|
||||
|
||||
|
||||
@@ -553,10 +896,10 @@ NDD_DLL_API NDT_Status ND_DataStruct_Convert_C( NDT_Root *, NDT_Index_Type *)
|
||||
/* (I) Command: Commande à exécuter sur chaque noeud traversé */
|
||||
/* (I) Data: pointeur de données utilisateur */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Traverse_VI( NDT_Root *, NDT_Command Command, va_list);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Traverse_VC( NDT_Root *, NDT_Command Command, va_list);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Traverse_I( NDT_Root *, NDT_Command Command, ...);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Traverse_C( NDT_Root *, NDT_Command Command, ...);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Traverse_VI( NDT_Root *, NDT_Command, va_list *);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Traverse_VC( NDT_Root *, NDT_Command, va_list *);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Traverse_I( NDT_Root *, NDT_Command, ...);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Traverse_C( NDT_Root *, NDT_Command, ...);
|
||||
|
||||
|
||||
|
||||
@@ -566,8 +909,8 @@ NDD_DLL_API NDT_Status ND_DataStruct_Traverse_C( NDT_Root *, NDT_Command Com
|
||||
/* (I) Root: pointeur sur la racine de la structure de données */
|
||||
/* (I) Out : flux de sortie */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Info_Print_I( FILE *, NDT_Root *Root, NDT_Recursive_Mode Recursive_Mode, NDT_Recursive_Depth, NDT_Recursive_Offset);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Info_Print_C( FILE *, NDT_Root *Root, NDT_Recursive_Mode Recursive_Mode, NDT_Recursive_Depth, NDT_Recursive_Offset);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Info_Print_I( FILE *, NDT_Root *, NDT_Recursive_Mode, NDT_Recursive_Depth, NDT_Recursive_Offset);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Info_Print_C( FILE *, NDT_Root *, NDT_Recursive_Mode, NDT_Recursive_Depth, NDT_Recursive_Offset);
|
||||
|
||||
|
||||
|
||||
@@ -577,8 +920,8 @@ NDD_DLL_API NDT_Status ND_DataStruct_Info_Print_C( FILE *, NDT_Root *Root, ND
|
||||
/* (I) Root: pointeur sur la racine de la structure de données */
|
||||
/* (I) Value: pointeur sur la valeur à ajouter */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Value_Add_I( NDT_Root *Root, void *Value);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Value_Add_C( NDT_Root *Root, void *Value);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Value_Add_I( NDT_Root *, void *);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Value_Add_C( NDT_Root *, void *);
|
||||
|
||||
|
||||
|
||||
@@ -589,8 +932,8 @@ NDD_DLL_API NDT_Status ND_DataStruct_Value_Add_C( NDT_Root *Root, void *Value
|
||||
/* (I) Reference_Value : pointeur sur la valeur de référence */
|
||||
/* (I) Removed_Value : adresse d'un pointeur sur la valeur supprimée */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Value_Remove_I( NDT_Root *Root, void *Value);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Value_Remove_C( NDT_Root *Root, void *Value);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Value_Remove_I( NDT_Root *, void *);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Value_Remove_C( NDT_Root *, void *);
|
||||
|
||||
|
||||
|
||||
@@ -600,7 +943,7 @@ NDD_DLL_API NDT_Status ND_DataStruct_Value_Remove_C( NDT_Root *Root, void *Va
|
||||
/* (I) Root: pointeur sur la racine de la structure de données */
|
||||
/* (I) Out : flux de sortie */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Value_Print_VI( FILE *, NDT_Root *, NDT_Recursive_Mode, NDT_Recursive_Depth, NDT_Recursive_Offset, va_list);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Value_Print_VI( FILE *, NDT_Root *, NDT_Recursive_Mode, NDT_Recursive_Depth, NDT_Recursive_Offset, va_list *);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Value_Print_I( FILE *, NDT_Root *, NDT_Recursive_Mode, NDT_Recursive_Depth, NDT_Recursive_Offset, ...);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Value_Print_C( FILE *, NDT_Root *, NDT_Recursive_Mode, NDT_Recursive_Depth, NDT_Recursive_Offset, ...);
|
||||
|
||||
@@ -615,10 +958,10 @@ NDD_DLL_API NDT_Status ND_DataStruct_Value_Print_C( FILE *, NDT_Root *, NDT_
|
||||
/* (I) Data : pointeur de données */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Value_Find_VI( void **Value_Ptr_Ptr, NDT_Root *Root_Ptr, void *Ref_Value_Ptr, va_list);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Value_Find_VC( void **Value_Ptr_Ptr, NDT_Root *Root_Ptr, void *Ref_Value_Ptr, va_list);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Value_Find_I( void **Value_Ptr_Ptr, NDT_Root *Root_Ptr, void *Ref_Value_Ptr, ...);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Value_Find_C( void **Value_Ptr_Ptr, NDT_Root *Root_Ptr, void *Ref_Value_Ptr, ...);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Value_Find_VI( void **, NDT_Root *, void *, va_list *);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Value_Find_VC( void **, NDT_Root *, void *, va_list *);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Value_Find_I( void **, NDT_Root *, void *, ...);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Value_Find_C( void **, NDT_Root *, void *, ...);
|
||||
|
||||
|
||||
|
||||
@@ -667,8 +1010,8 @@ NDD_DLL_API NDT_Status ND_Index_Flush_C( NDT_Root *, NDT_Index_Id);
|
||||
/* (O) Nb_Corrected : pointeur sur le nombre d'erreurs */
|
||||
/* (I) Out : flux de sortie du rapport */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDD_DLL_API NDT_Status ND_Index_Check_I( NDT_Root *Root, NDT_Index_Id, int *, int *, FILE *);
|
||||
NDD_DLL_API NDT_Status ND_Index_Check_C( NDT_Root *Root, NDT_Index_Id, int *, int *, FILE *);
|
||||
NDD_DLL_API NDT_Status ND_Index_Check_I( NDT_Root *, NDT_Index_Id, int *, int *, FILE *);
|
||||
NDD_DLL_API NDT_Status ND_Index_Check_C( NDT_Root *, NDT_Index_Id, int *, int *, FILE *);
|
||||
|
||||
|
||||
|
||||
@@ -678,8 +1021,8 @@ NDD_DLL_API NDT_Status ND_Index_Check_C( NDT_Root *Root, NDT_Index_Id, int *,
|
||||
/* (I) Root: pointeur sur la racine de la structure de données */
|
||||
/* (I) Target_Type: type de structure cible */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDD_DLL_API NDT_Status ND_Index_Convert_I ( NDT_Root *, NDT_Index_Id Index_Id, NDT_Index_Type);
|
||||
NDD_DLL_API NDT_Status ND_Index_Convert_C ( NDT_Root *, NDT_Index_Id Index_Id, NDT_Index_Type);
|
||||
NDD_DLL_API NDT_Status ND_Index_Convert_I ( NDT_Root *, NDT_Index_Id, NDT_Index_Type);
|
||||
NDD_DLL_API NDT_Status ND_Index_Convert_C ( NDT_Root *, NDT_Index_Id, NDT_Index_Type);
|
||||
|
||||
|
||||
|
||||
@@ -703,8 +1046,8 @@ NDD_DLL_API NDT_Status ND_Index_Reorg_C( NDT_Root *, NDT_Index_Id);
|
||||
/* (I) Command: Commande à exécuter sur chaque noeud traversé */
|
||||
/* (I) Data: pointeur de données utilisateur */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDD_DLL_API NDT_Status ND_Index_Traverse_VI( NDT_Root *, NDT_Index_Id, NDT_Command, va_list);
|
||||
NDD_DLL_API NDT_Status ND_Index_Traverse_VC( NDT_Root *, NDT_Index_Id, NDT_Command, va_list);
|
||||
NDD_DLL_API NDT_Status ND_Index_Traverse_VI( NDT_Root *, NDT_Index_Id, NDT_Command, va_list *);
|
||||
NDD_DLL_API NDT_Status ND_Index_Traverse_VC( NDT_Root *, NDT_Index_Id, NDT_Command, va_list *);
|
||||
NDD_DLL_API NDT_Status ND_Index_Traverse_I( NDT_Root *, NDT_Index_Id, NDT_Command, ...);
|
||||
NDD_DLL_API NDT_Status ND_Index_Traverse_C( NDT_Root *, NDT_Index_Id, NDT_Command, ...);
|
||||
|
||||
@@ -729,8 +1072,8 @@ NDD_DLL_API NDT_Status ND_Index_Info_Print_C( FILE *, NDT_Root *, NDT_Index_I
|
||||
/* (I) Root: pointeur sur la racine de la structure de données */
|
||||
/* (I) Value: pointeur sur la valeur à ajouter */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDD_DLL_API NDT_Status ND_Index_Value_Add_I( NDT_Root *Root, NDT_Index_Id, void *Value);
|
||||
NDD_DLL_API NDT_Status ND_Index_Value_Add_C( NDT_Root *Root, NDT_Index_Id, void *Value);
|
||||
NDD_DLL_API NDT_Status ND_Index_Value_Add_I( NDT_Root *, NDT_Index_Id, void *);
|
||||
NDD_DLL_API NDT_Status ND_Index_Value_Add_C( NDT_Root *, NDT_Index_Id, void *);
|
||||
|
||||
|
||||
|
||||
@@ -741,8 +1084,8 @@ NDD_DLL_API NDT_Status ND_Index_Value_Add_C( NDT_Root *Root, NDT_Index_Id, voi
|
||||
/* (I) Reference_Value : pointeur sur la valeur de référence */
|
||||
/* (I) Removed_Value : adresse d'un pointeur sur la valeur supprimée */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDD_DLL_API NDT_Status ND_Index_Value_Remove_I( NDT_Root *Root, NDT_Index_Id, void *Value);
|
||||
NDD_DLL_API NDT_Status ND_Index_Value_Remove_C( NDT_Root *Root, NDT_Index_Id, void *Value);
|
||||
NDD_DLL_API NDT_Status ND_Index_Value_Remove_I( NDT_Root *, NDT_Index_Id, void *);
|
||||
NDD_DLL_API NDT_Status ND_Index_Value_Remove_C( NDT_Root *, NDT_Index_Id, void *);
|
||||
|
||||
|
||||
|
||||
@@ -752,7 +1095,7 @@ NDD_DLL_API NDT_Status ND_Index_Value_Remove_C( NDT_Root *Root, NDT_Index_Id,
|
||||
/* (I) Root: pointeur sur la racine de la structure de données */
|
||||
/* (I) Out : flux de sortie */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDD_DLL_API NDT_Status ND_Index_Value_Print_VI( FILE *, NDT_Root *, NDT_Index_Id, NDT_Recursive_Mode, NDT_Recursive_Depth, NDT_Recursive_Offset, va_list);
|
||||
NDD_DLL_API NDT_Status ND_Index_Value_Print_VI( FILE *, NDT_Root *, NDT_Index_Id, NDT_Recursive_Mode, NDT_Recursive_Depth, NDT_Recursive_Offset, va_list *);
|
||||
NDD_DLL_API NDT_Status ND_Index_Value_Print_I( FILE *, NDT_Root *, NDT_Index_Id, NDT_Recursive_Mode, NDT_Recursive_Depth, NDT_Recursive_Offset, ...);
|
||||
NDD_DLL_API NDT_Status ND_Index_Value_Print_C( FILE *, NDT_Root *, NDT_Index_Id, NDT_Recursive_Mode, NDT_Recursive_Depth, NDT_Recursive_Offset, ...);
|
||||
|
||||
@@ -764,8 +1107,8 @@ NDD_DLL_API NDT_Status ND_Index_Value_Print_C( FILE *, NDT_Root *, NDT_Index
|
||||
/* (I) Root: pointeur sur la racine de la structure de données */
|
||||
/* (I) Node: pointeur sur le noeud à ajouter */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDD_DLL_API NDT_Status ND_Index_Node_Add_I( NDT_Root * Root, NDT_Index_Id Index_Id, NDT_Node * Node );
|
||||
NDD_DLL_API NDT_Status ND_Index_Node_Add_C( NDT_Root * Root, NDT_Index_Id Index_Id, NDT_Node * Node );
|
||||
NDD_DLL_API NDT_Status ND_Index_Node_Add_I( NDT_Root *, NDT_Index_Id, NDT_Node *);
|
||||
NDD_DLL_API NDT_Status ND_Index_Node_Add_C( NDT_Root *, NDT_Index_Id, NDT_Node *);
|
||||
|
||||
|
||||
|
||||
@@ -774,8 +1117,8 @@ NDD_DLL_API NDT_Status ND_Index_Node_Add_C( NDT_Root * Root, NDT_Index_Id Inde
|
||||
/*------------------------------------------------------------------------------*/
|
||||
/* (I) Node: pointeur sur le noeud à supprimer de la structure de données */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDD_DLL_API NDT_Status ND_Index_Node_Remove_I( NDT_Node * Node);
|
||||
NDD_DLL_API NDT_Status ND_Index_Node_Remove_C( NDT_Node * Node);
|
||||
NDD_DLL_API NDT_Status ND_Index_Node_Remove_I( NDT_Node *);
|
||||
NDD_DLL_API NDT_Status ND_Index_Node_Remove_C( NDT_Node *);
|
||||
|
||||
|
||||
|
||||
@@ -831,8 +1174,8 @@ NDD_DLL_API NDT_Status ND_Index_Node_Previous_Get_C( NDT_Node **, NDT_Node *)
|
||||
/* (I) Value : pointeur sur la valeur à rechercher */
|
||||
/* (I) Data : pointeur de données */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDD_DLL_API NDT_Status ND_Index_Node_Find_VI( NDT_Node **, NDT_Root *, NDT_Index_Id, void *, va_list);
|
||||
NDD_DLL_API NDT_Status ND_Index_Node_Find_VC( NDT_Node **, NDT_Root *, NDT_Index_Id, void *, va_list);
|
||||
NDD_DLL_API NDT_Status ND_Index_Node_Find_VI( NDT_Node **, NDT_Root *, NDT_Index_Id, void *, va_list *);
|
||||
NDD_DLL_API NDT_Status ND_Index_Node_Find_VC( NDT_Node **, NDT_Root *, NDT_Index_Id, void *, va_list *);
|
||||
NDD_DLL_API NDT_Status ND_Index_Node_Find_I( NDT_Node **, NDT_Root *, NDT_Index_Id, void *, ...);
|
||||
NDD_DLL_API NDT_Status ND_Index_Node_Find_C( NDT_Node **, NDT_Root *, NDT_Index_Id, void *, ...);
|
||||
|
||||
@@ -877,8 +1220,8 @@ NDD_DLL_API NDT_Status ND_Value_Free_C( NDT_Root *, void *);
|
||||
/*------------------------------------------------------------------------------*/
|
||||
/* (I) Function : nom de la fonction manager à exécuter */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDD_DLL_API NDT_Status ND_Manager_Exec_VI( NDT_Root *, NDT_Index_Id, NDT_Node *, NDT_Command, va_list);
|
||||
NDD_DLL_API NDT_Status ND_Manager_Exec_VC( NDT_Root *, NDT_Index_Id, NDT_Node *, NDT_Command, va_list);
|
||||
NDD_DLL_API NDT_Status ND_Manager_Exec_VI( NDT_Root *, NDT_Index_Id, NDT_Node *, NDT_Command, va_list *);
|
||||
NDD_DLL_API NDT_Status ND_Manager_Exec_VC( NDT_Root *, NDT_Index_Id, NDT_Node *, NDT_Command, va_list *);
|
||||
NDD_DLL_API NDT_Status ND_Manager_Exec_I( NDT_Root *, NDT_Index_Id, NDT_Node *, NDT_Command, ...);
|
||||
NDD_DLL_API NDT_Status ND_Manager_Exec_C( NDT_Root *, NDT_Index_Id, NDT_Node *, NDT_Command, ...);
|
||||
|
||||
@@ -892,8 +1235,8 @@ NDD_DLL_API NDT_Status ND_Manager_Exec_C( NDT_Root *, NDT_Index_Id, NDT_Node
|
||||
/* (I) Size : taille de la zone à allouer */
|
||||
/* (I) Data : pointeur de données utiles à l'allocateur */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDD_DLL_API NDT_Status ND_Allocator_Exec_I( NDT_Allocator *, void **, size_t, void *);
|
||||
NDD_DLL_API NDT_Status ND_Allocator_Exec_C( NDT_Allocator *, void **, size_t, void *);
|
||||
NDD_DLL_API NDT_Status ND_Allocator_Exec_I( void **, size_t, NDT_Allocator_Name, NDT_Allocator *, void *);
|
||||
NDD_DLL_API NDT_Status ND_Allocator_Exec_C( void **, size_t, NDT_Allocator_Name, NDT_Allocator *, void *);
|
||||
|
||||
|
||||
|
||||
@@ -901,11 +1244,12 @@ NDD_DLL_API NDT_Status ND_Allocator_Exec_C( NDT_Allocator *, void **, size_t,
|
||||
/* Exécution d'une fonction de désallocation le dont nom est passé en paramètre */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
/* (I) Function : nom de la fonction à exécuter */
|
||||
/* (I) Function : nom de la fonction à exécuter */
|
||||
/* (I) Ptr : adresse de la zone à désallouer */
|
||||
/* (I) Data : pointeur de données utiles au désallocateur */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDD_DLL_API NDT_Status ND_Desallocator_Exec_I( NDT_Desallocator *, void *, void *);
|
||||
NDD_DLL_API NDT_Status ND_Desallocator_Exec_C( NDT_Desallocator *, void *, void *);
|
||||
NDD_DLL_API NDT_Status ND_Desallocator_Exec_I( void *, NDT_Desallocator_Name, NDT_Desallocator *, void *);
|
||||
NDD_DLL_API NDT_Status ND_Desallocator_Exec_C( void *, NDT_Desallocator_Name, NDT_Desallocator *, void *);
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -9,8 +9,8 @@ include ../Makefile.rule
|
||||
|
||||
|
||||
|
||||
DEP = libnode.h ../include/node.h Makefile
|
||||
INCLUDE = -I . -I ../include
|
||||
DEP += libnode.h ../include/node.h Makefile
|
||||
INCLUDE += -I . -I ../include
|
||||
|
||||
ifdef _LIBVER_SUPPORT
|
||||
DEP += ../../libver/ver.h
|
||||
|
||||
717
lib/libnode.c
717
lib/libnode.c
File diff suppressed because it is too large
Load Diff
@@ -1,9 +1,9 @@
|
||||
/*---------------------------------------------------------------------------------*/
|
||||
/* $RCSfile: libnode.h,v $ */
|
||||
/*---------------------------------------------------------------------------------*/
|
||||
/* $Revision: 2.7 $ */
|
||||
/* $Revision: 2.10 $ */
|
||||
/* $Name: $ */
|
||||
/* $Date: 2004/08/23 22:47:22 $ */
|
||||
/* $Date: 2010/06/06 21:26:31 $ */
|
||||
/* $Author: agibert $ */
|
||||
/*---------------------------------------------------------------------------------*/
|
||||
|
||||
@@ -32,11 +32,16 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
# include <errno.h>
|
||||
# include <signal.h>
|
||||
# include <setjmp.h>
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <setjmp.h>
|
||||
#include <dlfcn.h>
|
||||
|
||||
//#include <dlfcn.h>
|
||||
|
||||
|
||||
/* Utilisation des API de la LIBNODE sans vérification des arguments */
|
||||
|
||||
#define ND_MODE 1
|
||||
|
||||
#include <node.h>
|
||||
|
||||
@@ -82,12 +87,13 @@ typedef struct NDT_Base
|
||||
char Err_String[512];
|
||||
FILE *Err_Stream;
|
||||
int Sig_Trapped;
|
||||
#if !defined(_MSC_VER)
|
||||
#if !defined(_WIN32)
|
||||
sigjmp_buf SigLongJmp_Env;
|
||||
#else
|
||||
jmp_buf SigLongJmp_Env;
|
||||
#endif
|
||||
NDT_Symbol *Symbol_First_Ptr;
|
||||
void *DL_Ptr;
|
||||
NDT_Index_Type OpenStruct_Index_Type[1];
|
||||
NDT_Root *OpenStruct_Ptr;
|
||||
} NDT_Base;
|
||||
@@ -101,6 +107,7 @@ NDT_Base NDG_Base =
|
||||
0,
|
||||
{0},
|
||||
(NDT_Symbol *) NULL,
|
||||
NULL,
|
||||
{ NDD_INDEX_STATUS_OPENED | NDD_INDEX_TYPE_LIST | NDD_INDEX_SUBTYPE_FIFO},
|
||||
(NDT_Root *) NULL
|
||||
};
|
||||
@@ -120,19 +127,19 @@ NDT_Base NDG_Base =
|
||||
/*------------------------------------------------------------------------------*/
|
||||
/* (I) va_list Arguments : Liste d'arguments contextuels */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDT_Status ND_Default_Manager( NDT_Root *, NDT_Index_Id, NDT_Node *, NDT_Command, va_list);
|
||||
NDT_Status ND_Default_Manager( NDT_Root *, NDT_Index_Id, NDT_Node *, NDT_Command, va_list *);
|
||||
|
||||
/*------------------------------------------------------------------------------*/
|
||||
/* OpenStruct Manager */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
/* (I) va_list Arguments : Liste d'arguments contextuels */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDT_Status ND_OpenStruct_Manager( NDT_Root *, NDT_Index_Id, NDT_Node *, NDT_Command, va_list);
|
||||
NDT_Status ND_OpenStruct_Manager( NDT_Root *, NDT_Index_Id, NDT_Node *, NDT_Command, va_list *);
|
||||
|
||||
/*------------------------------------------------------------------------------*/
|
||||
/* Redéfinition de la fonction malloc() avec retour de type NDT_Status */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDT_Status ND_Default_Allocator( size_t Size, void **ptr, void *User);
|
||||
NDT_Status ND_Default_Allocator( void **, size_t, void *);
|
||||
|
||||
/*------------------------------------------------------------------------------*/
|
||||
/* Redéfinition de la fonction free() avec retour de type NDT_Status */
|
||||
@@ -226,12 +233,12 @@ NDT_Status ND_List_Make( NDT_Root *, NDT_Index_Id);
|
||||
/*------------------------------------------------------------------------------*/
|
||||
/* Recherche une valeur dans une liste et retourne le noeud correspondant */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDT_Node * ND_List_Node_Find( NDT_Root *, NDT_Index_Id, void *, va_list);
|
||||
NDT_Node *ND_List_Node_Find( NDT_Root *, NDT_Index_Id, void *, va_list *);
|
||||
|
||||
/*------------------------------------------------------------------------------*/
|
||||
/* Recherche un noeud dans un arbre et retourne le pointeur sur le noeud */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDT_Node *ND_Tree_Node_Find( NDT_Root *, NDT_Index_Id, void *, va_list);
|
||||
NDT_Node *ND_Tree_Node_Find( NDT_Root *, NDT_Index_Id, void *, va_list *);
|
||||
|
||||
/*------------------------------------------------------------------------------*/
|
||||
/* Conversion d'une structure en arbre binaire */
|
||||
@@ -290,9 +297,14 @@ int ND_Node_Compare( void **, void **);
|
||||
/*------------------------------------------------------------------------------*/
|
||||
NDT_Status ND_List_Sort( NDT_Root *, NDT_Index_Id);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/*------------------------------------------------------------------------------*/
|
||||
/*------------------------------------------------------------------------------*/
|
||||
/* Fonctions et procédures privées de la librairie (bas niveau) */
|
||||
/* PRIVATE FUNCTIONS */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
/*------------------------------------------------------------------------------*/
|
||||
|
||||
@@ -308,28 +320,28 @@ void ND_Tree_Link_Check( NDT_Root *, NDT_Index_Id, int *, int *, FILE *);
|
||||
|
||||
NDT_Status ND_List_Recursive_Make( NDT_Node *, NDT_Root *, NDT_Index_Id);
|
||||
|
||||
NDT_Node * ND_Tree_Recursive_Make( long, long, NDT_Node *);
|
||||
NDT_Node *ND_Tree_Recursive_Make( long, long, NDT_Node *);
|
||||
|
||||
void ND_Tree_Node_Recursive_Add( NDT_Root *, NDT_Index_Id, NDT_Node *, NDT_Node **, long , NDT_Node *);
|
||||
|
||||
NDT_Node * ND_Tree_Node_First_Recursive_Get( NDT_Node *);
|
||||
NDT_Node *ND_Tree_Node_First_Recursive_Get( NDT_Node *);
|
||||
|
||||
NDT_Node * ND_Tree_Node_Last_Recursive_Get( NDT_Node *);
|
||||
NDT_Node *ND_Tree_Node_Last_Recursive_Get( NDT_Node *);
|
||||
|
||||
NDT_Node * ND_Tree_Node_Recursive_Find( NDT_Node *, void *, va_list);
|
||||
NDT_Node *ND_Tree_Node_Recursive_Find( NDT_Node *, void *, va_list *);
|
||||
|
||||
NDT_Node * ND_Tree_Parent_Next_Recursive_Get( NDT_Node * Node);
|
||||
NDT_Node *ND_Tree_Parent_Next_Recursive_Get( NDT_Node *);
|
||||
|
||||
NDT_Node * ND_Tree_Parent_Previous_Recursive_Get( NDT_Node *);
|
||||
NDT_Node *ND_Tree_Parent_Previous_Recursive_Get( NDT_Node *);
|
||||
|
||||
void ND_Tree_Recursive_Print( NDT_Node *, long, FILE *);
|
||||
|
||||
void ND_Tree_Link_Recursive_Check( NDT_Node *Node, int *, int *, FILE *);
|
||||
void ND_Tree_Link_Recursive_Check( NDT_Node *, int *, int *, FILE *);
|
||||
|
||||
void * ND_Symbol_Find( const char *);
|
||||
NDT_Status ND_Symbol_Find( void **, const char *);
|
||||
|
||||
void ND_Error_Print( void);
|
||||
|
||||
void ND_Signal_Trap( int);
|
||||
|
||||
NDT_Status ND_Address_Check(void *);
|
||||
NDT_Status ND_Address_Check( void *);
|
||||
|
||||
33
libnode.spec
33
libnode.spec
@@ -1,22 +1,31 @@
|
||||
Name: libnode
|
||||
Version: 2.0.6
|
||||
Release: 1
|
||||
Version: 2.2.0
|
||||
|
||||
%define libnode_name %{name}-%{version}-%{release}
|
||||
%define release_nb 1
|
||||
|
||||
Release: %{release_nb}rx3
|
||||
|
||||
|
||||
|
||||
%define libnode_name %{name}-%{version}-%{release_nb}
|
||||
%define source %{libnode_name}.src.tgz
|
||||
|
||||
|
||||
|
||||
Summary: Manages generic list and/or tree node structures
|
||||
Copyright: GPL
|
||||
Copyright: GPL/LGPL
|
||||
Group: Application/Utilitaires
|
||||
Distribution: Rx3 OpenSource
|
||||
Vendor: Rx3
|
||||
Packager: Arnaud G. Gibert <arnaud@rx3.net>
|
||||
|
||||
Source: ftp://ftp.rx3.org/pub/%{source}
|
||||
Url: http://www.rx3.org/dvp/libnode/download/
|
||||
Source: ftp://ftp.rx3.org/pub/arc/dvp/%{source}
|
||||
Url: http://www.rx3.org/dvp/?dvp=libnode
|
||||
BuildRoot: %{_tmppath}/%{libnode_name}-buildroot
|
||||
AutoReqProv: no
|
||||
|
||||
|
||||
|
||||
%description
|
||||
Manages generic list and/or tree node structures.
|
||||
|
||||
@@ -49,6 +58,18 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Sun Jun 6 2010 Arnaud G. Gibert <arnaud@rx3.net> 2.2.0-1rx3
|
||||
- Update to 2.2.0 release,
|
||||
- Update Source and URL entry.
|
||||
|
||||
* Mon Jan 24 2005 Arnaud G. Gibert <arnaud@rx3.net> 2.1.0-1rx3
|
||||
- Update to 2.1.0 release,
|
||||
- Now use "rx3" as release suffix,
|
||||
- Fix copyright entry.
|
||||
|
||||
* Wed Jan 19 2005 Arnaud G. Gibert <arnaud@rx3.net> 2.0.7-1
|
||||
- Update to 2.0.7 release.
|
||||
|
||||
* Tue Aug 24 2004 Arnaud G. Gibert <arnaud@rx3.net> 2.0.6-1
|
||||
- Update to 2.0.6 release.
|
||||
|
||||
|
||||
@@ -11,12 +11,13 @@ include ../Makefile.rule
|
||||
|
||||
|
||||
|
||||
DEP_STATIC = ../lib/libnode.a
|
||||
DEP_DYNAMIC = ../lib/libnode.so
|
||||
INCLUDE = -I . -I ../include
|
||||
LIBDIR = -L . -L ../lib
|
||||
LIB_STATIC = ../lib/libnode.a
|
||||
LIB_DYNAMIC = -lnode
|
||||
DEP_STATIC += ../lib/libnode.a
|
||||
DEP_DYNAMIC += ../lib/libnode.so
|
||||
INCLUDE += -I . -I ../include
|
||||
LIBDIR += -L . -L ../lib
|
||||
LIB_STATIC += ../lib/libnode.a -ldl
|
||||
LIB_DYNAMIC += -lnode -ldl
|
||||
CFLAGS += -rdynamic
|
||||
|
||||
ifdef _LIBVER_SUPPORT
|
||||
DEP_STATIC += ../../libver/ver.h ../../libver/libver.a
|
||||
@@ -28,11 +29,11 @@ ifdef _LIBVER_SUPPORT
|
||||
LIB_STATIC += ../../libver/lib/libver.a
|
||||
LIB_DYNAMIC += -lver
|
||||
else
|
||||
LIB_STATIC += -ldl ../../libver/lib/libver.a
|
||||
LIB_DYNAMIC += -ldl -lver
|
||||
LIB_STATIC += ../../libver/lib/libver.a
|
||||
LIB_DYNAMIC += -lver
|
||||
endif
|
||||
|
||||
CFLAGS += -D_LIBVER_SUPPORT -rdynamic
|
||||
CFLAGS += -D_LIBVER_SUPPORT
|
||||
endif
|
||||
|
||||
ND_CHECK_FLAGS = -DND_MODE=0
|
||||
|
||||
193
util/ndbench.c
193
util/ndbench.c
@@ -1,9 +1,9 @@
|
||||
/*---------------------------------------------------------------------------------*/
|
||||
/* $RCSfile: ndbench.c,v $ */
|
||||
/*---------------------------------------------------------------------------------*/
|
||||
/* $Revision: 2.8 $ */
|
||||
/* $Revision: 2.10 $ */
|
||||
/* $Name: $ */
|
||||
/* $Date: 2004/08/24 20:31:28 $ */
|
||||
/* $Date: 2010/06/06 21:27:12 $ */
|
||||
/* $Author: agibert $ */
|
||||
/*---------------------------------------------------------------------------------*/
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
/*---------------------------------------------------------------------------------*/
|
||||
|
||||
#ifdef _LIBVER_SUPPORT
|
||||
VER_INFO_EXPORT( ndbench, "$Revision: 2.8 $", "$Name: $", __FILE__, "$Author: agibert $");
|
||||
VER_INFO_EXPORT( ndbench, "$Revision: 2.10 $", "$Name: $", __FILE__, "$Author: agibert $");
|
||||
# define USAGE "Usage : %s [ --help | --version [-v] | --batch_run <batch_file_name>]\n"
|
||||
#else
|
||||
# define USAGE "Usage : %s [ --help | --batch_run <batch_file_name>]\n"
|
||||
@@ -200,7 +200,7 @@ NDT_Index_Type idx_type_balanced_tree = NDD_INDEX_STATUS_OPENED | NDD_INDEX_TYP
|
||||
/* Prototype */
|
||||
/*---------------------------------------------------------------------------------*/
|
||||
|
||||
NDT_Status Module_Manager( NDT_Root *, NDT_Index_Id, NDT_Node *, NDT_Command, va_list);
|
||||
NDT_Status Module_Manager( NDT_Root *, NDT_Index_Id, NDT_Node *, NDT_Command, va_list *);
|
||||
|
||||
void Menu_Print( FILE *, NDT_Root *);
|
||||
void Command_Get( int *, char **, char **, FILE *, FILE *, short);
|
||||
@@ -258,7 +258,7 @@ Command Command_Tab[] =
|
||||
/* */
|
||||
/*---------------------------------------------------------------------------------*/
|
||||
|
||||
NDT_Status Module_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Node *Node_Ptr, NDT_Command Command, va_list Args)
|
||||
NDT_Status Module_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Node *Node_Ptr, NDT_Command Command, va_list *Args_Ptr)
|
||||
{
|
||||
NDT_Command_Name Command_Name;
|
||||
|
||||
@@ -267,11 +267,12 @@ NDT_Status Module_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Nod
|
||||
{
|
||||
case NDD_CMD_MANAGER_VERSION:
|
||||
{
|
||||
NDT_Version_Name *Version_Name_Ptr = (NDT_Version_Name *)va_arg( Args, NDT_Version_Name *);
|
||||
ND_VA_ARG_GET( Version_Name_Ptr, *Args_Ptr, NDT_Version_Name *);
|
||||
|
||||
|
||||
Command_Name = "NDD_CMD_MANAGER_VERSION";
|
||||
|
||||
*Version_Name_Ptr = "$Revision: 2.8 $ $Name: $ $Date: 2004/08/24 20:31:28 $ $Author: agibert $";
|
||||
*Version_Name_Ptr = "$Revision: 2.10 $ $Name: $ $Date: 2010/06/06 21:27:12 $ $Author: agibert $";
|
||||
|
||||
return( NDS_OK);
|
||||
}
|
||||
@@ -279,15 +280,15 @@ NDT_Status Module_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Nod
|
||||
case NDD_CMD_INDEX_GET:
|
||||
{
|
||||
/*
|
||||
NDT_Index_Id *Reply_Index_Id_Ptr = (NDT_Index_Id *)va_arg( Args, NDT_Index_Id *);
|
||||
NDT_Command *Reply_Command_Ptr = (NDT_Command *)va_arg( Args, NDT_Command *);
|
||||
NDT_Command Cmd = (NDT_Command)va_arg( Args, NDT_Command);
|
||||
void *Value_ptr = (void *)va_arg( Args, void *);
|
||||
ND_VA_ARG_GET( Reply_Index_Id_Ptr, *Args_Ptr, NDT_Index_Id *);
|
||||
ND_VA_ARG_GET( Reply_Command_Ptr, *Args_Ptr, NDT_Command *);
|
||||
ND_VA_ARG_GET( Cmd, *Args_Ptr, NDT_Command);
|
||||
ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *);
|
||||
*/
|
||||
NDT_Index_Id *Reply_Index_Id_Ptr = (NDT_Index_Id *)va_arg( Args, NDT_Index_Id *);
|
||||
NDT_Command *Reply_Command_Ptr = (NDT_Command *)va_arg( Args, NDT_Command *);
|
||||
NDT_Command Cmd = (NDT_Command)va_arg( Args, NDT_Command);
|
||||
T_Module **Module_Ptr_Ptr = (T_Module **)va_arg( Args, T_Module **);
|
||||
ND_VA_ARG_GET( Reply_Index_Id_Ptr, *Args_Ptr, NDT_Index_Id *);
|
||||
ND_VA_ARG_GET( Reply_Command_Ptr, *Args_Ptr, NDT_Command *);
|
||||
ND_VA_ARG_GET( Cmd, *Args_Ptr, NDT_Command);
|
||||
ND_VA_ARG_GET( Module_Ptr_Ptr, *Args_Ptr, T_Module **);
|
||||
|
||||
|
||||
Command_Name = "NDD_CMD_INDEX_GET";
|
||||
@@ -318,15 +319,23 @@ NDT_Status Module_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Nod
|
||||
case NDD_CMD_VALUE_ALLOC:
|
||||
{
|
||||
/*
|
||||
void **Value_Ptr_Ptr = (void **)va_arg( Args, void **);
|
||||
va_list user_args = (va_list)va_arg( Args, va_list);
|
||||
user_type user_data = (user_type)va_arg( user_args, user_type);
|
||||
... = (...)va_arg( user_args, ...);
|
||||
ND_VA_ARG_GET( Value_Ptr_Ptr, *Args_Ptr, void **);
|
||||
|
||||
ND_VA_LIST_OPEN( user_args, *Args_Ptr);
|
||||
|
||||
ND_VA_ARG_GET( user_data, user_args, user_type);
|
||||
ND_VA_ARG_GET( ..., user_args, ...);
|
||||
|
||||
ND_VA_LIST_CLOSE( user_args);
|
||||
*/
|
||||
T_Module **Module_Ptr_Ptr = (T_Module **)va_arg( Args, T_Module **);
|
||||
va_list user_args = (va_list)va_arg( Args, va_list);
|
||||
char *Nom = (char *)va_arg( user_args, char *);
|
||||
int Id = (int)va_arg( user_args, int);
|
||||
ND_VA_ARG_GET( Module_Ptr_Ptr, *Args_Ptr, T_Module **);
|
||||
|
||||
ND_VA_LIST_OPEN( user_args, *Args_Ptr);
|
||||
|
||||
ND_VA_ARG_GET( Nom, user_args, char *);
|
||||
ND_VA_ARG_GET( Id, user_args, int);
|
||||
|
||||
ND_VA_LIST_CLOSE( user_args);
|
||||
|
||||
|
||||
Command_Name = "NDD_CMD_VALUE_ALLOC";
|
||||
@@ -348,12 +357,16 @@ NDT_Status Module_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Nod
|
||||
case NDD_CMD_VALUE_FREE:
|
||||
{
|
||||
/*
|
||||
void *Value_Ptr = (void *)va_arg( Args, void *);
|
||||
va_list user_args = (va_list)va_arg( Args, va_list);
|
||||
user_type user_data = (user_type)va_arg( user_args, user_type);
|
||||
... = (...)va_arg( user_args, ...);
|
||||
ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *);
|
||||
|
||||
ND_VA_LIST_OPEN( user_args, *Args_Ptr);
|
||||
|
||||
ND_VA_ARG_GET( user_data, user_args, user_type);
|
||||
ND_VA_ARG_GET( ..., user_args, ...);
|
||||
|
||||
ND_VA_LIST_CLOSE( user_args);
|
||||
*/
|
||||
T_Module *Module_Ptr = (T_Module *)va_arg( Args, T_Module *);
|
||||
ND_VA_ARG_GET( Module_Ptr, *Args_Ptr, T_Module *);
|
||||
|
||||
|
||||
Command_Name = "NDD_CMD_VALUE_FREE";
|
||||
@@ -368,14 +381,18 @@ NDT_Status Module_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Nod
|
||||
case NDD_CMD_VALUE_COMP:
|
||||
{
|
||||
/*
|
||||
void *Value1_Ptr = (void *)va_arg( Args, void *);
|
||||
void *Value2_Ptr = (void *)va_arg( Args, void *);
|
||||
va_list user_args = (va_list)va_arg( Args, va_list);
|
||||
user_type user_data = (user_type)va_arg( user_args, user_type);
|
||||
... = (...)va_arg( user_args, ...);
|
||||
ND_VA_ARG_GET( Value1_Ptr, *Args_Ptr, void *);
|
||||
ND_VA_ARG_GET( Value2_Ptr, *Args_Ptr, void *);
|
||||
|
||||
ND_VA_LIST_OPEN( user_args, *Args_Ptr);
|
||||
|
||||
ND_VA_ARG_GET( user_data, user_args, user_type);
|
||||
ND_VA_ARG_GET( ..., user_args, ...);
|
||||
|
||||
ND_VA_LIST_CLOSE( user_args);
|
||||
*/
|
||||
T_Module *Value1 = (T_Module *)va_arg( Args, T_Module *);
|
||||
T_Module *Value2 = (T_Module *)va_arg( Args, T_Module *);
|
||||
ND_VA_ARG_GET( Module1_Ptr, *Args_Ptr, T_Module *);
|
||||
ND_VA_ARG_GET( Module2_Ptr, *Args_Ptr, T_Module *);
|
||||
|
||||
|
||||
Command_Name = "NDD_CMD_VALUE_COMP";
|
||||
@@ -385,7 +402,7 @@ NDT_Status Module_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Nod
|
||||
int rc;
|
||||
|
||||
|
||||
rc = Value1->Id - Value2->Id;
|
||||
rc = Module1_Ptr->Id - Module2_Ptr->Id;
|
||||
|
||||
if( rc < 0)
|
||||
{
|
||||
@@ -415,10 +432,14 @@ NDT_Status Module_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Nod
|
||||
case NDD_CMD_VALUE_ADD:
|
||||
{
|
||||
/*
|
||||
void *Value_Ptr = (void *)va_arg( Args, void *);
|
||||
va_list user_args = (va_list)va_arg( Args, va_list);
|
||||
user_type user_data = (user_type)va_arg( user_args, user_type);
|
||||
... = (...)va_arg( user_args, ...);
|
||||
ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *);
|
||||
|
||||
ND_VA_LIST_OPEN( user_args, *Args_Ptr);
|
||||
|
||||
ND_VA_ARG_GET( user_data, user_args, user_type);
|
||||
ND_VA_ARG_GET( ..., user_args, ...);
|
||||
|
||||
ND_VA_LIST_CLOSE( user_args);
|
||||
*/
|
||||
|
||||
|
||||
@@ -430,10 +451,14 @@ NDT_Status Module_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Nod
|
||||
case NDD_CMD_VALUE_REMOVE:
|
||||
{
|
||||
/*
|
||||
void *Value_Ptr = (void *)va_arg( Args, void *);
|
||||
va_list user_args = (va_list)va_arg( Args, va_list);
|
||||
user_type user_data = (user_type)va_arg( user_args, user_type);
|
||||
... = (...)va_arg( user_args, ...);
|
||||
ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *);
|
||||
|
||||
ND_VA_LIST_OPEN( user_args, *Args_Ptr);
|
||||
|
||||
ND_VA_ARG_GET( user_data, user_args, user_type);
|
||||
ND_VA_ARG_GET( ..., user_args, ...);
|
||||
|
||||
ND_VA_LIST_CLOSE( user_args);
|
||||
*/
|
||||
|
||||
|
||||
@@ -444,22 +469,35 @@ NDT_Status Module_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Nod
|
||||
case NDD_CMD_VALUE_PRINT:
|
||||
{
|
||||
/*
|
||||
NDT_Node *Next_Node_Ptr = (NDT_Node *)va_arg( Args, NDT_Node *);
|
||||
va_list lib_args = (va_list)va_arg( Args, va_list);
|
||||
FILE *Out = (FILE *)va_arg( lib_args, FILE *);
|
||||
NDT_Recursive_Mode Recursive_Mode = (NDT_Recursive_Mode)va_arg( lib_args, NDT_Recursive_Mode);
|
||||
NDT_Recursive_Depth Recursive_Depth = (NDT_Recursive_Depth)va_arg( lib_args, NDT_Recursive_Depth);
|
||||
va_list user_args = (va_list)va_arg( lib_args, va_list);
|
||||
user_type user_data = (user_type)va_arg( user_args, user_type);
|
||||
... = (...)va_arg( user_args, ...);
|
||||
ND_VA_ARG_GET( Next_Node_Ptr, *Args_Ptr, NDT_Node *);
|
||||
|
||||
ND_VA_LIST_OPEN( lib_args, *Args_Ptr);
|
||||
|
||||
ND_VA_ARG_GET( Out, lib_args, FILE *);
|
||||
ND_VA_ARG_GET( Recursive_Mode, lib_args, NDT_Recursive_Mode);
|
||||
ND_VA_ARG_GET( Recursive_Depth, lib_args, NDT_Recursive_Depth);
|
||||
ND_VA_ARG_GET( Recursive_Offset, lib_args, NDT_Recursive_Offset);
|
||||
|
||||
ND_VA_LIST_OPEN( user_args, lib_args);
|
||||
|
||||
ND_VA_ARG_GET( user_data, user_args, user_type);
|
||||
ND_VA_ARG_GET( ..., user_args, ...);
|
||||
|
||||
ND_VA_LIST_CLOSE( user_args);
|
||||
ND_VA_LIST_CLOSE( lib_args);
|
||||
|
||||
void *Value_Ptr = Node_Ptr->Value;
|
||||
*/
|
||||
NDT_Node *Next_Node_Ptr = (NDT_Node *)va_arg( Args, NDT_Node *);
|
||||
va_list lib_args = (va_list)va_arg( Args, va_list);
|
||||
FILE *Out = (FILE *)va_arg( lib_args, FILE *);
|
||||
NDT_Recursive_Mode Recursive_Mode = (NDT_Recursive_Mode)va_arg( lib_args, NDT_Recursive_Mode);
|
||||
NDT_Recursive_Depth Recursive_Depth = (NDT_Recursive_Depth)va_arg( lib_args, NDT_Recursive_Depth);
|
||||
ND_VA_ARG_GET( Next_Node_Ptr, *Args_Ptr, NDT_Node *);
|
||||
|
||||
ND_VA_LIST_OPEN( lib_args, *Args_Ptr);
|
||||
|
||||
ND_VA_ARG_GET( Out, lib_args, FILE *);
|
||||
ND_VA_ARG_GET( Recursive_Mode, lib_args, NDT_Recursive_Mode);
|
||||
ND_VA_ARG_GET( Recursive_Depth, lib_args, NDT_Recursive_Depth);
|
||||
ND_VA_ARG_GET( Recursive_Offset, lib_args, NDT_Recursive_Offset);
|
||||
|
||||
ND_VA_LIST_CLOSE( lib_args);
|
||||
|
||||
T_Module *Module_Ptr = Node_Ptr->Value;
|
||||
|
||||
@@ -474,16 +512,22 @@ NDT_Status Module_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Nod
|
||||
case NDD_CMD_INFO_PRINT:
|
||||
{
|
||||
/*
|
||||
NDT_Node *Next_Node_Ptr = (NDT_Node *)va_arg( Args, NDT_Node *);
|
||||
va_list lib_args = (va_list)va_arg( Args, va_list);
|
||||
FILE *Out = (FILE *)va_arg( lib_args, FILE *);
|
||||
NDT_Recursive_Mode Recursive_Mode = (NDT_Recursive_Mode)va_arg( lib_args, NDT_Recursive_Mode);
|
||||
NDT_Recursive_Depth Recursive_Depth = (NDT_Recursive_Depth)va_arg( lib_args, NDT_Recursive_Depth);
|
||||
va_list user_args = (va_list)va_arg( lib_args, va_list);
|
||||
user_type user_data = (user_type)va_arg( user_args, user_type);
|
||||
... = (...)va_arg( user_args, ...);
|
||||
ND_VA_ARG_GET( Next_Node_Ptr, *Args_Ptr, NDT_Node *);
|
||||
|
||||
void *Value_Ptr = Node_Ptr->Value;
|
||||
ND_VA_LIST_OPEN( lib_args, *Args_Ptr);
|
||||
|
||||
ND_VA_ARG_GET( Out, lib_args, FILE *);
|
||||
ND_VA_ARG_GET( Recursive_Mode, lib_args, NDT_Recursive_Mode);
|
||||
ND_VA_ARG_GET( Recursive_Depth, lib_args, NDT_Recursive_Depth);
|
||||
ND_VA_ARG_GET( Recursive_Offset, lib_args, NDT_Recursive_Offset);
|
||||
|
||||
ND_VA_LIST_OPEN( user_args, lib_args);
|
||||
|
||||
ND_VA_ARG_GET( user_data, user_args, user_type);
|
||||
ND_VA_ARG_GET( ..., user_args, ...);
|
||||
|
||||
ND_VA_LIST_CLOSE( user_args);
|
||||
ND_VA_LIST_CLOSE( lib_args);
|
||||
*/
|
||||
|
||||
|
||||
@@ -762,13 +806,30 @@ void Command_Exec( NDT_Root **DS_Ptr_Ptr, FILE *File_Output, int Choice, cha
|
||||
{
|
||||
Command_Exec_Begin_Print( File_Output, Choice);
|
||||
|
||||
if( Arg1 == NULL)
|
||||
{
|
||||
fprintf( File_Output, "DataStruct_Open: Symbol Lookup ( 0:OFF | 1:ON) ? ");
|
||||
fgets( buf, BUF_LEN, File_Input);
|
||||
|
||||
Arg1 = buf;
|
||||
}
|
||||
|
||||
Choice = atoi( Arg1);
|
||||
|
||||
for( i = 0; i < INDEX_NB; i++)
|
||||
{
|
||||
idx_type_tab[i] = NDD_INDEX_STATUS_CLOSED;
|
||||
}
|
||||
|
||||
t_start( t_exec);
|
||||
if( Choice == 0)
|
||||
{
|
||||
ND_DataStruct_Open( DS_Ptr_Ptr, INDEX_NB, idx_type_tab, "Module_Manager", Module_Manager, NULL, NULL, NULL, NULL, NDD_TRUE, NULL);
|
||||
}
|
||||
else
|
||||
{
|
||||
ND_DataStruct_Open( DS_Ptr_Ptr, INDEX_NB, idx_type_tab, "Module_Manager", NULL, NULL, NULL, NULL, NULL, NDD_TRUE, NULL);
|
||||
}
|
||||
t_stop( t_exec);
|
||||
|
||||
Command_Exec_End_Print( File_Output, Choice, t_exec, 1);
|
||||
|
||||
10
util/test-10-s.ndb
Normal file
10
util/test-10-s.ndb
Normal file
@@ -0,0 +1,10 @@
|
||||
Lib_Open 0
|
||||
DS_Open 1
|
||||
Index_List_Open 0-0
|
||||
DS_Value_Add 1-10 0
|
||||
DS_Value_Find 1-10
|
||||
Index_List_To_Tree 0-0
|
||||
DS_Value_Find 1-10
|
||||
DS_Check
|
||||
DS_Close
|
||||
Lib_Close
|
||||
@@ -1,5 +1,5 @@
|
||||
Lib_Open 0
|
||||
DS_Open
|
||||
DS_Open 0
|
||||
Index_List_Open 0-0
|
||||
DS_Value_Add 1-10 0
|
||||
DS_Value_Find 1-10
|
||||
|
||||
10
util/test-100K-s.ndb
Normal file
10
util/test-100K-s.ndb
Normal file
@@ -0,0 +1,10 @@
|
||||
Lib_Open 0
|
||||
DS_Open 1
|
||||
Index_List_Open 0-0
|
||||
DS_Value_Add 1-100000 0
|
||||
DS_Value_Find 49900-50100
|
||||
Index_List_To_Tree 0-0
|
||||
DS_Value_Find 1-100000
|
||||
DS_Check
|
||||
DS_Close
|
||||
Lib_Close
|
||||
@@ -1,5 +1,5 @@
|
||||
Lib_Open 0
|
||||
DS_Open
|
||||
DS_Open 0
|
||||
Index_List_Open 0-0
|
||||
DS_Value_Add 1-100000 0
|
||||
DS_Value_Find 49900-50100
|
||||
|
||||
10
util/test-10K-s.ndb
Normal file
10
util/test-10K-s.ndb
Normal file
@@ -0,0 +1,10 @@
|
||||
Lib_Open 0
|
||||
DS_Open 1
|
||||
Index_List_Open 0-0
|
||||
DS_Value_Add 1-10000 0
|
||||
DS_Value_Find 4000-6000
|
||||
Index_List_To_Tree 0-0
|
||||
DS_Value_Find 1-10000
|
||||
DS_Check
|
||||
DS_Close
|
||||
Lib_Close
|
||||
@@ -1,5 +1,5 @@
|
||||
Lib_Open 0
|
||||
DS_Open
|
||||
DS_Open 0
|
||||
Index_List_Open 0-0
|
||||
DS_Value_Add 1-10000 0
|
||||
DS_Value_Find 4000-6000
|
||||
|
||||
10
util/test-1M-s.ndb
Normal file
10
util/test-1M-s.ndb
Normal file
@@ -0,0 +1,10 @@
|
||||
Lib_Open 0
|
||||
DS_Open 1
|
||||
Index_List_Open 0-0
|
||||
DS_Value_Add 1-1000000 0
|
||||
DS_Value_Find 499990-500010
|
||||
Index_List_To_Tree 0-0
|
||||
DS_Value_Find 1-1000000
|
||||
DS_Check
|
||||
DS_Close
|
||||
Lib_Close
|
||||
@@ -1,5 +1,5 @@
|
||||
Lib_Open 0
|
||||
DS_Open
|
||||
DS_Open 0
|
||||
Index_List_Open 0-0
|
||||
DS_Value_Add 1-1000000 0
|
||||
DS_Value_Find 499990-500010
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
Batch_Run test-error.ndb
|
||||
Batch_Run test-10.ndb
|
||||
Batch_Run test-10-s.ndb
|
||||
Batch_Run test-10K.ndb
|
||||
Batch_Run test-10K-s.ndb
|
||||
Batch_Run test-100K.ndb
|
||||
Batch_Run test-100K-s.ndb
|
||||
Batch_Run test-1M.ndb
|
||||
Batch_Run test-1M-s.ndb
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
DS_Open
|
||||
DS_Open 0
|
||||
Lib_Open 0
|
||||
DS_Open
|
||||
DS_Open 0
|
||||
Index_List_Open 0-0
|
||||
DS_Value_Add 1-10 0
|
||||
Lib_Close
|
||||
Lib_Open 1
|
||||
DS_Open
|
||||
DS_Open 0
|
||||
Index_List_Open 0-0
|
||||
DS_Value_Add 1-10 0
|
||||
Index_Value_Break 0-0 0
|
||||
|
||||
Reference in New Issue
Block a user