Skip to content

Commit efeec5c

Browse files
grospelliergillesgrospelliergilles
authored
Merge pull request #1978 from arcaneframework/dev/gg-move-arccore-serializer-in-namespace-arcane
Move types of component 'arccore/serialize' from namespace `Arccore` to namespace `Arcane`
2 parents 9c86629 + d6dc2a6 commit efeec5c

File tree

8 files changed

+63
-57
lines changed

8 files changed

+63
-57
lines changed

‎arcane/src/arcane/core/ArcaneTypes.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,11 @@
2525
// 'arcane/utils' utilisent des fichiers d'en-tête de 'arcane/core'. C'est
2626
// le cas par exemple des fichiers '*AMR*.h'.
2727

28-
namespace Arccore
28+
namespace Arcane
2929
{
3030
class ISerializer;
3131
}
32-
namespace Arcane
33-
{
34-
using Arccore::ISerializer;
3532

36-
}
3733
/*---------------------------------------------------------------------------*/
3834
/*---------------------------------------------------------------------------*/
3935

‎arccore/src/message_passing/arccore/message_passing/MessagePassingGlobal.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,17 @@
3030
/*---------------------------------------------------------------------------*/
3131
/*---------------------------------------------------------------------------*/
3232

33-
namespace Arccore
33+
namespace Arcane
3434
{
3535
class ISerializer;
36+
}
37+
namespace Arccore
38+
{
3639
class ITimeMetricCollector;
40+
using Arcane::ISerializer;
3741
}
3842
namespace Arcane
3943
{
40-
using Arccore::ISerializer;
4144
using Arccore::ITimeMetricCollector;
4245
}
4346

‎arccore/src/serialize/arccore/serialize/BasicSerializer.cc

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* BasicSerializer.cc (C) 2000-2024 */
8+
/* BasicSerializer.cc (C) 2000-2025 */
99
/* */
1010
/* Implémentation simple de 'ISerializer'. */
1111
/*---------------------------------------------------------------------------*/
@@ -23,7 +23,7 @@
2323
/*---------------------------------------------------------------------------*/
2424
/*---------------------------------------------------------------------------*/
2525

26-
namespace Arccore
26+
namespace Arcane
2727
{
2828

2929
/*---------------------------------------------------------------------------*/
@@ -122,7 +122,7 @@ class BasicSerializerNewImpl
122122
Span<Float128> m_float128_view; //!< Vue les Float128
123123
Span<Int128> m_int128_view; //!< Vue les Int128
124124

125-
Int64ArrayView m_sizes_view; //!< Vue pour les tailles (doit être un multiple de ALIGN_SIZE);
125+
ArrayView<Int64> m_sizes_view; //!< Vue pour les tailles (doit être un multiple de ALIGN_SIZE);
126126

127127
/*!
128128
* \brief Copie des tailles utilisée pour l'envoie en plusieurs fois.
@@ -225,7 +225,7 @@ class BasicSerializerNewImpl
225225
_fillPadding(float128_position, padded_float128_size);
226226
_fillPadding(int128_position, padded_int128_size);
227227

228-
m_sizes_view = Int64ArrayView(NB_SIZE_ELEM, (Int64*)&m_buffer_view[0]);
228+
m_sizes_view = ArrayView<Int64>(NB_SIZE_ELEM, (Int64*)&m_buffer_view[0]);
229229
m_sizes_view.fill(0);
230230

231231
m_sizes_view[IDX_TAG] = SERIALIZE_TAG;
@@ -299,15 +299,15 @@ class BasicSerializerNewImpl
299299
return m_buffer_view;
300300
}
301301

302-
Int64ConstArrayView sizesBuffer() const override
302+
ConstArrayView<Int64> sizesBuffer() const override
303303
{
304304
return m_sizes_view;
305305
}
306306

307307
void preallocate(Int64 size) override
308308
{
309309
_allocBuffer(size);
310-
m_sizes_view = Int64ArrayView(NB_SIZE_ELEM, (Int64*)&m_buffer_view[0]);
310+
m_sizes_view = ArrayView<Int64>(NB_SIZE_ELEM, (Int64*)&m_buffer_view[0]);
311311
}
312312

313313
void releaseBuffer() override
@@ -365,13 +365,13 @@ class BasicSerializerNewImpl
365365
_checkAlignment();
366366
}
367367

368-
ByteConstArrayView copyAndGetSizesBuffer() override
368+
ConstArrayView<Byte> copyAndGetSizesBuffer() override
369369
{
370370
// Recopie dans \a m_size_copy_buffer les valeurs de \a m_size_view
371371
// et retourne un pointeur sur \a m_size_copy_buffer.
372-
Int64ArrayView copy_buf(NB_SIZE_ELEM, m_size_copy_buffer);
372+
ArrayView<Int64> copy_buf(NB_SIZE_ELEM, m_size_copy_buffer);
373373
copy_buf.copy(m_sizes_view);
374-
ByteConstArrayView bytes(sizeof(m_size_copy_buffer), (const Byte*)m_size_copy_buffer);
374+
ConstArrayView<Byte> bytes(sizeof(m_size_copy_buffer), (const Byte*)m_size_copy_buffer);
375375
return bytes;
376376
}
377377

@@ -382,7 +382,7 @@ class BasicSerializerNewImpl
382382

383383
void printSizes(std::ostream& o) const override
384384
{
385-
Int64ConstArrayView sbuf_sizes = this->sizesBuffer();
385+
ConstArrayView<Int64> sbuf_sizes = this->sizesBuffer();
386386
Int64 total_size = totalSize();
387387
Span<Byte> bytes = m_buffer_view;
388388
o << " bytes " << bytes.size()
@@ -1525,7 +1525,7 @@ globalBuffer() const
15251525
/*---------------------------------------------------------------------------*/
15261526
/*---------------------------------------------------------------------------*/
15271527

1528-
ByteConstArrayView BasicSerializer::
1528+
ConstArrayView<Byte> BasicSerializer::
15291529
copyAndGetSizesBuffer()
15301530
{
15311531
return _p()->copyAndGetSizesBuffer();
@@ -1534,7 +1534,7 @@ copyAndGetSizesBuffer()
15341534
/*---------------------------------------------------------------------------*/
15351535
/*---------------------------------------------------------------------------*/
15361536

1537-
Int64ConstArrayView BasicSerializer::
1537+
ConstArrayView<Int64> BasicSerializer::
15381538
sizesBuffer()
15391539
{
15401540
return _p()->sizesBuffer();

‎arccore/src/serialize/arccore/serialize/BasicSerializer.h

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
namespace Arcane
2929
{
3030
class BasicSerializeGatherMessage;
31-
}
32-
33-
namespace Arccore
34-
{
3531

3632
/*---------------------------------------------------------------------------*/
3733
/*---------------------------------------------------------------------------*/
@@ -215,31 +211,31 @@ class ARCCORE_SERIALIZE_EXPORT BasicSerializer
215211

216212
void putReal(Real value) override
217213
{
218-
put(RealConstArrayView(1, &value));
214+
put(ConstArrayView<Real>(1, &value));
219215
}
220216
void putInt64(Int64 value) override
221217
{
222-
put(Int64ConstArrayView(1, &value));
218+
put(ConstArrayView<Int64>(1, &value));
223219
}
224220
void putInt32(Int32 value) override
225221
{
226-
put(Int32ConstArrayView(1, &value));
222+
put(ConstArrayView<Int32>(1, &value));
227223
}
228224
void putInt16(Int16 value) override
229225
{
230-
put(Int16ConstArrayView(1, &value));
226+
put(ConstArrayView<Int16>(1, &value));
231227
}
232228
void putInteger(Integer value) override
233229
{
234230
#ifdef ARCANE_64BIT
235-
put(Int64ConstArrayView(1, &value));
231+
put(ConstArrayView<Int64>(1, &value));
236232
#else
237-
put(Int32ConstArrayView(1, &value));
233+
put(ConstArrayView<Int32>(1, &value));
238234
#endif
239235
}
240236
void putByte(Byte value) override
241237
{
242-
put(ByteConstArrayView(1, &value));
238+
put(ConstArrayView<Byte>(1, &value));
243239
}
244240
void putInt8(Int8 value) override
245241
{
@@ -278,11 +274,11 @@ class ARCCORE_SERIALIZE_EXPORT BasicSerializer
278274
void putArray(Span<const Float128> values) override;
279275
void putArray(Span<const Int128> values) override;
280276

281-
void get(RealArrayView values) override { ThatClass::getSpan(values); }
282-
void get(Int64ArrayView values) override { ThatClass::getSpan(values); }
283-
void get(Int32ArrayView values) override { ThatClass::getSpan(values); }
284-
void get(Int16ArrayView values) override { ThatClass::getSpan(values); }
285-
void get(ByteArrayView values) override { ThatClass::getSpan(values); }
277+
void get(ArrayView<Real> values) override { ThatClass::getSpan(values); }
278+
void get(ArrayView<Int64> values) override { ThatClass::getSpan(values); }
279+
void get(ArrayView<Int32> values) override { ThatClass::getSpan(values); }
280+
void get(ArrayView<Int16> values) override { ThatClass::getSpan(values); }
281+
void get(ArrayView<Byte> values) override { ThatClass::getSpan(values); }
286282

287283
void getSpan(Span<Real> values) override;
288284
void getSpan(Span<Int16> values) override;
@@ -429,11 +425,11 @@ class ARCCORE_SERIALIZE_EXPORT BasicSerializer
429425

430426
public:
431427

432-
ByteConstArrayView copyAndGetSizesBuffer();
428+
ConstArrayView<Byte> copyAndGetSizesBuffer();
433429
Span<Byte> globalBuffer();
434430
Span<const Byte> globalBuffer() const;
435431
ARCCORE_DEPRECATED_2020("Do not use. get total size with totalSize()")
436-
Int64ConstArrayView sizesBuffer();
432+
ConstArrayView<Int64> sizesBuffer();
437433
Int64 totalSize() const;
438434
void preallocate(Int64 size);
439435
void releaseBuffer();

‎arccore/src/serialize/arccore/serialize/ISerializer.h

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/*---------------------------------------------------------------------------*/
2424
/*---------------------------------------------------------------------------*/
2525

26-
namespace Arccore
26+
namespace Arcane
2727
{
2828

2929
/*---------------------------------------------------------------------------*/
@@ -344,19 +344,19 @@ class ARCCORE_SERIALIZE_EXPORT ISerializer
344344

345345
//! Récupère le tableau \a values
346346
ARCCORE_DEPRECATED_2020("Use getSpan() instead")
347-
virtual void get(RealArrayView values) = 0;
347+
virtual void get(ArrayView<Real> values) = 0;
348348
//! Récupère le tableau \a values
349349
ARCCORE_DEPRECATED_2020("Use getSpan() instead")
350-
virtual void get(Int16ArrayView values) = 0;
350+
virtual void get(ArrayView<Int16> values) = 0;
351351
//! Récupère le tableau \a values
352352
ARCCORE_DEPRECATED_2020("Use getSpan() instead")
353-
virtual void get(Int32ArrayView values) = 0;
353+
virtual void get(ArrayView<Int32> values) = 0;
354354
//! Récupère le tableau \a values
355355
ARCCORE_DEPRECATED_2020("Use getSpan() instead")
356-
virtual void get(Int64ArrayView values) = 0;
356+
virtual void get(ArrayView<Int64> values) = 0;
357357
//! Récupère le tableau \a values
358358
ARCCORE_DEPRECATED_2020("Use getSpan() instead")
359-
virtual void get(ByteArrayView values) = 0;
359+
virtual void get(ArrayView<Byte> values) = 0;
360360

361361
public:
362362

@@ -465,7 +465,15 @@ createSerializer();
465465
/*---------------------------------------------------------------------------*/
466466
/*---------------------------------------------------------------------------*/
467467

468-
} // End namespace Arccore
468+
} // End namespace Arcane
469+
470+
/*---------------------------------------------------------------------------*/
471+
/*---------------------------------------------------------------------------*/
472+
473+
namespace Arccore
474+
{
475+
using Arcane::createSerializer;
476+
}
469477

470478
/*---------------------------------------------------------------------------*/
471479
/*---------------------------------------------------------------------------*/

‎arccore/src/serialize/arccore/serialize/SerializeGlobal.cc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* SerializeGlobal.cc (C) 2000-2024 */
8+
/* SerializeGlobal.cc (C) 2000-2025 */
99
/* */
1010
/* Définitions globales de la composante 'Serialize' de 'Arccore'. */
1111
/*---------------------------------------------------------------------------*/
@@ -17,7 +17,10 @@
1717
#include "arccore/base/Span.h"
1818
#include "arccore/base/BasicDataType.h"
1919

20-
namespace Arccore
20+
/*---------------------------------------------------------------------------*/
21+
/*---------------------------------------------------------------------------*/
22+
23+
namespace Arcane
2124
{
2225

2326
/*---------------------------------------------------------------------------*/

‎arccore/src/serialize/arccore/serialize/SerializeGlobal.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
/*---------------------------------------------------------------------------*/
3131
/*---------------------------------------------------------------------------*/
3232

33-
namespace Arccore
33+
namespace Arcane
3434
{
3535

3636
/*---------------------------------------------------------------------------*/
@@ -47,10 +47,10 @@ class BasicSerializer;
4747
/*---------------------------------------------------------------------------*/
4848
/*---------------------------------------------------------------------------*/
4949

50-
namespace Arcane
50+
namespace Arccore
5151
{
52-
using Arccore::ISerializer;
53-
using Arccore::BasicSerializer;
52+
using Arcane::ISerializer;
53+
using Arcane::BasicSerializer;
5454
}
5555

5656
/*---------------------------------------------------------------------------*/

‎arccore/src/serialize/arccore/serialize/internal/BasicSerializerInternal.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* BasicSerializerInternal.h (C) 2000-2024 */
8+
/* BasicSerializerInternal.h (C) 2000-2025 */
99
/* */
1010
/* Partie interne de 'BasicSerializer'. */
1111
/*---------------------------------------------------------------------------*/
@@ -20,7 +20,7 @@
2020
/*---------------------------------------------------------------------------*/
2121
/*---------------------------------------------------------------------------*/
2222

23-
namespace Arccore
23+
namespace Arcane
2424
{
2525

2626
/*---------------------------------------------------------------------------*/
@@ -52,8 +52,8 @@ class ARCCORE_SERIALIZE_EXPORT BasicSerializer::Impl
5252
virtual void copy(Impl* rhs) = 0;
5353
virtual Span<Byte> globalBuffer() = 0;
5454
virtual Span<const Byte> globalBuffer() const = 0;
55-
virtual Int64ConstArrayView sizesBuffer() const = 0;
56-
virtual ByteConstArrayView copyAndGetSizesBuffer() = 0;
55+
virtual ConstArrayView<Int64> sizesBuffer() const = 0;
56+
virtual ConstArrayView<Byte> copyAndGetSizesBuffer() = 0;
5757
virtual void preallocate(Int64 size) = 0;
5858
virtual void releaseBuffer() = 0;
5959
virtual void setFromSizes() = 0;

0 commit comments

Comments
 (0)