Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Assorted code cleanups #24

Merged
merged 9 commits into from
Dec 8, 2023
Merged

Assorted code cleanups #24

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4ed38f3
core: use NDN_THROW
Pesa Nov 28, 2023
4593441
examples: minor code cleanups
Pesa Dec 2, 2023
c8a1458
pubsub: use lower camel case in SVSPubSubOptions
Pesa Dec 2, 2023
b2a4a60
tlv: specify a fixed underlying type
Pesa Dec 2, 2023
68f4700
core: code style fixes
Pesa Dec 2, 2023
9c2c324
pubsub: code style fixes
Pesa Dec 2, 2023
9b826db
ci: ensure `--with-compression` is tested in at least one configuration
Pesa Dec 3, 2023
fe0a337
core: `chrono::steady_clock::now()` is static
Pesa Dec 3, 2023
3282ce2
tests: code style fixes
Pesa Dec 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions ndn-svs/mapping-provider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
/*
* Copyright (c) 2012-2022 University of California, Los Angeles
* Copyright (c) 2012-2023 University of California, Los Angeles
*
* This file is part of ndn-svs, synchronization library for distributed realtime
* applications for NDN.
Expand Down Expand Up @@ -141,7 +141,7 @@ MappingProvider::onMappingQuery(const Interest& interest)

Data data(interest.getName());
data.setContent(queryResponse.encode());
data.setFreshnessPeriod(ndn::time::milliseconds(1000));
data.setFreshnessPeriod(1_s);
m_securityOptions.dataSigner->sign(data);
m_face.put(data);
}
Expand All @@ -163,9 +163,9 @@ MappingProvider::fetchNameMapping(const MissingDataInfo& info,
{
Name queryName = getMappingQueryDataName(info);
Interest interest(queryName);
interest.setMustBeFresh(false);
interest.setCanBePrefix(false);
interest.setInterestLifetime(ndn::time::milliseconds(2000));
interest.setMustBeFresh(false);
interest.setInterestLifetime(2_s);

auto onDataValidated = [this, onValidated, info] (const Data& data)
{
Expand Down Expand Up @@ -195,7 +195,10 @@ MappingProvider::fetchNameMapping(const MissingDataInfo& info,
Name
MappingProvider::getMappingQueryDataName(const MissingDataInfo& info)
{
return Name(info.nodeId).append(m_syncPrefix).append("MAPPING").appendNumber(info.low).appendNumber(info.high);
return Name(info.nodeId).append(m_syncPrefix)
.append("MAPPING")
.appendNumber(info.low)
.appendNumber(info.high);
}

MissingDataInfo
Expand Down
10 changes: 5 additions & 5 deletions ndn-svs/svspubsub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ SVSPubSub::subscribeToProducer(const Name& nodePrefix, const SubscriptionCallbac
void
SVSPubSub::unsubscribe(uint32_t handle)
{
auto unsub = [](uint32_t handle, std::vector<Subscription> subs)
auto unsub = [handle](std::vector<Subscription> subs)
pulsejet marked this conversation as resolved.
Show resolved Hide resolved
{
for (size_t i = 0; i < subs.size(); i++)
{
Expand All @@ -162,12 +162,12 @@ SVSPubSub::unsubscribe(uint32_t handle)
}
};

unsub(handle, m_producerSubscriptions);
unsub(handle, m_prefixSubscriptions);
unsub(m_producerSubscriptions);
unsub(m_prefixSubscriptions);
}

void
SVSPubSub::updateCallbackInternal(const std::vector<ndn::svs::MissingDataInfo>& info)
SVSPubSub::updateCallbackInternal(const std::vector<MissingDataInfo>& info)
{
for (const auto& stream : info)
{
Expand Down Expand Up @@ -368,7 +368,7 @@ SVSPubSub::onSyncData(const Data& firstData, const std::pair<Name, SeqNo>& publi
auto innerName = Data(block.elements()[0]).getName().getPrefix(-2);

// Function to send final buffer to subscriptions if possible
auto sendFinalBuffer = [this, innerName, publication, finalBuffer, bufSize, numFailed, numValidated, numElem] ()
auto sendFinalBuffer = [this, innerName, publication, finalBuffer, bufSize, numFailed, numValidated, numElem]
{
if (*numValidated + *numFailed != numElem)
return;
Expand Down
4 changes: 2 additions & 2 deletions ndn-svs/svspubsub.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class SVSPubSub : noncopyable
const Name& nodePrefix,
ndn::Face& face,
UpdateCallback updateCallback,
const SVSPubSubOptions& options = SVSPubSubOptions(),
const SVSPubSubOptions& options = {},
const SecurityOptions& securityOptions = SecurityOptions::DEFAULT);

virtual
Expand Down Expand Up @@ -187,7 +187,7 @@ class SVSPubSub : noncopyable
onSyncData(const Data& syncData, const std::pair<Name, SeqNo>& publication);

void
updateCallbackInternal(const std::vector<ndn::svs::MissingDataInfo>& info);
updateCallbackInternal(const std::vector<MissingDataInfo>& info);

Block
onGetExtraData(const VersionVector& vv);
Expand Down