- Add DataStruct Handlers,
- Update Open_DataStruct() API.
This commit is contained in:
173
include/node.h
173
include/node.h
@@ -54,9 +54,16 @@
|
||||
# define NDD_TRUE 1
|
||||
# define NDD_FALSE 0
|
||||
|
||||
|
||||
|
||||
/* Helper Macro */
|
||||
|
||||
# define NDD_MIN(A,B) ( ( A > B) ? B : A)
|
||||
# define NDD_MAX(A,B) ( ( A < B) ? B : A)
|
||||
|
||||
# define ND_STRCPY( dest, src, size) strncpy( (dest), (src), (size)); \
|
||||
(dest)[ (size) - 1] = '\0'
|
||||
|
||||
|
||||
|
||||
/*
|
||||
@@ -143,6 +150,32 @@ typedef int NDT_Index_Type;
|
||||
|
||||
|
||||
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
# if defined( _WIN32) && !defined( LIBNODE_STATIC)
|
||||
# ifndef _LIBNODE_C_
|
||||
# define NDD_DLL_API __declspec( dllimport)
|
||||
# else
|
||||
# define NDD_DLL_API __declspec( dllexport)
|
||||
# endif
|
||||
# else
|
||||
# ifdef _LIBNODE_C_
|
||||
# define NDD_DLL_API
|
||||
# else
|
||||
# define NDD_DLL_API extern
|
||||
# endif
|
||||
# endif
|
||||
|
||||
|
||||
|
||||
/* 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)
|
||||
|
||||
|
||||
|
||||
/* 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)
|
||||
@@ -478,14 +511,6 @@ typedef int NDT_Index_Type;
|
||||
|
||||
|
||||
|
||||
/* 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)
|
||||
|
||||
|
||||
|
||||
/* Manager Commands */
|
||||
|
||||
typedef int NDT_Command;
|
||||
@@ -592,27 +617,98 @@ typedef struct NDT_Index
|
||||
struct NDT_Node *Tail; /* Tail node */
|
||||
struct NDT_Node *Save; /* Save pointer (Used by restore function) */
|
||||
|
||||
} NDT_Index;
|
||||
} NDT_Index;
|
||||
|
||||
|
||||
|
||||
/* Handler definitions */
|
||||
|
||||
# define NDD_HANDLER_NAME_LEN 64
|
||||
# define NDD_HANDLER_NAME_SIZE ( NDD_HANDLER_NAME_LEN + 1)
|
||||
|
||||
typedef char *NDT_Handler_Name;
|
||||
|
||||
typedef NDT_Status NDT_Manager_Handler( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Node *Node_Ptr, NDT_Command, va_list *);
|
||||
typedef NDT_Status NDT_Init_Handler( );
|
||||
typedef NDT_Status NDT_Alloc_Handler( void **Data_Ptr_Ptr, NDT_Root *Root_Ptr, size_t Size, void *User_Ptr);
|
||||
typedef NDT_Status NDT_Free_Handler( void *Data_Ptr, NDT_Root *Root_Ptr, void *User_Ptr);
|
||||
typedef NDT_Status NDT_Open_Handler( NDT_Root *Root_Ptr, char *DS_Name, void *User_Ptr);
|
||||
typedef NDT_Status NDT_Close_Handler( NDT_Root *Root_Ptr, void *User_Ptr);
|
||||
typedef NDT_Status NDT_Lock_Handler( NDT_Root *Root_Ptr, void *User_Ptr);
|
||||
typedef NDT_Status NDT_Unlock_Handler( NDT_Root *Root_Ptr, void *User_Ptr);
|
||||
|
||||
|
||||
|
||||
typedef struct NDT_DataStruct_Handlers
|
||||
{
|
||||
char Manager_Name[ NDD_HANDLER_NAME_SIZE]; /* Manager function name */
|
||||
NDT_Manager_Handler *Manager_Ptr; /* Manager function pointer */
|
||||
char Init_Name[ NDD_HANDLER_NAME_SIZE]; /* Init function name */
|
||||
NDT_Init_Handler *Init_Ptr; /* Init function pointer */
|
||||
char Alloc_Name[ NDD_HANDLER_NAME_SIZE]; /* Alloc function name */
|
||||
NDT_Alloc_Handler *Alloc_Ptr; /* Alloc function pointer */
|
||||
char Free_Name[ NDD_HANDLER_NAME_SIZE]; /* Free function name */
|
||||
NDT_Free_Handler *Free_Ptr; /* Free function pointer */
|
||||
char Open_Name[ NDD_HANDLER_NAME_SIZE]; /* Open function name */
|
||||
NDT_Open_Handler *Open_Ptr; /* Open function pointer */
|
||||
char Close_Name[ NDD_HANDLER_NAME_SIZE]; /* Close function name */
|
||||
NDT_Close_Handler *Close_Ptr; /* Close function pointer */
|
||||
char Lock_Name[ NDD_HANDLER_NAME_SIZE]; /* Lock function name */
|
||||
NDT_Lock_Handler *Lock_Ptr; /* Lock function pointer */
|
||||
char Unlock_Name[ NDD_HANDLER_NAME_SIZE]; /* Unlock function name */
|
||||
NDT_Unlock_Handler *Unlock_Ptr; /* Unlock function pointer */
|
||||
} NDT_DataStruct_Handlers;
|
||||
|
||||
|
||||
|
||||
# ifndef _LIBNODE_C_
|
||||
extern NDT_DataStruct_Handlers NDG_Handlers_Default;
|
||||
# endif
|
||||
|
||||
|
||||
|
||||
/*
|
||||
|
||||
Root_Ptr->Manager.Name
|
||||
|
||||
RootPtr->Handlers.Manager_Name
|
||||
|
||||
*/
|
||||
|
||||
/* Root */
|
||||
|
||||
# define NDD_DATASTRUCT_NAME_LEN 64
|
||||
# define NDD_DATASTRUCT_NAME_SIZE ( NDD_DATASTRUCT_NAME_LEN + 1)
|
||||
|
||||
|
||||
|
||||
typedef char *NDT_DataStruct_Name;
|
||||
|
||||
|
||||
|
||||
typedef struct NDT_Root
|
||||
{
|
||||
NDT_Manager *Manager_Ptr; /* Manager function pointer */
|
||||
char Manager_Name[ NDD_MANAGER_NAME_SIZE_MAX]; /* Manager function name */
|
||||
NDT_Allocator *Allocator_Ptr; /* Value allocator function pointer */
|
||||
char Allocator_Name[ NDD_ALLOCATOR_NAME_SIZE_MAX]; /* Value allocator function name */
|
||||
NDT_Deallocator *Deallocator_Ptr; /* Value deallocator function pointer */
|
||||
char Deallocator_Name[ NDD_DEALLOCATOR_NAME_SIZE_MAX]; /* Value deallocator function name */
|
||||
char Name[ NDD_DATASTRUCT_NAME_SIZE];
|
||||
|
||||
short Own_Value; /* Flag indicating if the structure is the node owner */
|
||||
void *User_Ptr; /* User pointer */
|
||||
NDT_DataStruct_Handlers Handlers;
|
||||
|
||||
/* Deprecated Start */
|
||||
NDT_Manager *Manager_Ptr; /* Manager function pointer */
|
||||
char Manager_Name[ NDD_MANAGER_NAME_SIZE_MAX]; /* Manager function name */
|
||||
NDT_Allocator *Allocator_Ptr; /* Value allocator function pointer */
|
||||
char Allocator_Name[ NDD_ALLOCATOR_NAME_SIZE_MAX]; /* Value allocator function name */
|
||||
NDT_Deallocator *Deallocator_Ptr; /* Value deallocator function pointer */
|
||||
char Deallocator_Name[ NDD_DEALLOCATOR_NAME_SIZE_MAX]; /* Value deallocator function name */
|
||||
/* Deprecated End */
|
||||
|
||||
short Own_Value; /* Flag indicating if the structure is the node owner */
|
||||
void *User_Ptr; /* User pointer */
|
||||
|
||||
NDT_Index_Nb Index_Nb;
|
||||
NDT_Index_Nb Index_Open_Count;
|
||||
NDT_Index Index_Tab[ 1];
|
||||
|
||||
} NDT_Root;
|
||||
NDT_Index_Nb Index_Nb;
|
||||
NDT_Index_Nb Index_Open_Count;
|
||||
NDT_Index Index_Tab[ 1];
|
||||
|
||||
} NDT_Root;
|
||||
|
||||
|
||||
|
||||
@@ -625,7 +721,7 @@ typedef struct NDT_DataStruct
|
||||
NDT_Allocator *Allocator_Ptr; /* Value allocator function pointer */
|
||||
NDT_Deallocator *Deallocator_Ptr; /* Value deallocator function pointer */
|
||||
|
||||
} NDT_DataStruct;
|
||||
} NDT_DataStruct;
|
||||
|
||||
|
||||
|
||||
@@ -639,7 +735,7 @@ typedef struct NDT_Node
|
||||
struct NDT_Node *Left;
|
||||
struct NDT_Node *Right;
|
||||
void *Value;
|
||||
} NDT_Node;
|
||||
} NDT_Node;
|
||||
|
||||
|
||||
|
||||
@@ -777,24 +873,6 @@ typedef int NDT_Recursive_Offset;
|
||||
|
||||
|
||||
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
# if defined( _WIN32) && !defined( LIBNODE_STATIC)
|
||||
# ifndef _LIBNODE_C_
|
||||
# define NDD_DLL_API __declspec( dllimport)
|
||||
# else
|
||||
# define NDD_DLL_API __declspec( dllexport)
|
||||
# endif
|
||||
# else
|
||||
# ifndef _LIBNODE_C_
|
||||
# define NDD_DLL_API
|
||||
# else
|
||||
# define NDD_DLL_API extern
|
||||
# endif
|
||||
# endif
|
||||
|
||||
|
||||
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* Library initialisation */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
@@ -830,20 +908,27 @@ NDD_DLL_API NDT_Status ND_Library_StdErr_Set_C( FILE *);
|
||||
/* Create a new data structure */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* (O) Root_Ptr_Ptr: Pointer adress of the new data structure */
|
||||
/* (I) DataStruct_Name: Name of the data structure */
|
||||
/* (I) Index_Nb: Number of index */
|
||||
/* (I) Index_Type_Ptr: Array of Index type (List, tree, ...) */
|
||||
/* (I) Manager_Name: Manager function name */
|
||||
/* (I) Manager_Ptr: Manager function pointer */
|
||||
/* (I) Handlers_Ptr: Pointer to the data structure handlers */
|
||||
|
||||
/* (I) Allocator_Name: Value allocator function name */
|
||||
/* (I) Allocator_Ptr: Value allocator function pointer */
|
||||
/* (I) Deallocator_Name: Value deallocator function name */
|
||||
/* (I) Deallocator_Ptr: Value deallocator function pointer */
|
||||
|
||||
/* (I) Own_Value: Flag indicating if the structure is the node owner */
|
||||
/* (I) Data_Ptr: User pointer */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Open_I( NDT_Root **, NDT_Index_Nb, NDT_Index_Type *, NDT_Manager_Name, NDT_Manager *, NDT_Allocator_Name, NDT_Allocator *, NDT_Deallocator_Name, NDT_Deallocator *, short, void *);
|
||||
NDD_DLL_API NDT_Status ND_DataStruct_Open_C( NDT_Root **, NDT_Index_Nb, NDT_Index_Type *, NDT_Manager_Name, NDT_Manager *, NDT_Allocator_Name, NDT_Allocator *, NDT_Deallocator_Name, NDT_Deallocator *, short, void *);
|
||||
//NDD_DLL_API NDT_Status ND_DataStruct_Open_I( NDT_Root **, NDT_Index_Nb, NDT_Index_Type *, NDT_Manager_Name, NDT_Manager *, NDT_Allocator_Name, NDT_Allocator *, NDT_Deallocator_Name, NDT_Deallocator *, short, void *);
|
||||
//NDD_DLL_API NDT_Status ND_DataStruct_Open_C( NDT_Root **, NDT_Index_Nb, NDT_Index_Type *, NDT_Manager_Name, NDT_Manager *, NDT_Allocator_Name, NDT_Allocator *, NDT_Deallocator_Name, NDT_Deallocator *, short, void *);
|
||||
|
||||
NDT_Status ND_DataStruct_Open_I( NDT_Root **Root_Ptr_Ptr, NDT_DataStruct_Name Name, NDT_Index_Nb Index_Nb, NDT_Index_Type *Type_Ptr, NDT_Manager_Name Manager_Name, NDT_Manager *Manager_Ptr, NDT_DataStruct_Handlers *Handlers_Ptr, short Own_Value, void *Data_Ptr);
|
||||
NDT_Status ND_DataStruct_Open_C( NDT_Root **Root_Ptr_Ptr, NDT_DataStruct_Name Name, NDT_Index_Nb Index_Nb, NDT_Index_Type *Type_Ptr, NDT_Manager_Name Manager_Name, NDT_Manager *Manager_Ptr, NDT_DataStruct_Handlers *Handlers_Ptr, short Own_Value, void *Data_Ptr);
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user