- Implement Open, Close, Info, Lock & Unlock default handlers,
- Implement Open, Close, Info, Lock & Unlock exec function handlers, - Add Init & Open handler calls in ND_DataStruct_Open(), - Add Info handler call in ND_DataStruct_Info_Print_I(), - Update ND_Node_Root_Alloc().
This commit is contained in:
214
lib/libnode.h
214
lib/libnode.h
@@ -119,41 +119,18 @@ NDT_Base NDG_Base =
|
||||
|
||||
|
||||
|
||||
//{
|
||||
// "", /* Default Manager function name */
|
||||
// NULL, /* Default Manager function pointer */
|
||||
// "", /* Default Init function name */
|
||||
// NULL, /* Default Init function pointer */
|
||||
//
|
||||
//// "ND_Default_Allocator", /* Default Alloc function name */
|
||||
//// ND_Default_Allocator, /* Default Alloc function pointer */
|
||||
//// "ND_Default_Deallocator", /* Default Free function name */
|
||||
//// ND_Default_Deallocator, /* Default Free function pointer */
|
||||
//
|
||||
// "", /* Default Alloc function name */
|
||||
// NULL, /* Default Alloc function pointer */
|
||||
// "", /* Default Free function name */
|
||||
// NULL, /* Default Free function pointer */
|
||||
// "", /* Default Open function name */
|
||||
// NULL, /* Default Open function pointer */
|
||||
// "", /* Default Close function name */
|
||||
// NULL, /* Default Close function pointer */
|
||||
// "", /* Default Lock function name */
|
||||
// NULL, /* Default Lock function pointer */
|
||||
// "", /* Default Unlock function name */
|
||||
// NULL /* Default Unlock function pointer */
|
||||
//};
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/*------------------------------------------------------------------------------*/
|
||||
/* */
|
||||
/*------------------------------------------------------------------------------*/
|
||||
|
||||
#define ND_LIBNODE_OPEN_CHECK() if( NDG_Base.Open_Status != NDD_TRUE) { LG_LOG_ERROR_0( "LibNode library is not opened"); return( NDS_ERRAPI); }
|
||||
#define ND_NOT_NULL_CHECK( ptr, msg) if( !(ptr)) { LG_LOG_ERROR_1( "%s is null", (msg)); return( NDS_ERRAPI); }
|
||||
#define ND_LIBNODE_OPEN_CHECK() if( NDG_Base.Open_Status != NDD_TRUE) { LG_LOG_ERROR_0( "LibNode library is not opened"); return( NDS_ERRAPI); }
|
||||
#define ND_NOT_NULL_CHECK( Ptr, Msg) if( !( Ptr)) { LG_LOG_ERROR_1( "%s is null", ( Msg)); return( NDS_ERRAPI); }
|
||||
|
||||
#define ND_HANDLER_NOT_NULL_CHECK( Function_Name, Function_Ptr) if( ( !( Function_Name)) && ( !( Function_Ptr))) { LG_LOG_ERROR_0( "Undefined function name"); return( NDS_ERRAPI); }
|
||||
#define ND_HANDLER_SYMBOL_FIND( Function_Ptr, Handler_Name, Handler_Ptr) if( ( Handler_Ptr)) { ( Function_Ptr) = ( Handler_Ptr);} \
|
||||
else { if( ND_Symbol_Find( (void **)&( Function_Ptr), ( Handler_Name)) != NDS_OK) { LG_LOG_ERROR_0( "Cant't find free handler function"); return( NDS_KO);}}
|
||||
|
||||
|
||||
|
||||
@@ -225,12 +202,13 @@ NDT_Status ND_Index_Clear( NDT_Root *, NDT_Index_Id);
|
||||
/* (I) Index_Nb: Number of index */
|
||||
/* (I) Index_Type_Ptr: Array of Index type (List, tree, ...) */
|
||||
/* (I) Handlers_Ptr: Pointer to the data structure handlers */
|
||||
/* (I) Root_Extra_Size: Additional size to be allocated with root node */
|
||||
/* (I) Own_Value: Flag indicating if the structure is the node owner */
|
||||
/* (I) Data_Ptr: User pointer */
|
||||
/* (I) User_Ptr: User pointer */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
//NDT_Status ND_Node_Root_Alloc( NDT_Root **, NDT_Index_Nb, NDT_Index_Type[], char *, NDT_Manager *, char *, NDT_Allocator *, char *, NDT_Deallocator *, short, void *);
|
||||
|
||||
NDT_Status ND_Node_Root_Alloc( NDT_Root **Root_Ptr_Ptr, NDT_DataStruct_Name Name, NDT_Index_Nb Index_Nb, NDT_Index_Type *Type_Ptr, NDT_Handler *Handler_Tab, short Own_Value, void *Data_Ptr);
|
||||
NDT_Status ND_Node_Root_Alloc( NDT_Root **Root_Ptr_Ptr, NDT_DataStruct_Name Name, NDT_Index_Nb Index_Nb, NDT_Index_Type *Type_Ptr, NDT_Handler *Handler_Tab, size_t Root_Extra_Size, short Own_Value, void *User_Ptr);
|
||||
|
||||
|
||||
|
||||
@@ -350,41 +328,121 @@ NDT_Status ND_List_Sort( NDT_Root *, NDT_Index_Id);
|
||||
|
||||
|
||||
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* Post prototype global variable definitions */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
NDT_Handler NDG_Handler_Tab_Default[ NDD_HANDLER_NB] =
|
||||
{
|
||||
{ "", /* Default Manager function name */
|
||||
NULL}, /* Default Manager function pointer */
|
||||
{ "", /* Default Init function name */
|
||||
NULL}, /* Default Init function pointer */
|
||||
|
||||
{ "ND_Default_Allocator", /* Default Alloc function name */
|
||||
(NDT_Handler_Function *)ND_Default_Allocator}, /* Default Alloc function pointer */
|
||||
{ "ND_Default_Deallocator", /* Default Free function name */
|
||||
(NDT_Handler_Function *)ND_Default_Deallocator}, /* Default Free function pointer */
|
||||
|
||||
// { "", /* Default Alloc function name */
|
||||
// NULL}, /* Default Alloc function pointer */
|
||||
// { "", /* Default Free function name */
|
||||
// NULL}, /* Default Free function pointer */
|
||||
{ "", /* Default Open function name */
|
||||
NULL}, /* Default Open function pointer */
|
||||
{ "", /* Default Close function name */
|
||||
NULL}, /* Default Close function pointer */
|
||||
{ "", /* Default Lock function name */
|
||||
NULL}, /* Default Lock function pointer */
|
||||
{ "", /* Default Unlock function name */
|
||||
NULL} /* Default Unlock function pointer */
|
||||
};
|
||||
|
||||
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* PRIVATE FUNCTIONS */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* Init handler: */
|
||||
/* - Return extra root size */
|
||||
/* - Update handler tab */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* (O) Root_Extra_Size: Pointer on the extra root size */
|
||||
/* (I) Handler_Tab: Pointer on the handler tab */
|
||||
/* (I) User_Ptr: User pointer */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
NDT_Status ND_Handler_Init_Default( size_t *Root_Extra_Size, NDT_Handler *Handler_Tab, void *User_Ptr);
|
||||
|
||||
|
||||
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* Default alloc handler: */
|
||||
/* malloc() function wrapper with NDT_Status return status */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* (O) Memory_Ptr_Ptr: Memory pointer address */
|
||||
/* (I) Root_Ptr: Data structure pointer */
|
||||
/* (I) Size: Allocation size */
|
||||
/* (I) User_Ptr: User pointer */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
NDT_Status ND_Handler_Alloc_Default( void **Memory_Ptr_Ptr, NDT_Root *Root_Ptr, size_t Size, void *User_Ptr);
|
||||
|
||||
|
||||
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* Default free handler: */
|
||||
/* free() function wrapper with NDT_Status return status */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* (I) Memory_Ptr: Memory pointer */
|
||||
/* (I) Root_Ptr: Data structure pointer */
|
||||
/* (I) User_Ptr: User pointer */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
NDT_Status ND_Handler_Free_Default( void *Memory_Ptr, NDT_Root *Root_Ptr, void *User_Ptr);
|
||||
|
||||
|
||||
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* Default open handler */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* (I) Root_Ptr: Data structure pointer */
|
||||
/* (I) Open_Mode: Open mode */
|
||||
/* (I) Handler_Open_Name: Free handler function name */
|
||||
/* (I) Handler_Open_Ptr: Free handler function pointer */
|
||||
/* (I) User_Ptr: User pointer */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
NDT_Status ND_Handler_Open_Default( NDT_Root *Root_Ptr, NDT_Open_Flag Open_Mode, void *User_Ptr);
|
||||
|
||||
|
||||
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* Default close handler */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* (I) Root_Ptr: Data structure pointer */
|
||||
/* (I) Close_Mode: Close mode */
|
||||
/* (I) Handler_Close_Name: Free handler function name */
|
||||
/* (I) Handler_Close_Ptr: Free handler function pointer */
|
||||
/* (I) User_Ptr: User pointer */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
NDT_Status ND_Handler_Close_Default( NDT_Root *Root_Ptr, NDT_Close_Flag Close_Mode, void *User_Ptr);
|
||||
|
||||
|
||||
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* Default info handler */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* (I) Root_Ptr: Data structure pointer */
|
||||
/* (I) Recursive_Offset: Print line offset */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
NDT_Status ND_Handler_Info_Default( NDT_Root *Root_Ptr, NDT_Recursive_Offset Recursive_Offset);
|
||||
|
||||
|
||||
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* Default lock handler */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* (I) Root_Ptr: Data structure pointer */
|
||||
/* (I) Open_Mode: Lock mode */
|
||||
/* (O) Locked_Ptr: Locked flag */
|
||||
/* (I) Handler_Lock_Name: Free handler function name */
|
||||
/* (I) Handler_Lock_Ptr: Free handler function pointer */
|
||||
/* (I) User_Ptr: User pointer */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
NDT_Status ND_Handler_Lock_Default( NDT_Root *Root_Ptr, NDT_Lock_Flag Lock_Mode, bool *Locked_Ptr, void *User_Ptr);
|
||||
|
||||
|
||||
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* Defalt unlock handler */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* (I) Root_Ptr: Data structure pointer */
|
||||
/* (I) Handler_Unlock_Name: Free handler function name */
|
||||
/* (I) Handler_Unlock_Ptr: Free handler function pointer */
|
||||
/* (I) User_Ptr: User pointer */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
NDT_Status ND_Handler_Unlock_Default( NDT_Root *Root_Ptr, void *User_Ptr);
|
||||
|
||||
|
||||
|
||||
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
void ND_List_Check( NDT_Root *, NDT_Index_Id, int *, int *, FILE *);
|
||||
@@ -422,3 +480,35 @@ NDT_Status ND_Symbol_Find( void **, const char *);
|
||||
void ND_Signal_Trap( int);
|
||||
|
||||
NDT_Status ND_Address_Check( void *);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* Post prototype global variable definitions */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
NDT_Handler NDG_Handler_Tab_Default[ NDD_HANDLER_NB] =
|
||||
{
|
||||
{ "", /* Default Manager function name */
|
||||
NULL}, /* Default Manager function pointer */
|
||||
{ "ND_Handler_Init_Default", /* Default Init function name */
|
||||
( NDT_Handler_Function *)ND_Handler_Init_Default}, /* Default Init function pointer */
|
||||
{ "ND_Handler_Alloc_Default", /* Default Alloc function name */
|
||||
( NDT_Handler_Function *)ND_Handler_Alloc_Default}, /* Default Alloc function pointer */
|
||||
{ "ND_Handler_Free_Default", /* Default Free function name */
|
||||
( NDT_Handler_Function *)ND_Handler_Free_Default}, /* Default Free function pointer */
|
||||
{ "NDT_Handler_Open_Default", /* Default Open function name */
|
||||
( NDT_Handler_Function *)ND_Handler_Open_Default}, /* Default Open function pointer */
|
||||
{ "NDT_Handler_Close_Default", /* Default Close function name */
|
||||
( NDT_Handler_Function *)ND_Handler_Close_Default}, /* Default Close function pointer */
|
||||
{ "NDT_Handler_Info_Default", /* Default Lock function name */
|
||||
( NDT_Handler_Function *)ND_Handler_Info_Default}, /* Default Lock function pointer */
|
||||
{ "NDT_Handler_Lock_Default", /* Default Lock function name */
|
||||
( NDT_Handler_Function *)ND_Handler_Lock_Default}, /* Default Lock function pointer */
|
||||
{ "NDT_Handler_Unlock_Default", /* Default Unlock function name */
|
||||
( NDT_Handler_Function *)ND_Handler_Unlock_Default} /* Default Unlock function pointer */
|
||||
};
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user