1
1
/* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
2
2
/*
3
- * Copyright (c) 2020-2023 Triad National Security, LLC
3
+ * Copyright (c) 2020-2024 Triad National Security, LLC
4
4
* All rights reserved.
5
5
*
6
6
* Copyright (c) 2020-2021 Lawrence Livermore National Security, LLC
@@ -410,9 +410,7 @@ qvi_global_split_get_cpuset(
410
410
hwloc_cpuset_t *result
411
411
) {
412
412
// This shouldn't happen.
413
- if (gsplit.hwpools .size () == 0 ) {
414
- abort ();
415
- }
413
+ assert (gsplit.hwpools .size () != 0 );
416
414
417
415
int rc = qvi_hwloc_bitmap_calloc (result);
418
416
if (rc != QV_SUCCESS) return rc;
@@ -460,7 +458,8 @@ scope_init(
460
458
qvi_group_t *group,
461
459
qvi_hwpool_t *hwpool
462
460
) {
463
- if (!rmi || !hwpool || !scope) abort ();
461
+ assert (rmi && hwpool && scope);
462
+
464
463
scope->rmi = rmi;
465
464
scope->group = group;
466
465
scope->hwpool = hwpool;
@@ -471,15 +470,15 @@ hwloc_const_cpuset_t
471
470
qvi_scope_cpuset_get (
472
471
qv_scope_t *scope
473
472
) {
474
- if (! scope) abort ( );
473
+ assert ( scope);
475
474
return qvi_hwpool_cpuset_get (scope->hwpool );
476
475
}
477
476
478
477
const qvi_hwpool_t *
479
478
qvi_scope_hwpool_get (
480
479
qv_scope_t *scope
481
480
) {
482
- if (! scope) abort ( );
481
+ assert ( scope);
483
482
return scope->hwpool ;
484
483
}
485
484
@@ -488,7 +487,7 @@ qvi_scope_taskid(
488
487
qv_scope_t *scope,
489
488
int *taskid
490
489
) {
491
- if (! scope) abort ( );
490
+ assert ( scope);
492
491
*taskid = scope->group ->id ();
493
492
return QV_SUCCESS;
494
493
}
@@ -498,7 +497,7 @@ qvi_scope_ntasks(
498
497
qv_scope_t *scope,
499
498
int *ntasks
500
499
) {
501
- if (! scope) abort ( );
500
+ assert ( scope);
502
501
*ntasks = scope->group ->size ();
503
502
return QV_SUCCESS;
504
503
}
507
506
qvi_scope_barrier (
508
507
qv_scope_t *scope
509
508
) {
510
- if (! scope) abort ( );
509
+ assert ( scope);
511
510
return scope->group ->barrier ();
512
511
}
513
512
@@ -551,7 +550,7 @@ qvi_group_t *
551
550
qvi_scope_group_get (
552
551
qv_scope_t *scope
553
552
) {
554
- if (! scope) abort ( );
553
+ assert ( scope);
555
554
return scope->group ;
556
555
}
557
556
0 commit comments