Skip to content

Commit ab5dab7

Browse files
committed
Remove pstrg framework
The storage support has never been implemented and there seems little/any real demand - heard lots of interest expressed, but never materialized into actual code. So remove it for now - someone can restore and complete later if they want to pursue it again. Signed-off-by: Ralph Castain <rhc@pmix.org>
1 parent 6493161 commit ab5dab7

25 files changed

+5
-1375
lines changed

docs/developers/frameworks.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ this writing |date|:
3838
during transmission
3939
* ``pstat``: Statistics, including reporting resource usage at the
4040
process, node, and disk levels
41-
* ``pstrg``: Storage system support for querying availability and
42-
characteristics of file systems
4341
* ``ptl``: Transport Layer for client-server and tool-server
4442
communication
4543

src/common/pmix_alloc.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2016-2022 IBM Corporation. All rights reserved.
77
* Copyright (c) 2019 Research Organization for Information Science
88
* and Technology (RIST). All rights reserved.
9-
* Copyright (c) 2021-2023 Nanook Consulting. All rights reserved.
9+
* Copyright (c) 2021-2024 Nanook Consulting All rights reserved.
1010
* Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
1111
* $COPYRIGHT$
1212
*
@@ -25,7 +25,6 @@
2525

2626
#include "src/common/pmix_attributes.h"
2727
#include "src/mca/bfrops/bfrops.h"
28-
#include "src/mca/pstrg/pstrg.h"
2928
#include "src/mca/ptl/base/base.h"
3029
#include "src/threads/pmix_threads.h"
3130
#include "src/util/pmix_argv.h"

src/common/pmix_query.c

Lines changed: 3 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2016-2022 IBM Corporation. All rights reserved.
77
* Copyright (c) 2019 Research Organization for Information Science
88
* and Technology (RIST). All rights reserved.
9-
* Copyright (c) 2021-2023 Nanook Consulting. All rights reserved.
9+
* Copyright (c) 2021-2024 Nanook Consulting All rights reserved.
1010
* Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
1111
* $COPYRIGHT$
1212
*
@@ -25,7 +25,6 @@
2525

2626
#include "src/common/pmix_attributes.h"
2727
#include "src/mca/bfrops/bfrops.h"
28-
#include "src/mca/pstrg/pstrg.h"
2928
#include "src/mca/ptl/base/base.h"
3029
#include "src/threads/pmix_threads.h"
3130
#include "src/util/pmix_argv.h"
@@ -362,50 +361,6 @@ static void _local_relcb(void *cbdata)
362361
PMIX_RELEASE(cd);
363362
}
364363

365-
static void nxtcbfunc(pmix_status_t status, pmix_list_t *results, void *cbdata)
366-
{
367-
pmix_query_caddy_t *cd = (pmix_query_caddy_t *) cbdata;
368-
size_t n;
369-
pmix_kval_t *kv, *kvnxt;
370-
pmix_status_t rc;
371-
372-
/* if they return success, then all queries were locally
373-
* resolved, so construct the results for return */
374-
if (PMIX_SUCCESS == status) {
375-
cd->status = status;
376-
cd->ninfo = pmix_list_get_size(results);
377-
PMIX_INFO_CREATE(cd->info, cd->ninfo);
378-
n = 0;
379-
PMIX_LIST_FOREACH_SAFE (kv, kvnxt, results, pmix_kval_t) {
380-
PMIX_LOAD_KEY(cd->info[n].key, kv->key);
381-
rc = PMIx_Value_xfer(&cd->info[n].value, kv->value);
382-
if (PMIX_SUCCESS != rc) {
383-
cd->status = rc;
384-
PMIX_INFO_FREE(cd->info, cd->ninfo);
385-
break;
386-
}
387-
++n;
388-
}
389-
390-
if (NULL != cd->cbfunc) {
391-
cd->cbfunc(cd->status, cd->info, cd->ninfo, cd->cbdata, _local_relcb, cd);
392-
}
393-
} else {
394-
/* need to ask our host */
395-
rc = request_help(cd);
396-
if (PMIX_SUCCESS != rc) {
397-
/* we have to return the error to the caller */
398-
if (NULL != cd->cbfunc) {
399-
cd->cbfunc(rc, NULL, 0, cd->cbdata, NULL, NULL);
400-
}
401-
}
402-
cd->queries = NULL;
403-
cd->nqueries = 0;
404-
PMIX_RELEASE(cd);
405-
return;
406-
}
407-
}
408-
409364
void pmix_parse_localquery(int sd, short args, void *cbdata)
410365
{
411366
pmix_query_caddy_t *cd = (pmix_query_caddy_t *) cbdata;
@@ -490,7 +445,7 @@ void pmix_parse_localquery(int sd, short args, void *cbdata)
490445
if (PMIX_SUCCESS != rc) {
491446
/* not in our gds */
492447
PMIX_DESTRUCT(&cb);
493-
goto nextstep;
448+
goto complete;
494449
}
495450
}
496451
/* need to retain this result */
@@ -503,12 +458,8 @@ void pmix_parse_localquery(int sd, short args, void *cbdata)
503458
}
504459
}
505460

506-
nextstep:
507-
/* pass the queries thru our active plugins with query
508-
* interfaces to see if someone can resolve it */
509-
rc = pmix_pstrg.query(queries, nqueries, &results, nxtcbfunc, cd);
510-
if (PMIX_OPERATION_SUCCEEDED == rc) {
511461
complete:
462+
if (PMIX_OPERATION_SUCCEEDED == rc) {
512463
/* if we get here, then all queries were locally
513464
* resolved, so construct the results for return */
514465
cd->status = PMIX_SUCCESS;

src/common/pmix_session.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2016-2022 IBM Corporation. All rights reserved.
77
* Copyright (c) 2019 Research Organization for Information Science
88
* and Technology (RIST). All rights reserved.
9-
* Copyright (c) 2021-2023 Nanook Consulting. All rights reserved.
9+
* Copyright (c) 2021-2024 Nanook Consulting All rights reserved.
1010
* Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
1111
* $COPYRIGHT$
1212
*
@@ -25,7 +25,6 @@
2525

2626
#include "src/common/pmix_attributes.h"
2727
#include "src/mca/bfrops/bfrops.h"
28-
#include "src/mca/pstrg/pstrg.h"
2928
#include "src/mca/ptl/base/base.h"
3029
#include "src/threads/pmix_threads.h"
3130
#include "src/util/pmix_argv.h"

src/include/pmix_globals.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,6 @@ static void qcon(pmix_query_caddy_t *p)
497497
p->relcbfunc = NULL;
498498
p->credcbfunc = NULL;
499499
p->validcbfunc = NULL;
500-
p->stqcbfunc = NULL;
501500
}
502501
static void qdes(pmix_query_caddy_t *p)
503502
{

src/include/pmix_globals.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -472,8 +472,6 @@ typedef struct {
472472
} pmix_iof_req_t;
473473
PMIX_CLASS_DECLARATION(pmix_iof_req_t);
474474

475-
typedef void (*pmix_pstrg_query_cbfunc_t)(pmix_status_t status, pmix_list_t *results, void *cbdata);
476-
477475
/* caddy for query requests */
478476
typedef struct {
479477
pmix_object_t super;
@@ -498,7 +496,6 @@ typedef struct {
498496
pmix_release_cbfunc_t relcbfunc;
499497
pmix_credential_cbfunc_t credcbfunc;
500498
pmix_validation_cbfunc_t validcbfunc;
501-
pmix_pstrg_query_cbfunc_t stqcbfunc;
502499
void *cbdata;
503500
} pmix_query_caddy_t;
504501
PMIX_CLASS_DECLARATION(pmix_query_caddy_t);

src/mca/pstrg/Makefile.am

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/mca/pstrg/base/Makefile.am

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/mca/pstrg/base/base.h

Lines changed: 0 additions & 67 deletions
This file was deleted.

src/mca/pstrg/base/pstrg_base_frame.c

Lines changed: 0 additions & 106 deletions
This file was deleted.

0 commit comments

Comments
 (0)