Provider ID starts from 1

spacemeshos · Jun 10, 2021 · 3bc7d70 · 3bc7d70
1 parent 4d5aabb
commit 3bc7d70
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/include/api.h b/include/api.h
@@ -25,6 +25,7 @@ extern "C" {
 #define	SPACEMESH_API_ERROR_CANCELED			-4
 #define	SPACEMESH_API_ERROR_NO_COMPOTE_OPTIONS	-5
 #define	SPACEMESH_API_ERROR_INVALID_PARAMETER	-6
+#define	SPACEMESH_API_ERROR_INVALID_PROVIDER_ID	-7
 
 #define	SPACEMESH_API_THROTTLED_MODE	0x00008000
 

diff --git a/src/api.c b/src/api.c
@@ -63,7 +63,7 @@ int scryptPositions(
 	cgpu = spacemesh_api_get_gpu(provider_id);
 
 	if (NULL == cgpu) {
-		return SPACEMESH_API_ERROR_INVALID_PARAMETER;
+		return SPACEMESH_API_ERROR_INVALID_PROVIDER_ID;
 	}
 	if (options & SPACEMESH_API_COMPUTE_LEAFS) {
 		if (NULL == out) {

diff --git a/src/api_internal.cpp b/src/api_internal.cpp
@@ -80,7 +80,11 @@ extern "C" void spacemesh_api_init()
 extern "C" struct cgpu_info * spacemesh_api_get_gpu(int id)
 {
 	spacemesh_api_init();
-	if (id >= 0 && id < s_total_devices) {
+	if (id < 1) {
+		return nullptr;
+	}
+	id--;
+	if (id < s_total_devices) {
 		return &s_gpus[id];
 	}
 	if (id == s_total_devices && s_cpu.available) {
@@ -168,7 +172,7 @@ extern "C" int spacemesh_api_get_providers(
 			else {
 				providers->compute_api = COMPUTE_API_CLASS_VULKAN;
 			}
-			providers->id = i;
+			providers->id = i + 1;
 			memcpy(providers->model, s_gpus[i].name, min(sizeof(providers->model), sizeof(s_gpus[i].name)));
 			providers->model[sizeof(providers->model) - 1] = 0;
 
@@ -179,7 +183,7 @@ extern "C" int spacemesh_api_get_providers(
 
 	if (s_cpu.available && current_providers < max_providers) {
 		providers->compute_api = COMPUTE_API_CLASS_CPU;
-		providers->id = i;
+		providers->id = i + 1;
 		providers->model[0] = 'C';
 		providers->model[1] = 'P';
 		providers->model[2] = 'U';

diff --git a/test/test.cpp b/test/test.cpp
@@ -499,7 +499,7 @@ void do_providers_list()
 		if (spacemesh_api_get_providers(providers, providersCount) == providersCount) {
 			printf("Available POST compute providers:\n");
 			for (int i = 0; i < providersCount; i++) {
-				printf("%3d: [%s] %s\n", i, getProviderClassString(providers[i].compute_api), providers[i].model);
+				printf("%3d: [%s] %s\n", providers[i].id, getProviderClassString(providers[i].compute_api), providers[i].model);
 			}
 		}