Switch to Face::getIoContext()
Change-Id: I56ea53ce8db3a3f24abe958065b9251eb025fbf7
This commit is contained in:
1 parent
690272d427
commit
60e5043d0c
6 files changed
+14
-10
No files matched your search
@@ -128,7 +128,11 @@ class CompilerFlags:
|
|||||||
|
|
||||||
def getGeneralFlags(self, conf):
|
def getGeneralFlags(self, conf):
|
||||||
"""Get dict of CXXFLAGS, LINKFLAGS, and DEFINES that are always needed"""
|
"""Get dict of CXXFLAGS, LINKFLAGS, and DEFINES that are always needed"""
|
||||||
return {'CXXFLAGS': [], 'LINKFLAGS': [], 'DEFINES': []}
|
return {
|
||||||
|
'CXXFLAGS': [],
|
||||||
|
'LINKFLAGS': [],
|
||||||
|
'DEFINES': ['BOOST_ASIO_NO_DEPRECATED', 'BOOST_FILESYSTEM_NO_DEPRECATED'],
|
||||||
|
}
|
||||||
|
|
||||||
def getDebugFlags(self, conf):
|
def getDebugFlags(self, conf):
|
||||||
"""Get dict of CXXFLAGS, LINKFLAGS, and DEFINES that are needed only in debug mode"""
|
"""Get dict of CXXFLAGS, LINKFLAGS, and DEFINES that are needed only in debug mode"""
|
||||||
|
|||||||
+1
-1
@@ -36,7 +36,7 @@ Consumer::Consumer(const ndn::Name& syncPrefix,
|
|||||||
ndn::time::milliseconds helloInterestLifetime,
|
ndn::time::milliseconds helloInterestLifetime,
|
||||||
ndn::time::milliseconds syncInterestLifetime)
|
ndn::time::milliseconds syncInterestLifetime)
|
||||||
: m_face(face)
|
: m_face(face)
|
||||||
, m_scheduler(m_face.getIoService())
|
, m_scheduler(m_face.getIoContext())
|
||||||
, m_syncPrefix(syncPrefix)
|
, m_syncPrefix(syncPrefix)
|
||||||
, m_helloInterestPrefix(ndn::Name(m_syncPrefix).append("hello"))
|
, m_helloInterestPrefix(ndn::Name(m_syncPrefix).append("hello"))
|
||||||
, m_syncInterestPrefix(ndn::Name(m_syncPrefix).append("sync"))
|
, m_syncInterestPrefix(ndn::Name(m_syncPrefix).append("sync"))
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
|
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2014-2022, The University of Memphis
|
* Copyright (c) 2014-2023, The University of Memphis
|
||||||
*
|
*
|
||||||
* This file is part of PSync.
|
* This file is part of PSync.
|
||||||
* See AUTHORS.md for complete list of PSync authors and contributors.
|
* See AUTHORS.md for complete list of PSync authors and contributors.
|
||||||
@@ -37,7 +37,7 @@ ProducerBase::ProducerBase(ndn::Face& face,
|
|||||||
CompressionScheme contentCompression)
|
CompressionScheme contentCompression)
|
||||||
: m_face(face)
|
: m_face(face)
|
||||||
, m_keyChain(keyChain)
|
, m_keyChain(keyChain)
|
||||||
, m_scheduler(m_face.getIoService())
|
, m_scheduler(m_face.getIoContext())
|
||||||
, m_rng(ndn::random::getRandomNumberEngine())
|
, m_rng(ndn::random::getRandomNumberEngine())
|
||||||
, m_iblt(expectedNumEntries, ibltCompression)
|
, m_iblt(expectedNumEntries, ibltCompression)
|
||||||
, m_segmentPublisher(m_face, m_keyChain)
|
, m_segmentPublisher(m_face, m_keyChain)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
|
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2014-2022, The University of Memphis
|
* Copyright (c) 2014-2023, The University of Memphis
|
||||||
*
|
*
|
||||||
* This file is part of PSync.
|
* This file is part of PSync.
|
||||||
* See AUTHORS.md for complete list of PSync authors and contributors.
|
* See AUTHORS.md for complete list of PSync authors and contributors.
|
||||||
@@ -24,7 +24,7 @@ namespace psync {
|
|||||||
SegmentPublisher::SegmentPublisher(ndn::Face& face, ndn::KeyChain& keyChain,
|
SegmentPublisher::SegmentPublisher(ndn::Face& face, ndn::KeyChain& keyChain,
|
||||||
const ndn::security::SigningInfo& signingInfo, size_t imsLimit)
|
const ndn::security::SigningInfo& signingInfo, size_t imsLimit)
|
||||||
: m_face(face)
|
: m_face(face)
|
||||||
, m_scheduler(m_face.getIoService())
|
, m_scheduler(m_face.getIoContext())
|
||||||
, m_segmenter(keyChain, signingInfo)
|
, m_segmenter(keyChain, signingInfo)
|
||||||
, m_ims(imsLimit)
|
, m_ims(imsLimit)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
|
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2014-2022, The University of Memphis
|
* Copyright (c) 2014-2023, The University of Memphis
|
||||||
*
|
*
|
||||||
* This file is part of PSync.
|
* This file is part of PSync.
|
||||||
* See AUTHORS.md for complete list of PSync authors and contributors.
|
* See AUTHORS.md for complete list of PSync authors and contributors.
|
||||||
@@ -91,7 +91,7 @@ private:
|
|||||||
private:
|
private:
|
||||||
ndn::Face m_face;
|
ndn::Face m_face;
|
||||||
ndn::KeyChain m_keyChain;
|
ndn::KeyChain m_keyChain;
|
||||||
ndn::Scheduler m_scheduler{m_face.getIoService()};
|
ndn::Scheduler m_scheduler{m_face.getIoContext()};
|
||||||
|
|
||||||
psync::FullProducer m_producer;
|
psync::FullProducer m_producer;
|
||||||
uint64_t m_maxNumPublish;
|
uint64_t m_maxNumPublish;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
|
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2014-2022, The University of Memphis
|
* Copyright (c) 2014-2023, The University of Memphis
|
||||||
*
|
*
|
||||||
* This file is part of PSync.
|
* This file is part of PSync.
|
||||||
* See AUTHORS.md for complete list of PSync authors and contributors.
|
* See AUTHORS.md for complete list of PSync authors and contributors.
|
||||||
@@ -82,7 +82,7 @@ private:
|
|||||||
private:
|
private:
|
||||||
ndn::Face m_face;
|
ndn::Face m_face;
|
||||||
ndn::KeyChain m_keyChain;
|
ndn::KeyChain m_keyChain;
|
||||||
ndn::Scheduler m_scheduler{m_face.getIoService()};
|
ndn::Scheduler m_scheduler{m_face.getIoContext()};
|
||||||
|
|
||||||
psync::PartialProducer m_producer;
|
psync::PartialProducer m_producer;
|
||||||
uint64_t m_maxNumPublish;
|
uint64_t m_maxNumPublish;
|
||||||
|
|||||||
Reference in new issue
Block a user