From dbbca69430449fdc8fa05d9a9bb2ac3f89d6577f Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Mon, 27 May 2024 23:12:23 +0200 Subject: [PATCH] - Extend data struct handler tab. --- lib/libshmem.c | 8 ++++---- lib/libshmem.h | 39 ++++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/lib/libshmem.c b/lib/libshmem.c index e3839bc..3af27f2 100644 --- a/lib/libshmem.c +++ b/lib/libshmem.c @@ -2532,7 +2532,7 @@ SMT_Status SM_Base_Init ( void ) // rc = ND_DataStruct_Open( &( SM_Base->MHR), 1, &index_type, "MHR_Manager", NULL, "SM_Base_Alloc", NULL, "SM_Base_Free", NULL, TRUE, NULL); - if( ( rc = ND_DataStruct_Open( &( SM_Base->MHR), "SHM-MHR", 1, &index_type, "MHR_Manager", NULL, &SMG_DataStruct_Handlers, TRUE, NULL)) != NDS_OK) + if( ( rc = ND_DataStruct_Open( &( SM_Base->MHR), "SHM-MHR", 1, &index_type, "MHR_Manager", NULL, SMG_DataStruct_Handlers, TRUE, NULL)) != NDS_OK) { LG_LOG_ERROR_0( "Unable to create the MHR structure"); @@ -3456,7 +3456,7 @@ NDT_Status MHR_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Node // rc = ND_DataStruct_Open( &( ( *MHH_Ptr_Ptr)->DSR), 1, &index_type, "SM_DSR_Manager", NULL, SM_Base->MHR->Allocator_Name, NULL, SM_Base->MHR->Deallocator_Name, NULL, TRUE, NULL); - if( ( rc = ND_DataStruct_Open( &( ( *MHH_Ptr_Ptr)->DSR), "SHM-DSR", 1, &index_type, "SM_DSR_Manager", NULL, &SMG_DataStruct_Handlers, TRUE, NULL)) != NDS_OK) + if( ( rc = ND_DataStruct_Open( &( ( *MHH_Ptr_Ptr)->DSR), "SHM-DSR", 1, &index_type, "SM_DSR_Manager", NULL, SMG_DataStruct_Handlers, TRUE, NULL)) != NDS_OK) { LG_LOG_ERROR_0( "Unable to create the DSR structure"); goto Error4; @@ -3471,7 +3471,7 @@ NDT_Status MHR_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Node // rc = ND_DataStruct_Open( &( ( *MHH_Ptr_Ptr)->ACR), 1, &index_type, "SM_ACR_Manager", NULL, SM_Base->MHR->Allocator_Name, NULL, SM_Base->MHR->Deallocator_Name, NULL, TRUE, NULL); - if( ( rc = ND_DataStruct_Open( &( ( *MHH_Ptr_Ptr)->ACR), "SHM-ACR", 1, &index_type, "SM_ACR_Manager", NULL, &SMG_DataStruct_Handlers, TRUE, NULL)) != NDS_OK) + if( ( rc = ND_DataStruct_Open( &( ( *MHH_Ptr_Ptr)->ACR), "SHM-ACR", 1, &index_type, "SM_ACR_Manager", NULL, SMG_DataStruct_Handlers, TRUE, NULL)) != NDS_OK) { LG_LOG_ERROR_0( "Unable to create the ACR structure"); goto Error5; @@ -3487,7 +3487,7 @@ NDT_Status MHR_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Node // rc = ND_DataStruct_Open( &( ( *MHH_Ptr_Ptr)->FCR), 1, &index_type, "SM_FCR_Manager", NULL, SM_Base->MHR->Allocator_Name, NULL, SM_Base->MHR->Deallocator_Name, NULL, TRUE, NULL); - if( ( rc = ND_DataStruct_Open( &( ( *MHH_Ptr_Ptr)->FCR), "SHM-FCR", 1, &index_type, "SM_FCR_Manager", NULL, &SMG_DataStruct_Handlers, TRUE, NULL)) != NDS_OK) + if( ( rc = ND_DataStruct_Open( &( ( *MHH_Ptr_Ptr)->FCR), "SHM-FCR", 1, &index_type, "SM_FCR_Manager", NULL, SMG_DataStruct_Handlers, TRUE, NULL)) != NDS_OK) { LG_LOG_ERROR_0( "Unable to create the FCR structure"); goto Error6; diff --git a/lib/libshmem.h b/lib/libshmem.h index 34c0c98..7c785f3 100644 --- a/lib/libshmem.h +++ b/lib/libshmem.h @@ -175,34 +175,35 @@ typedef union semun /*------------------------------------------------------------------------------*/ -/* */ +/* LibShMem data struct handlers */ /*------------------------------------------------------------------------------*/ -NDT_DataStruct_Handlers SMG_DataStruct_Handlers = +NDT_Handler SMG_DataStruct_Handlers[ NDD_HANDLER_NB] = { - "", /* Manager function name */ - NULL, /* Manager function pointer */ - "", /* Init function name */ - NULL, /* Init function pointer */ - "SM_Base_Alloc", /* Alloc function name */ - NULL, /* Alloc function pointer */ - "SM_Base_Free", /* Free function name */ - NULL, /* Free function pointer */ - "", /* Open function name */ - NULL, /* Open function pointer */ - "", /* Close function name */ - NULL, /* Close function pointer */ - "", /* Lock function name */ - NULL, /* Lock function pointer */ - "", /* Unlock function name */ - NULL /* Unlock function pointer */ + { "", /* Manager function name */ + NULL}, /* Manager function pointer */ + { "", /* Init function name */ + NULL}, /* Init function pointer */ + { "SM_Base_Alloc", /* Alloc function name */ + NULL}, /* Alloc function pointer */ + { "SM_Base_Free", /* Free function name */ + NULL}, /* Free function pointer */ + { "", /* Open function name */ + NULL}, /* Open function pointer */ + { "", /* Close function name */ + NULL}, /* Close function pointer */ + { "", /* Info function name */ + NULL}, /* Info function pointer */ + { "", /* Lock function name */ + NULL}, /* Lock function pointer */ + { "", /* Unlock function name */ + NULL} /* Unlock function pointer */ }; - /*------------------------------------------------------------------------------*/ /* */ /*------------------------------------------------------------------------------*/