From d6dc2a6ec0fec1860c795c4e9abb2cba975baf37 Mon Sep 17 00:00:00 2001 From: Gilles Grospellier Date: Tue, 11 Feb 2025 19:57:12 +0100 Subject: [PATCH] =?UTF-8?q?[arccore+arcane]=20d=C3=A9place=20les=20classes?= =?UTF-8?q?=20de=20'arccore/serialize'=20du=20namespace=20'Arccore'=20vers?= =?UTF-8?q?=20'Arcane'.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arcane/src/arcane/core/ArcaneTypes.h | 6 +--- .../message_passing/MessagePassingGlobal.h | 7 ++-- .../arccore/serialize/BasicSerializer.cc | 26 +++++++-------- .../arccore/serialize/BasicSerializer.h | 32 ++++++++----------- .../serialize/arccore/serialize/ISerializer.h | 22 +++++++++---- .../arccore/serialize/SerializeGlobal.cc | 9 ++++-- .../arccore/serialize/SerializeGlobal.h | 8 ++--- .../internal/BasicSerializerInternal.h | 10 +++--- 8 files changed, 63 insertions(+), 57 deletions(-) diff --git a/arcane/src/arcane/core/ArcaneTypes.h b/arcane/src/arcane/core/ArcaneTypes.h index ea1430ddc..28b549251 100644 --- a/arcane/src/arcane/core/ArcaneTypes.h +++ b/arcane/src/arcane/core/ArcaneTypes.h @@ -25,15 +25,11 @@ // 'arcane/utils' utilisent des fichiers d'en-tête de 'arcane/core'. C'est // le cas par exemple des fichiers '*AMR*.h'. -namespace Arccore +namespace Arcane { class ISerializer; } -namespace Arcane -{ -using Arccore::ISerializer; -} /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arccore/src/message_passing/arccore/message_passing/MessagePassingGlobal.h b/arccore/src/message_passing/arccore/message_passing/MessagePassingGlobal.h index b9cf7963f..fef9bd5ff 100644 --- a/arccore/src/message_passing/arccore/message_passing/MessagePassingGlobal.h +++ b/arccore/src/message_passing/arccore/message_passing/MessagePassingGlobal.h @@ -30,14 +30,17 @@ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -namespace Arccore +namespace Arcane { class ISerializer; +} +namespace Arccore +{ class ITimeMetricCollector; +using Arcane::ISerializer; } namespace Arcane { -using Arccore::ISerializer; using Arccore::ITimeMetricCollector; } diff --git a/arccore/src/serialize/arccore/serialize/BasicSerializer.cc b/arccore/src/serialize/arccore/serialize/BasicSerializer.cc index d114edfe8..753197edc 100644 --- a/arccore/src/serialize/arccore/serialize/BasicSerializer.cc +++ b/arccore/src/serialize/arccore/serialize/BasicSerializer.cc @@ -1,11 +1,11 @@ // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- //----------------------------------------------------------------------------- -// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com) +// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com) // See the top-level COPYRIGHT file for details. // SPDX-License-Identifier: Apache-2.0 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* BasicSerializer.cc (C) 2000-2024 */ +/* BasicSerializer.cc (C) 2000-2025 */ /* */ /* Implémentation simple de 'ISerializer'. */ /*---------------------------------------------------------------------------*/ @@ -23,7 +23,7 @@ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -namespace Arccore +namespace Arcane { /*---------------------------------------------------------------------------*/ @@ -122,7 +122,7 @@ class BasicSerializerNewImpl Span m_float128_view; //!< Vue les Float128 Span m_int128_view; //!< Vue les Int128 - Int64ArrayView m_sizes_view; //!< Vue pour les tailles (doit être un multiple de ALIGN_SIZE); + ArrayView m_sizes_view; //!< Vue pour les tailles (doit être un multiple de ALIGN_SIZE); /*! * \brief Copie des tailles utilisée pour l'envoie en plusieurs fois. @@ -225,7 +225,7 @@ class BasicSerializerNewImpl _fillPadding(float128_position, padded_float128_size); _fillPadding(int128_position, padded_int128_size); - m_sizes_view = Int64ArrayView(NB_SIZE_ELEM, (Int64*)&m_buffer_view[0]); + m_sizes_view = ArrayView(NB_SIZE_ELEM, (Int64*)&m_buffer_view[0]); m_sizes_view.fill(0); m_sizes_view[IDX_TAG] = SERIALIZE_TAG; @@ -299,7 +299,7 @@ class BasicSerializerNewImpl return m_buffer_view; } - Int64ConstArrayView sizesBuffer() const override + ConstArrayView sizesBuffer() const override { return m_sizes_view; } @@ -307,7 +307,7 @@ class BasicSerializerNewImpl void preallocate(Int64 size) override { _allocBuffer(size); - m_sizes_view = Int64ArrayView(NB_SIZE_ELEM, (Int64*)&m_buffer_view[0]); + m_sizes_view = ArrayView(NB_SIZE_ELEM, (Int64*)&m_buffer_view[0]); } void releaseBuffer() override @@ -365,13 +365,13 @@ class BasicSerializerNewImpl _checkAlignment(); } - ByteConstArrayView copyAndGetSizesBuffer() override + ConstArrayView copyAndGetSizesBuffer() override { // Recopie dans \a m_size_copy_buffer les valeurs de \a m_size_view // et retourne un pointeur sur \a m_size_copy_buffer. - Int64ArrayView copy_buf(NB_SIZE_ELEM, m_size_copy_buffer); + ArrayView copy_buf(NB_SIZE_ELEM, m_size_copy_buffer); copy_buf.copy(m_sizes_view); - ByteConstArrayView bytes(sizeof(m_size_copy_buffer), (const Byte*)m_size_copy_buffer); + ConstArrayView bytes(sizeof(m_size_copy_buffer), (const Byte*)m_size_copy_buffer); return bytes; } @@ -382,7 +382,7 @@ class BasicSerializerNewImpl void printSizes(std::ostream& o) const override { - Int64ConstArrayView sbuf_sizes = this->sizesBuffer(); + ConstArrayView sbuf_sizes = this->sizesBuffer(); Int64 total_size = totalSize(); Span bytes = m_buffer_view; o << " bytes " << bytes.size() @@ -1525,7 +1525,7 @@ globalBuffer() const /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -ByteConstArrayView BasicSerializer:: +ConstArrayView BasicSerializer:: copyAndGetSizesBuffer() { return _p()->copyAndGetSizesBuffer(); @@ -1534,7 +1534,7 @@ copyAndGetSizesBuffer() /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -Int64ConstArrayView BasicSerializer:: +ConstArrayView BasicSerializer:: sizesBuffer() { return _p()->sizesBuffer(); diff --git a/arccore/src/serialize/arccore/serialize/BasicSerializer.h b/arccore/src/serialize/arccore/serialize/BasicSerializer.h index ed0ea29c5..036968dce 100644 --- a/arccore/src/serialize/arccore/serialize/BasicSerializer.h +++ b/arccore/src/serialize/arccore/serialize/BasicSerializer.h @@ -28,10 +28,6 @@ namespace Arcane { class BasicSerializeGatherMessage; -} - -namespace Arccore -{ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ @@ -215,31 +211,31 @@ class ARCCORE_SERIALIZE_EXPORT BasicSerializer void putReal(Real value) override { - put(RealConstArrayView(1, &value)); + put(ConstArrayView(1, &value)); } void putInt64(Int64 value) override { - put(Int64ConstArrayView(1, &value)); + put(ConstArrayView(1, &value)); } void putInt32(Int32 value) override { - put(Int32ConstArrayView(1, &value)); + put(ConstArrayView(1, &value)); } void putInt16(Int16 value) override { - put(Int16ConstArrayView(1, &value)); + put(ConstArrayView(1, &value)); } void putInteger(Integer value) override { #ifdef ARCANE_64BIT - put(Int64ConstArrayView(1, &value)); + put(ConstArrayView(1, &value)); #else - put(Int32ConstArrayView(1, &value)); + put(ConstArrayView(1, &value)); #endif } void putByte(Byte value) override { - put(ByteConstArrayView(1, &value)); + put(ConstArrayView(1, &value)); } void putInt8(Int8 value) override { @@ -278,11 +274,11 @@ class ARCCORE_SERIALIZE_EXPORT BasicSerializer void putArray(Span values) override; void putArray(Span values) override; - void get(RealArrayView values) override { ThatClass::getSpan(values); } - void get(Int64ArrayView values) override { ThatClass::getSpan(values); } - void get(Int32ArrayView values) override { ThatClass::getSpan(values); } - void get(Int16ArrayView values) override { ThatClass::getSpan(values); } - void get(ByteArrayView values) override { ThatClass::getSpan(values); } + void get(ArrayView values) override { ThatClass::getSpan(values); } + void get(ArrayView values) override { ThatClass::getSpan(values); } + void get(ArrayView values) override { ThatClass::getSpan(values); } + void get(ArrayView values) override { ThatClass::getSpan(values); } + void get(ArrayView values) override { ThatClass::getSpan(values); } void getSpan(Span values) override; void getSpan(Span values) override; @@ -429,11 +425,11 @@ class ARCCORE_SERIALIZE_EXPORT BasicSerializer public: - ByteConstArrayView copyAndGetSizesBuffer(); + ConstArrayView copyAndGetSizesBuffer(); Span globalBuffer(); Span globalBuffer() const; ARCCORE_DEPRECATED_2020("Do not use. get total size with totalSize()") - Int64ConstArrayView sizesBuffer(); + ConstArrayView sizesBuffer(); Int64 totalSize() const; void preallocate(Int64 size); void releaseBuffer(); diff --git a/arccore/src/serialize/arccore/serialize/ISerializer.h b/arccore/src/serialize/arccore/serialize/ISerializer.h index 54d19ef78..e8c91ba82 100644 --- a/arccore/src/serialize/arccore/serialize/ISerializer.h +++ b/arccore/src/serialize/arccore/serialize/ISerializer.h @@ -23,7 +23,7 @@ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -namespace Arccore +namespace Arcane { /*---------------------------------------------------------------------------*/ @@ -344,19 +344,19 @@ class ARCCORE_SERIALIZE_EXPORT ISerializer //! Récupère le tableau \a values ARCCORE_DEPRECATED_2020("Use getSpan() instead") - virtual void get(RealArrayView values) = 0; + virtual void get(ArrayView values) = 0; //! Récupère le tableau \a values ARCCORE_DEPRECATED_2020("Use getSpan() instead") - virtual void get(Int16ArrayView values) = 0; + virtual void get(ArrayView values) = 0; //! Récupère le tableau \a values ARCCORE_DEPRECATED_2020("Use getSpan() instead") - virtual void get(Int32ArrayView values) = 0; + virtual void get(ArrayView values) = 0; //! Récupère le tableau \a values ARCCORE_DEPRECATED_2020("Use getSpan() instead") - virtual void get(Int64ArrayView values) = 0; + virtual void get(ArrayView values) = 0; //! Récupère le tableau \a values ARCCORE_DEPRECATED_2020("Use getSpan() instead") - virtual void get(ByteArrayView values) = 0; + virtual void get(ArrayView values) = 0; public: @@ -465,7 +465,15 @@ createSerializer(); /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -} // End namespace Arccore +} // End namespace Arcane + +/*---------------------------------------------------------------------------*/ +/*---------------------------------------------------------------------------*/ + +namespace Arccore +{ +using Arcane::createSerializer; +} /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arccore/src/serialize/arccore/serialize/SerializeGlobal.cc b/arccore/src/serialize/arccore/serialize/SerializeGlobal.cc index 2108d41ba..1551fef56 100644 --- a/arccore/src/serialize/arccore/serialize/SerializeGlobal.cc +++ b/arccore/src/serialize/arccore/serialize/SerializeGlobal.cc @@ -1,11 +1,11 @@ // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- //----------------------------------------------------------------------------- -// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com) +// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com) // See the top-level COPYRIGHT file for details. // SPDX-License-Identifier: Apache-2.0 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* SerializeGlobal.cc (C) 2000-2024 */ +/* SerializeGlobal.cc (C) 2000-2025 */ /* */ /* Définitions globales de la composante 'Serialize' de 'Arccore'. */ /*---------------------------------------------------------------------------*/ @@ -17,7 +17,10 @@ #include "arccore/base/Span.h" #include "arccore/base/BasicDataType.h" -namespace Arccore +/*---------------------------------------------------------------------------*/ +/*---------------------------------------------------------------------------*/ + +namespace Arcane { /*---------------------------------------------------------------------------*/ diff --git a/arccore/src/serialize/arccore/serialize/SerializeGlobal.h b/arccore/src/serialize/arccore/serialize/SerializeGlobal.h index e2373943d..f66af13c5 100644 --- a/arccore/src/serialize/arccore/serialize/SerializeGlobal.h +++ b/arccore/src/serialize/arccore/serialize/SerializeGlobal.h @@ -30,7 +30,7 @@ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -namespace Arccore +namespace Arcane { /*---------------------------------------------------------------------------*/ @@ -47,10 +47,10 @@ class BasicSerializer; /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -namespace Arcane +namespace Arccore { -using Arccore::ISerializer; -using Arccore::BasicSerializer; +using Arcane::ISerializer; +using Arcane::BasicSerializer; } /*---------------------------------------------------------------------------*/ diff --git a/arccore/src/serialize/arccore/serialize/internal/BasicSerializerInternal.h b/arccore/src/serialize/arccore/serialize/internal/BasicSerializerInternal.h index 8d9aefd13..ac986a8d7 100644 --- a/arccore/src/serialize/arccore/serialize/internal/BasicSerializerInternal.h +++ b/arccore/src/serialize/arccore/serialize/internal/BasicSerializerInternal.h @@ -1,11 +1,11 @@ // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- //----------------------------------------------------------------------------- -// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com) +// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com) // See the top-level COPYRIGHT file for details. // SPDX-License-Identifier: Apache-2.0 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* BasicSerializerInternal.h (C) 2000-2024 */ +/* BasicSerializerInternal.h (C) 2000-2025 */ /* */ /* Partie interne de 'BasicSerializer'. */ /*---------------------------------------------------------------------------*/ @@ -20,7 +20,7 @@ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -namespace Arccore +namespace Arcane { /*---------------------------------------------------------------------------*/ @@ -52,8 +52,8 @@ class ARCCORE_SERIALIZE_EXPORT BasicSerializer::Impl virtual void copy(Impl* rhs) = 0; virtual Span globalBuffer() = 0; virtual Span globalBuffer() const = 0; - virtual Int64ConstArrayView sizesBuffer() const = 0; - virtual ByteConstArrayView copyAndGetSizesBuffer() = 0; + virtual ConstArrayView sizesBuffer() const = 0; + virtual ConstArrayView copyAndGetSizesBuffer() = 0; virtual void preallocate(Int64 size) = 0; virtual void releaseBuffer() = 0; virtual void setFromSizes() = 0;