Skip to content

Commit b439927

Browse files
hppritchahppritcha
committed
more fixes and copyright updates
Signed-off-by: Howard Pritchard <[email protected]>
1 parent 78ad656 commit b439927

28 files changed

+46
-50
lines changed

‎ompi/include/mpif-sentinels.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
! Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved.
1414
! Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
1515
! Copyright (c) 2025 Jeffrey M. Squyres. All rights reserved.
16+
! Copyright (c) 2025 Triad National Security, LLC. All rights reserved.
1617
! $COPYRIGHT$
1718
!
1819
! Additional copyrights may follow

‎ompi/instance/instance.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
22
/*
3-
* Copyright (c) 2018-2024 Triad National Security, LLC. All rights
3+
* Copyright (c) 2018-2025 Triad National Security, LLC. All rights
44
* reserved.
55
* Copyright (c) 2022 Cisco Systems, Inc. All rights reserved.
66
* Copyright (c) 2022 The University of Tennessee and The University

‎ompi/mca/pml/base/pml_base_bsend.c‎

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
1717
* reserved.
1818
* Copyright (c) 2017 IBM Corporation. All rights reserved.
19-
* Copyright (c) 2018 Triad National Security, LLC. All rights
19+
* Copyright (c) 2018-2025 Triad National Security, LLC. All rights
2020
* reserved.
2121
* $COPYRIGHT$
2222
*
@@ -471,16 +471,6 @@ int mca_pml_base_bsend_flush(ompi_bsend_buffer_type_t type, void *obj)
471471
return ret;
472472
}
473473

474-
#if 0
475-
static int mca_pml_base_bsend_request_free(ompi_request_t ** request)
476-
{
477-
(*request)->req_state = OMPI_REQUEST_INVALID;
478-
OBJ_RELEASE(*request);
479-
*request = MPI_REQUEST_NULL;
480-
return OMPI_SUCCESS;
481-
}
482-
#endif
483-
484474
/*
485475
* TODO: right now treating this as blocking
486476
*/
@@ -527,14 +517,6 @@ int mca_pml_base_bsend_iflush(ompi_bsend_buffer_type_t type, void *obj, ompi_req
527517
break;
528518
}
529519

530-
#if 0
531-
/* Set up request */
532-
flush_request = OBJ_NEW(ompi_request_t);
533-
OMPI_REQUEST_INIT(flush_request, 0);
534-
flush_request->req_type = OMPI_REQUEST_BUF;
535-
flush_request->req_free = mca_pml_base_bsend_request_free;
536-
flush_request->req_status = (ompi_status_public_t){0};
537-
#endif
538520

539521
while(buf_instance->bsend_count != 0) {
540522
opal_condition_wait(&buf_instance->bsend_condition, &buf_instance->bsend_mutex);
@@ -580,8 +562,6 @@ int mca_pml_base_bsend_request_start(ompi_request_t* request)
580562
return OMPI_ERR_BUFFER;
581563
}
582564

583-
OPAL_THREAD_UNLOCK(&buffer->bsend_mutex);
584-
585565
/* The convertor is already initialized in the beginning so we just have to
586566
* pack the data in the newly allocated buffer.
587567
*/
@@ -593,6 +573,7 @@ int mca_pml_base_bsend_request_start(ompi_request_t* request)
593573
&iov,
594574
&iov_count,
595575
&max_data )) < 0) {
576+
OPAL_THREAD_UNLOCK(&buffer->bsend_mutex);
596577
return OMPI_ERROR;
597578
}
598579

@@ -601,6 +582,9 @@ int mca_pml_base_bsend_request_start(ompi_request_t* request)
601582
max_data, sendreq->req_addr );
602583
/* increment count of pending requests */
603584
buffer->bsend_count++;
585+
586+
OPAL_THREAD_UNLOCK(&buffer->bsend_mutex);
587+
604588
}
605589
return OMPI_SUCCESS;
606590
}

‎ompi/mca/pml/base/pml_base_bsend.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Copyright (c) 2004-2005 The Regents of the University of California.
1212
* All rights reserved.
1313
* Copyright (c) 2017 IBM Corporation. All rights reserved.
14-
* Copyright (c) 2018 Triad National Security, LLC. All rights
14+
* Copyright (c) 2018-2025 Triad National Security, LLC. All rights
1515
* reserved.
1616
* $COPYRIGHT$
1717
*

‎ompi/mca/pml/cm/pml_cm_sendreq.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Copyright (c) 2015 Research Organization for Information Science
1616
* and Technology (RIST). All rights reserved.
1717
* Copyright (c) 2017 Intel, Inc. All rights reserved
18-
* Copyright (c) 2021 Triad National Security, LLC. All rights
18+
* Copyright (c) 2021-2025 Triad National Security, LLC. All rights
1919
* reserved.
2020
* $COPYRIGHT$
2121
*

‎ompi/mca/pml/ucx/pml_ucx.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* Copyright (c) 2019 Intel, Inc. All rights reserved.
1010
* Copyright (c) 2022 Amazon.com, Inc. or its affiliates.
1111
* All Rights reserved.
12+
* Copyright (c) 2025 Triad National Security, LLC. All rights reserved.
1213
* $COPYRIGHT$
1314
*
1415
* Additional copyrights may follow

‎ompi/mca/pml/ucx/pml_ucx_request.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
* of Tennessee Research Foundation. All rights
55
* reserved.
66
* Copyright (c) 2022 IBM Corporation. All rights reserved.
7+
* Copyright (c) 2025 Triad National Security, LLC. All rights
8+
* reserved.
79
* $COPYRIGHT$
810
*
911
* Additional copyrights may follow

‎ompi/mpi/c/buffer_attach.c.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* All rights reserved.
1212
* Copyright (c) 2015 Research Organization for Information Science
1313
* and Technology (RIST). All rights reserved.
14-
* Copyright (c) 2024 Triad National Security, LLC. All rights
14+
* Copyright (c) 2024-2025 Triad National Security, LLC. All rights
1515
* reserved.
1616
* $COPYRIGHT$
1717
*

‎ompi/mpi/c/buffer_detach.c.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* All rights reserved.
1212
* Copyright (c) 2015 Research Organization for Information Science
1313
* and Technology (RIST). All rights reserved.
14-
* Copyright (c) 2024 Triad National Security, LLC. All rights
14+
* Copyright (c) 2024-2025 Triad National Security, LLC. All rights
1515
* reserved.
1616
* $COPYRIGHT$
1717
*

‎ompi/mpi/c/buffer_flush.c.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* All rights reserved.
1212
* Copyright (c) 2015 Research Organization for Information Science
1313
* and Technology (RIST). All rights reserved.
14-
* Copyright (c) 2024 Triad National Security, LLC. All rights
14+
* Copyright (c) 2024-2025 Triad National Security, LLC. All rights
1515
* reserved.
1616
* $COPYRIGHT$
1717
*

0 commit comments

Comments
 (0)