From 68d2ce69b82123d07f1b7c4b74ad5982b2668aa3 Mon Sep 17 00:00:00 2001 From: Winter Date: Sat, 30 Jan 2016 13:23:36 +0100 Subject: [PATCH] mtapi_c: added missing fields in mtapi_info_t structure --- mtapi_c/include/embb/mtapi/c/mtapi.h | 18 ++++++++++++++++-- mtapi_c/src/embb_mtapi_node_t.c | 5 +++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/mtapi_c/include/embb/mtapi/c/mtapi.h b/mtapi_c/include/embb/mtapi/c/mtapi.h index 65379b8..a146def 100644 --- a/mtapi_c/include/embb/mtapi/c/mtapi.h +++ b/mtapi_c/include/embb/mtapi/c/mtapi.h @@ -307,8 +307,22 @@ typedef mtapi_uint_t mtapi_size_t; * \ingroup RUNTIME_INIT_SHUTDOWN */ struct mtapi_info_struct { - unsigned int hardware_concurrency; /**< number of CPU cores */ - unsigned int used_memory; /**< bytes of memory used by MTAPI */ + mtapi_uint_t mtapi_version; /**< The three last (rightmost) hex + digits are the minor number, and + those left of the minor number are + the major number. */ + mtapi_uint_t organization_id; /**< Implementation vendor or + organization ID. */ + mtapi_uint_t implementation_version; /**< The three last (rightmost) hex + digits are the minor number, and + those left of the minor number are + the major number.*/ + mtapi_uint_t number_of_domains; /**< Number of domains allowed by the + implementation.*/ + mtapi_uint_t number_of_nodes; /**< Number of nodes allowed by the + implementation.*/ + mtapi_uint_t hardware_concurrency; /**< Number of CPU cores available. */ + mtapi_uint_t used_memory; /**< Bytes of memory used by MTAPI. */ }; /** diff --git a/mtapi_c/src/embb_mtapi_node_t.c b/mtapi_c/src/embb_mtapi_node_t.c index 9f60cd8..7e6e23c 100644 --- a/mtapi_c/src/embb_mtapi_node_t.c +++ b/mtapi_c/src/embb_mtapi_node_t.c @@ -120,6 +120,11 @@ void mtapi_initialize( node->scheduler = embb_mtapi_scheduler_new(); if (MTAPI_NULL != node->scheduler) { /* fill information structure */ + node->info.mtapi_version = 0x1000; // mtapi version 1.0 + node->info.organization_id = 0x4711; // TODO(marcus): change to real id + node->info.implementation_version = 0x0003; // implementation version 0.3 + node->info.number_of_domains = 1; + node->info.number_of_nodes = 1; node->info.hardware_concurrency = embb_core_count_available(); node->info.used_memory = embb_mtapi_alloc_get_bytes_allocated(); if (MTAPI_NULL != mtapi_info) { -- libgit2 0.26.0