Attachment #2426 for bug #2386

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

(-)a/src/uan/model/acoustic-modem-energy-model.cc (-3 / +45 lines)

Lines 190-195	Link Here

190

191

192

void

192

void

193

AcousticModemEnergyModel::SetEnergyRechargeCallback (

194

  AcousticModemEnergyRechargeCallback callback)

195

196

  NS_LOG_FUNCTION (this);

197

  if (callback.IsNull ())

198

199

      NS_LOG_DEBUG ("AcousticModemEnergyModel:Setting NULL energy recharge callback!");

200

201

  m_energyRechargeCallback = callback;

202

203

204

void

193

AcousticModemEnergyModel::ChangeState (int newState)

205

AcousticModemEnergyModel::ChangeState (int newState)

194

206

195

  NS_LOG_FUNCTION (this << newState);

207

  NS_LOG_FUNCTION (this << newState);

Lines 215-220	Link Here

215

    case UanPhy::SLEEP:

227

    case UanPhy::SLEEP:

216

      energyToDecrease = duration.GetSeconds () * m_sleepPowerW;

228

      energyToDecrease = duration.GetSeconds () * m_sleepPowerW;

217

      break;

229

      break;

230

    case UanPhy::DISABLED:

231

      energyToDecrease = 0;

232

      break;

218

    default:

233

    default:

219

      NS_FATAL_ERROR ("AcousticModemEnergyModel:Undefined radio state!");

234

      NS_FATAL_ERROR ("AcousticModemEnergyModel:Undefined radio state!");

220

235

Lines 228-235	Link Here

228

  // notify energy source

243

  // notify energy source

229

  m_source->UpdateEnergySource ();

244

  m_source->UpdateEnergySource ();

230

245

231

  // update current state & last update time stamp

246

  if (m_currentState != UanPhy::DISABLED)

232

  SetMicroModemState (newState);

247

248

      // update current state & last update time stamp

249

      SetMicroModemState (newState);

250

233

251

234

  // some debug message

252

  // some debug message

235

  NS_LOG_DEBUG ("AcousticModemEnergyModel:Total energy consumption at node #" <<

253

  NS_LOG_DEBUG ("AcousticModemEnergyModel:Total energy consumption at node #" <<

Lines 250-255	Link Here

250

  // invoke the phy energy depletion handler

268

  // invoke the phy energy depletion handler

251

  Ptr<UanNetDevice> dev = m_node->GetDevice (0)->GetObject<UanNetDevice> ();

269

  Ptr<UanNetDevice> dev = m_node->GetDevice (0)->GetObject<UanNetDevice> ();

252

  dev->GetPhy ()->EnergyDepletionHandler ();

270

  dev->GetPhy ()->EnergyDepletionHandler ();

271

  SetMicroModemState(UanPhy::DISABLED);

272

273

274

void

275

AcousticModemEnergyModel::HandleEnergyRecharged (void)

276

277

  NS_LOG_FUNCTION (this);

278

  NS_LOG_DEBUG ("AcousticModemEnergyModel:Energy is recharged at node #" <<

279

                m_node->GetId ());

280

  // invoke energy recharge callback, if set.

281

  if (!m_energyRechargeCallback.IsNull ())

282

283

      m_energyRechargeCallback ();

284

285

  // invoke the phy energy recharge handler

286

  Ptr<UanNetDevice> dev = m_node->GetDevice (0)->GetObject<UanNetDevice> ();

287

  dev->GetPhy ()->EnergyRechargeHandler ();

288

  SetMicroModemState(UanPhy::IDLE);

253

289

254

290

255

/*

291

/*

Lines 269-275	Link Here

269

AcousticModemEnergyModel::DoGetCurrentA (void) const

305

AcousticModemEnergyModel::DoGetCurrentA (void) const

270

306

271

  NS_LOG_FUNCTION (this);

307

  NS_LOG_FUNCTION (this);

272

308

273

  double supplyVoltage = m_source->GetSupplyVoltage ();

309

  double supplyVoltage = m_source->GetSupplyVoltage ();

274

  NS_ASSERT (supplyVoltage != 0.0);

310

  NS_ASSERT (supplyVoltage != 0.0);

275

  double stateCurrent = 0.0;

311

  double stateCurrent = 0.0;

Lines 287-292	Link Here

287

    case UanPhy::SLEEP:

323

    case UanPhy::SLEEP:

288

      stateCurrent = m_sleepPowerW / supplyVoltage;

324

      stateCurrent = m_sleepPowerW / supplyVoltage;

289

      break;

325

      break;

326

    case UanPhy::DISABLED:

327

      stateCurrent = 0.0;

328

      break;

290

    default:

329

    default:

291

      NS_FATAL_ERROR ("AcousticModemEnergyModel:Undefined radio state!");

330

      NS_FATAL_ERROR ("AcousticModemEnergyModel:Undefined radio state!");

292

331

Lines 323-328	Link Here

323

        case UanPhy::SLEEP:

362

        case UanPhy::SLEEP:

324

          stateName = "SLEEP";

363

          stateName = "SLEEP";

325

          break;

364

          break;

365

        case UanPhy::DISABLED:

366

          stateName = "DISABLED";

367

          break;

326

368

327

      NS_LOG_DEBUG ("AcousticModemEnergyModel:Switching to state: " << stateName <<

369

      NS_LOG_DEBUG ("AcousticModemEnergyModel:Switching to state: " << stateName <<

328

                    " at time = " << Simulator::Now ());

370

                    " at time = " << Simulator::Now ());

(-)a/src/uan/model/acoustic-modem-energy-model.h (-3 / +14 lines)

Lines 57-62	Link Here

public:

public:

  /** Callback type for energy depletion handling. */

  /** Callback type for energy depletion handling. */

  typedef Callback<void> AcousticModemEnergyDepletionCallback;

  typedef Callback<void> AcousticModemEnergyDepletionCallback;

  /** Callback type for energy recharge handling. */

  typedef Callback<void> AcousticModemEnergyRechargeCallback;

public:

public:

/**

/**

Lines 156-161	Link Here

156

   * Sets callback for energy depletion handling.

159

   * Sets callback for energy depletion handling.

157

*/

160

*/

158

  void SetEnergyDepletionCallback (AcousticModemEnergyDepletionCallback callback);

161

  void SetEnergyDepletionCallback (AcousticModemEnergyDepletionCallback callback);

162

163

/**

164

   * \param callback Callback function.

165

166

   * Sets callback for energy recharge handling.

167

*/

168

  void SetEnergyRechargeCallback (AcousticModemEnergyRechargeCallback callback);

159

169

160

/**

170

/**

161

   * Changes state of the AcousticModemEnergyModel.

171

   * Changes state of the AcousticModemEnergyModel.

Lines 174-182	Link Here

174

184

175

   * Not implemented

185

   * Not implemented

176

*/

186

*/

177

  virtual void HandleEnergyRecharged (void)

187

  virtual void HandleEnergyRecharged (void);

178

179

180

188

181

189

182

private:

190

private:

Lines 222-227	Link Here

222

230

223

  /** Energy depletion callback. */

231

  /** Energy depletion callback. */

224

  AcousticModemEnergyDepletionCallback m_energyDepletionCallback;

232

  AcousticModemEnergyDepletionCallback m_energyDepletionCallback;

233

234

  /** Energy recharge callback. */

235

  AcousticModemEnergyRechargeCallback m_energyRechargeCallback;

225

236

226

};  // class AcousticModemEnergyModel

237

};  // class AcousticModemEnergyModel

227

238

(-)a/src/uan/model/uan-phy-dual.cc (+6 lines)

Lines 253-258	Link Here

253

254

255

void

255

void

256

UanPhyDual::EnergyRechargeHandler ()

257

258

  NS_LOG_DEBUG ("Not Implemented");

259

260

261

void

256

UanPhyDual::SendPacket (Ptr<Packet> pkt, uint32_t modeNum)

262

UanPhyDual::SendPacket (Ptr<Packet> pkt, uint32_t modeNum)

257

263

258

  if (modeNum <= m_phy1->GetNModes () - 1)

264

  if (modeNum <= m_phy1->GetNModes () - 1)

(-)a/src/uan/model/uan-phy-dual.h (+1 lines)

Lines 96-101	Link Here

  // Inherited methods:

  // Inherited methods:

  virtual void SetEnergyModelCallback (DeviceEnergyModel::ChangeStateCallback callback);

  virtual void SetEnergyModelCallback (DeviceEnergyModel::ChangeStateCallback callback);

  virtual void EnergyDepletionHandler (void);

  virtual void EnergyDepletionHandler (void);

  virtual void EnergyRechargeHandler (void);

  virtual void SendPacket (Ptr<Packet> pkt, uint32_t modeNum);

100

  virtual void SendPacket (Ptr<Packet> pkt, uint32_t modeNum);

100

101

/**

102

/**




    m_rxThreshDb (0),
    m_ccaThreshDb (0),
    m_pktRx (0),
    m_pktTx (0),
    m_cleared (false)
{
  m_pg = CreateObject<UniformRandomVariable> ();


  NS_LOG_FUNCTION (this);
  NS_LOG_DEBUG ("Energy depleted at node " << m_device->GetNode ()->GetId () <<
                ", stopping rx/tx activities");
  
  m_state = DISABLED;
  if(m_txEndEvent.IsRunning ())
    {
      Simulator::Cancel (m_txEndEvent);
      NotifyTxDrop (m_pktTx);
      m_pktTx = 0;
    }
  if(m_rxEndEvent.IsRunning ())
    {
      Simulator::Cancel (m_rxEndEvent);
      NotifyRxDrop (m_pktRx);
      m_pktRx = 0;
    }
}

void
UanPhyGen::EnergyRechargeHandler ()
{
  NS_LOG_FUNCTION (this);
  NS_LOG_DEBUG ("Energy recharged at node " << m_device->GetNode ()->GetId () <<
                ", restoring rx/tx activities");

  m_state = IDLE;
}

void
UanPhyGen::SendPacket (Ptr<Packet> pkt, uint32_t modeNum)
{
  NS_LOG_DEBUG ("PHY " << m_mac->GetAddress () << ": Transmitting packet");
  if (m_state == DISABLED)
    {
      NS_LOG_DEBUG ("Energy depleted, node cannot transmit any packet. Dropping.");
      return;

  m_state = TX;
  UpdatePowerConsumption (TX);
  double txdelay = pkt->GetSize () * 8.0 / txMode.GetDataRateBps ();
  m_pktTx = pkt;
  m_txEndEvent = Simulator::Schedule (Seconds (txdelay), &UanPhyGen::TxEndEvent, this);
  NS_LOG_DEBUG ("PHY " << m_mac->GetAddress () << " notifying listeners");
  NotifyListenersTxStart (Seconds (txdelay));
  m_txLogger (pkt, m_txPwrDb, txMode);

void
UanPhyGen::TxEndEvent ()
{
  if (m_state == SLEEP || m_state == DISABLED)
    {
      NS_LOG_DEBUG ("Transmission ended but node sleeping or dead");
      return;

void
UanPhyGen::StartRxPacket (Ptr<Packet> pkt, double rxPowerDb, UanTxMode txMode, UanPdp pdp)
{
  switch (m_state)
    {
    case DISABLED:
      NS_LOG_DEBUG ("Energy depleted, node cannot receive any packet. Dropping.");
      NotifyRxDrop(pkt);    // traced source netanim
      return;
    }

  switch (m_state)
    {
    case TX:
      NotifyRxDrop(pkt);    // traced source netanim
      NS_ASSERT (false);

            m_pktRxMode = txMode;
            m_pktRxPdp = pdp;
            double txdelay = pkt->GetSize () * 8.0 / txMode.GetDataRateBps ();
            m_rxEndEvent = Simulator::Schedule (Seconds (txdelay), &UanPhyGen::RxEndEvent, this, pkt, rxPowerDb, txMode);
            NotifyListenersRxStart ();
          }


      return;
    }

  if (m_state == DISABLED || m_state == SLEEP)
    {
      NS_LOG_DEBUG ("Sleep mode or dead. Dropping packet");
      m_pktRx = 0;




#include "ns3/nstime.h"
#include "ns3/device-energy-model.h"
#include "ns3/random-variable-stream.h"
#include "ns3/event-id.h"
#include <list>

namespace ns3 {

  // Inherited methods
  virtual void SetEnergyModelCallback (DeviceEnergyModel::ChangeStateCallback cb);
  virtual void EnergyDepletionHandler (void);
  virtual void EnergyRechargeHandler (void);
  virtual void SendPacket (Ptr<Packet> pkt, uint32_t modeNum);
  virtual void RegisterListener (UanPhyListener *listener);
  virtual void StartRxPacket (Ptr<Packet> pkt, double rxPowerDb, UanTxMode txMode, UanPdp pdp);

  double m_ccaThreshDb;             //!< CCA busy threshold.

  Ptr<Packet> m_pktRx;              //!< Received packet.
  Ptr<Packet> m_pktTx;              //!< Sent packet.
  double m_minRxSinrDb;             //!< Minimum receive SINR during packet reception.
  double m_rxRecvPwrDb;             //!< Receiver power.
  Time m_pktRxArrTime;              //!< Packet arrival time.

  UanTxMode m_pktRxMode;            //!< Packet transmission mode at receiver.

  bool m_cleared;                   //!< Flag when we've been cleared.
  
  EventId m_txEndEvent;             //!< Tx event
  EventId m_rxEndEvent;             //!< Rx event

  /** Provides uniform random variables. */
  Ptr<UniformRandomVariable> m_pg;

(-)a/src/uan/model/uan-phy.h (-1 / +6 lines)

Lines 182-188	Link Here

182

    CCABUSY,  //!< Channel busy.

182

    CCABUSY,  //!< Channel busy.

183

    RX,       //!< Receiving.

183

    RX,       //!< Receiving.

184

    TX,       //!< Transmitting.

184

    TX,       //!< Transmitting.

185

    SLEEP     //!< Sleeping.

185

    SLEEP,    //!< Sleeping.

186

    DISABLED  //!< Disabled.

186

};

187

};

187

188

/**

189

/**

Lines 224-229	Link Here

224

*/

225

*/

225

  virtual void EnergyDepletionHandler (void) = 0;

226

  virtual void EnergyDepletionHandler (void) = 0;

226

/**

227

/**

228

   * Handle the energy recharge event.

229

*/

230

  virtual void EnergyRechargeHandler (void) = 0;

231

/**

227

   * Send a packet using a specific transmission mode.

232

   * Send a packet using a specific transmission mode.

228

233

229

   * \param pkt  Packet to transmit.

234

   * \param pkt  Packet to transmit.

Return to bug 2386