finish removing simix.h from C files, and avoid the use of Ptr when not needed

[simgrid.git] / src / smpi / smpi_datatype_derived.cpp

diff --git a/src/smpi/smpi_datatype_derived.cpp b/src/smpi/smpi_datatype_derived.cpp
index 7a8bc0f..4551048 100644 (file)
--- a/src/smpi/smpi_datatype_derived.cpp
+++ b/src/smpi/smpi_datatype_derived.cpp
@@ -1,18 +1,11 @@
-/* smpi_datatype.cpp -- MPI primitives to handle datatypes                      */
-/* Copyright (c) 2009-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* smpi_datatype.cpp -- MPI primitives to handle datatypes                  */
+/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "mc/mc.h"
-#include "private.h"
-
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <string>
+#include "src/smpi/smpi_datatype_derived.hpp"
+#include "src/smpi/smpi_op.hpp"
 
 XBT_LOG_EXTERNAL_CATEGORY(smpi_datatype);
 
@@ -28,20 +21,17 @@ Type_Contiguous::~Type_Contiguous(){
   Datatype::unref(old_type_);
 }
 
-void Type_Contiguous::ref(){
-  old_type_->ref();
-};
 
-void Type_Contiguous::serialize( void* noncontiguous_buf, void *contiguous_buf, 
+void Type_Contiguous::serialize( void* noncontiguous_buf, void *contiguous_buf,
                             int count){
   char* contiguous_buf_char = static_cast<char*>(contiguous_buf);
-  char* noncontiguous_buf_char = static_cast<char*>(noncontiguous_buf)+lb_;
+  char* noncontiguous_buf_char = static_cast<char*>(noncontiguous_buf)+lb();
   memcpy(contiguous_buf_char, noncontiguous_buf_char, count * block_count_ * old_type_->size());
 }
-void Type_Contiguous::unserialize( void* contiguous_buf, void *noncontiguous_buf, 
+void Type_Contiguous::unserialize( void* contiguous_buf, void *noncontiguous_buf,
                               int count, MPI_Op op){
   char* contiguous_buf_char = static_cast<char*>(contiguous_buf);
-  char* noncontiguous_buf_char = static_cast<char*>(noncontiguous_buf)+lb_;
+  char* noncontiguous_buf_char = static_cast<char*>(noncontiguous_buf)+lb();
   int n= count*block_count_;
   if(op!=MPI_OP_NULL)
     op->apply( contiguous_buf_char, noncontiguous_buf_char, &n, old_type_);
@@ -56,22 +46,17 @@ Type_Vector::~Type_Vector(){
   Datatype::unref(old_type_);
 }
 
-void Type_Vector::ref(){
-  old_type_->ref();
-}
-
 
-void Type_Vector::serialize( void* noncontiguous_buf, void *contiguous_buf, 
+void Type_Vector::serialize( void* noncontiguous_buf, void *contiguous_buf,
                             int count){
-  int i;
   char* contiguous_buf_char = static_cast<char*>(contiguous_buf);
   char* noncontiguous_buf_char = static_cast<char*>(noncontiguous_buf);
 
-  for (i = 0; i < block_count_ * count; i++) {
-      if (!(old_type_->flags() & DT_FLAG_DERIVED))
-        memcpy(contiguous_buf_char, noncontiguous_buf_char, block_length_ * old_type_->size());
-      else        
-        old_type_->serialize(noncontiguous_buf_char, contiguous_buf_char, block_length_);
+  for (int i = 0; i < block_count_ * count; i++) {
+    if (not(old_type_->flags() & DT_FLAG_DERIVED))
+      memcpy(contiguous_buf_char, noncontiguous_buf_char, block_length_ * old_type_->size());
+    else
+      old_type_->serialize(noncontiguous_buf_char, contiguous_buf_char, block_length_);
 
     contiguous_buf_char += block_length_*old_type_->size();
     if((i+1)%block_count_ ==0)
@@ -81,14 +66,13 @@ void Type_Vector::serialize( void* noncontiguous_buf, void *contiguous_buf,
   }
 }
 
-void Type_Vector::unserialize( void* contiguous_buf, void *noncontiguous_buf, 
+void Type_Vector::unserialize( void* contiguous_buf, void *noncontiguous_buf,
                               int count, MPI_Op op){
-  int i;
   char* contiguous_buf_char = static_cast<char*>(contiguous_buf);
   char* noncontiguous_buf_char = static_cast<char*>(noncontiguous_buf);
 
-  for (i = 0; i < block_count_ * count; i++) {
-    if (!(old_type_->flags() & DT_FLAG_DERIVED)){
+  for (int i = 0; i < block_count_ * count; i++) {
+    if (not(old_type_->flags() & DT_FLAG_DERIVED)) {
       if(op != MPI_OP_NULL)
         op->apply(contiguous_buf_char, noncontiguous_buf_char, &block_length_,
           old_type_);
@@ -109,18 +93,14 @@ Type_Hvector::Type_Hvector(int size,MPI_Aint lb, MPI_Aint ub, int flags, int cou
 Type_Hvector::~Type_Hvector(){
   Datatype::unref(old_type_);
 }
-void Type_Hvector::ref(){
-  old_type_->ref();
-}
 
-void Type_Hvector::serialize( void* noncontiguous_buf, void *contiguous_buf, 
+void Type_Hvector::serialize( void* noncontiguous_buf, void *contiguous_buf,
                     int count){
-  int i;
   char* contiguous_buf_char = static_cast<char*>(contiguous_buf);
   char* noncontiguous_buf_char = static_cast<char*>(noncontiguous_buf);
 
-  for (i = 0; i < block_count_ * count; i++) {
-    if (!(old_type_->flags() & DT_FLAG_DERIVED))
+  for (int i = 0; i < block_count_ * count; i++) {
+    if (not(old_type_->flags() & DT_FLAG_DERIVED))
       memcpy(contiguous_buf_char, noncontiguous_buf_char, block_length_ * old_type_->size());
     else
       old_type_->serialize( noncontiguous_buf_char, contiguous_buf_char, block_length_);
@@ -134,15 +114,14 @@ void Type_Hvector::serialize( void* noncontiguous_buf, void *contiguous_buf,
 }
 
 
-void Type_Hvector::unserialize( void* contiguous_buf, void *noncontiguous_buf, 
+void Type_Hvector::unserialize( void* contiguous_buf, void *noncontiguous_buf,
                               int count, MPI_Op op){
-  int i;
   char* contiguous_buf_char = static_cast<char*>(contiguous_buf);
   char* noncontiguous_buf_char = static_cast<char*>(noncontiguous_buf);
 
-  for (i = 0; i < block_count_ * count; i++) {
-    if (!(old_type_->flags() & DT_FLAG_DERIVED)){
-      if(op!=MPI_OP_NULL) 
+  for (int i = 0; i < block_count_ * count; i++) {
+    if (not(old_type_->flags() & DT_FLAG_DERIVED)) {
+      if(op!=MPI_OP_NULL)
         op->apply( contiguous_buf_char, noncontiguous_buf_char, &block_length_, old_type_);
     }else
       old_type_->unserialize( contiguous_buf_char, noncontiguous_buf_char, block_length_, op);
@@ -166,23 +145,20 @@ Type_Indexed::Type_Indexed(int size,MPI_Aint lb, MPI_Aint ub, int flags, int cou
 
 Type_Indexed::~Type_Indexed(){
   Datatype::unref(old_type_);
-  if(refcount_==0){
+  if(refcount()==0){
     delete[] block_lengths_;
     delete[] block_indices_;
   }
 }
 
-void Type_Indexed::ref(){
-  old_type_->ref();
-}
 
-void Type_Indexed::serialize( void* noncontiguous_buf, void *contiguous_buf, 
+void Type_Indexed::serialize( void* noncontiguous_buf, void *contiguous_buf,
                         int count){
   char* contiguous_buf_char = static_cast<char*>(contiguous_buf);
   char* noncontiguous_buf_char = static_cast<char*>(noncontiguous_buf)+block_indices_[0] * old_type_->size();
   for (int j = 0; j < count; j++) {
     for (int i = 0; i < block_count_; i++) {
-      if (!(old_type_->flags() & DT_FLAG_DERIVED))
+      if (not(old_type_->flags() & DT_FLAG_DERIVED))
         memcpy(contiguous_buf_char, noncontiguous_buf_char, block_lengths_[i] * old_type_->size());
       else
         old_type_->serialize( noncontiguous_buf_char, contiguous_buf_char, block_lengths_[i]);
@@ -199,15 +175,15 @@ void Type_Indexed::serialize( void* noncontiguous_buf, void *contiguous_buf,
 }
 
 
-void Type_Indexed::unserialize( void* contiguous_buf, void *noncontiguous_buf, 
+void Type_Indexed::unserialize( void* contiguous_buf, void *noncontiguous_buf,
                       int count, MPI_Op op){
   char* contiguous_buf_char = static_cast<char*>(contiguous_buf);
   char* noncontiguous_buf_char =
     static_cast<char*>(noncontiguous_buf)+block_indices_[0]*old_type_->get_extent();
   for (int j = 0; j < count; j++) {
     for (int i = 0; i < block_count_; i++) {
-      if (!(old_type_->flags() & DT_FLAG_DERIVED)){
-        if(op!=MPI_OP_NULL) 
+      if (not(old_type_->flags() & DT_FLAG_DERIVED)) {
+        if(op!=MPI_OP_NULL)
           op->apply( contiguous_buf_char, noncontiguous_buf_char, &block_lengths_[i],
                     old_type_);
       }else
@@ -238,22 +214,19 @@ Type_Hindexed::Type_Hindexed(int size,MPI_Aint lb, MPI_Aint ub, int flags, int c
 
     Type_Hindexed::~Type_Hindexed(){
   Datatype::unref(old_type_);
-  if(refcount_==0){
+  if(refcount()==0){
     delete[] block_lengths_;
     delete[] block_indices_;
   }
 }
 
-void Type_Hindexed::ref(){
-  old_type_->ref();
-}
-void Type_Hindexed::serialize( void* noncontiguous_buf, void *contiguous_buf, 
+void Type_Hindexed::serialize( void* noncontiguous_buf, void *contiguous_buf,
                 int count){
   char* contiguous_buf_char = static_cast<char*>(contiguous_buf);
   char* noncontiguous_buf_char = static_cast<char*>(noncontiguous_buf)+ block_indices_[0];
   for (int j = 0; j < count; j++) {
     for (int i = 0; i < block_count_; i++) {
-      if (!(old_type_->flags() & DT_FLAG_DERIVED))
+      if (not(old_type_->flags() & DT_FLAG_DERIVED))
         memcpy(contiguous_buf_char, noncontiguous_buf_char, block_lengths_[i] * old_type_->size());
       else
         old_type_->serialize(noncontiguous_buf_char, contiguous_buf_char,block_lengths_[i]);
@@ -268,14 +241,14 @@ void Type_Hindexed::serialize( void* noncontiguous_buf, void *contiguous_buf,
   }
 }
 
-void Type_Hindexed::unserialize( void* contiguous_buf, void *noncontiguous_buf, 
+void Type_Hindexed::unserialize( void* contiguous_buf, void *noncontiguous_buf,
                           int count, MPI_Op op){
   char* contiguous_buf_char = static_cast<char*>(contiguous_buf);
   char* noncontiguous_buf_char = static_cast<char*>(noncontiguous_buf)+ block_indices_[0];
   for (int j = 0; j < count; j++) {
     for (int i = 0; i < block_count_; i++) {
-      if (!(old_type_->flags() & DT_FLAG_DERIVED)){
-        if(op!=MPI_OP_NULL) 
+      if (not(old_type_->flags() & DT_FLAG_DERIVED)) {
+        if(op!=MPI_OP_NULL)
           op->apply( contiguous_buf_char, noncontiguous_buf_char, &block_lengths_[i],
                             old_type_);
       }else
@@ -307,26 +280,21 @@ Type_Struct::~Type_Struct(){
   for (int i = 0; i < block_count_; i++) {
     Datatype::unref(old_types_[i]);
   }
-  if(refcount_==0){
+  if(refcount()==0){
     delete[] block_lengths_;
     delete[] block_indices_;
     delete[] old_types_;
   }
 }
 
-void Type_Struct::ref(){
-  for (int i = 0; i < block_count_; i++) {
-    old_types_[i]->ref();
-  }
-}
 
-void Type_Struct::serialize( void* noncontiguous_buf, void *contiguous_buf, 
+void Type_Struct::serialize( void* noncontiguous_buf, void *contiguous_buf,
                         int count){
   char* contiguous_buf_char = static_cast<char*>(contiguous_buf);
   char* noncontiguous_buf_char = static_cast<char*>(noncontiguous_buf)+ block_indices_[0];
   for (int j = 0; j < count; j++) {
     for (int i = 0; i < block_count_; i++) {
-      if (!(old_types_[i]->flags() & DT_FLAG_DERIVED))
+      if (not(old_types_[i]->flags() & DT_FLAG_DERIVED))
         memcpy(contiguous_buf_char, noncontiguous_buf_char, block_lengths_[i] * old_types_[i]->size());
       else
         old_types_[i]->serialize( noncontiguous_buf_char,contiguous_buf_char,block_lengths_[i]);
@@ -342,14 +310,14 @@ void Type_Struct::serialize( void* noncontiguous_buf, void *contiguous_buf,
   }
 }
 
-void Type_Struct::unserialize( void* contiguous_buf, void *noncontiguous_buf, 
+void Type_Struct::unserialize( void* contiguous_buf, void *noncontiguous_buf,
                               int count, MPI_Op op){
   char* contiguous_buf_char = static_cast<char*>(contiguous_buf);
   char* noncontiguous_buf_char = static_cast<char*>(noncontiguous_buf)+ block_indices_[0];
   for (int j = 0; j < count; j++) {
     for (int i = 0; i < block_count_; i++) {
-      if (!(old_types_[i]->flags() & DT_FLAG_DERIVED)){
-        if(op!=MPI_OP_NULL) 
+      if (not(old_types_[i]->flags() & DT_FLAG_DERIVED)) {
+        if(op!=MPI_OP_NULL)
           op->apply( contiguous_buf_char, noncontiguous_buf_char, &block_lengths_[i], old_types_[i]);
       }else
         old_types_[i]->unserialize( contiguous_buf_char, noncontiguous_buf_char,block_lengths_[i], op);
@@ -360,7 +328,7 @@ void Type_Struct::unserialize( void* contiguous_buf, void *noncontiguous_buf,
       else
         noncontiguous_buf_char += block_lengths_[i]*old_types_[i]->get_extent();
     }
-    noncontiguous_buf=reinterpret_cast<void*>(noncontiguous_buf_char);
+    noncontiguous_buf=static_cast<void*>(noncontiguous_buf_char);
   }
 }