View | Details | Raw Unified | Return to bug 2726
Collapse All | Expand All

(-)a/src/mpi/model/null-message-mpi-interface.cc (-1 / +5 lines)
 Lines 145-152    Link Here 
145 
NullMessageMpiInterface::Enable (int* pargc, char*** pargv)
 145 
NullMessageMpiInterface::Enable (int* pargc, char*** pargv)
146 
{
 146 
{
147 
  NS_LOG_FUNCTION (this << *pargc);
 147 
  NS_LOG_FUNCTION (this << *pargc);
148 
#ifdef NS3_MPI
149 

          148
          

        

            

              
              
              149
              
#ifndef NS3_MPI

            

            

              150
              
  NS_UNUSED(pargv);

            

            

              151
              
  

            

            

              152
              
#else

            

            

              153
              
  

            

        

          150
          
  // Initialize the MPI interface

          154
          
  // Initialize the MPI interface

        

        

          151
          
  MPI_Init (pargc, pargv);

          155
          
  MPI_Init (pargc, pargv);

        

        

          152
          
  MPI_Barrier (MPI_COMM_WORLD);

          156
          
  MPI_Barrier (MPI_COMM_WORLD);

        



(-)a/src/mpi/model/remote-channel-bundle-manager.cc
      (-2 / +2 lines)




  

    

    

       Lines 59-68
       
    
  Link Here 
    

  

        

          59
          
  return remoteChannelBundle;

          59
          
  return remoteChannelBundle;

        

        

          60
          
}

          60
          
}

        

        

          61
          

          61
          

        

          
            

              62
              
uint32_t 


              62
              
uint32_t

            

        

          63
          
RemoteChannelBundleManager::Size (void) 

          63
          
RemoteChannelBundleManager::Size (void) 

        

        

          64
          
{

          64
          
{

        

          
            

              65
              
  return g_remoteChannelBundles.size();


              65
              
  return static_cast<uint32_t> (g_remoteChannelBundles.size());

            

        

          66
          
}

          66
          
}

        

        

          67
          

          67
          

        

        

          68
          
void

          68
          
void

        



(-)a/src/mpi/model/remote-channel-bundle.cc
      (-3 / +3 lines)




  

    

    

       Lines 40-46
       
    
  Link Here 
    

  

        

          40
          
}

          40
          
}

        

        

          41
          

          41
          

        

        

          42
          
RemoteChannelBundle::RemoteChannelBundle ()

          42
          
RemoteChannelBundle::RemoteChannelBundle ()

        

          
            

              43
              
  : m_remoteSystemId (-1),


              43
              
  : m_remoteSystemId (UINT32_MAX),

            

        

          44
          
    m_guaranteeTime (0),

          44
          
    m_guaranteeTime (0),

        

        

          45
          
    m_delay (NS_TIME_INFINITY)

          45
          
    m_delay (NS_TIME_INFINITY)

        

        

          46
          
{

          46
          
{

        

  

    

    

       Lines 98-107
       
    
  Link Here 
    

  

        

          98
          
  return m_nullEventId;

          98
          
  return m_nullEventId;

        

        

          99
          
}

          99
          
}

        

        

          100
          

          100
          

        

          
            

              101
              
int


              101
              
uint32_t

            

        

          102
          
RemoteChannelBundle::GetSize (void) const

          102
          
RemoteChannelBundle::GetSize (void) const

        

        

          103
          
{

          103
          
{

        

          
            

              104
              
  return m_channels.size ();


              104
              
  return static_cast<uint32_t> (m_channels.size ());

            

        

          105
          
}

          105
          
}

        

        

          106
          

          106
          

        

        

          107
          
void 

          107
          
void 

        



(-)a/src/mpi/model/remote-channel-bundle.h
      (-1 / +1 lines)




  

    

    

       Lines 98-104
       
    
  Link Here 
    

  

        

          98
          
  /**

          98
          
  /**

        

        

          99
          
   * \return number of NS3 channels in this bundle

          99
          
   * \return number of NS3 channels in this bundle

        

        

          100
          
   */

          100
          
   */

        

          
            

              101
              
  int GetSize (void) const;


              101
              
  uint32_t GetSize (void) const;

            

        

          102
          

          102
          

        

        

          103
          
  /**

          103
          
  /**

        

        

          104
          
   * \param time 

          104
          
   * \param time 

        






  

  Return to bug 2726