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

Have Linux/MdnsImpl use System::Layer timer #9537

Merged
merged 2 commits into from
Sep 13, 2021
Merged

Have Linux/MdnsImpl use System::Layer timer #9537

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24e2938
Have Linux/MdnsImpl use System::Layer timer.
kpschoedel Aug 11, 2021
ed5b395
Merge remote-tracking branch 'origin/master' into x7725-linux-mdns
kpschoedel Sep 8, 2021
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
5 changes: 0 additions & 5 deletions src/controller/java/MdnsImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,6 @@ CHIP_ERROR ChipMdnsResolve(MdnsService * service, Inet::InterfaceId interface, M
return CHIP_NO_ERROR;
}

// Implementation of other methods required by the CHIP stack

void GetMdnsTimeout(timeval & timeout) {}
void HandleMdnsTimeout() {}

// Implemention of Java-specific functions

void InitializeWithObjects(jobject resolverObject, jobject mdnsCallbackObject)
Expand Down
4 changes: 0 additions & 4 deletions src/platform/Darwin/MdnsImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,9 +549,5 @@ CHIP_ERROR ChipMdnsResolve(MdnsService * service, chip::Inet::InterfaceId interf
return Resolve(context, callback, interfaceId, service->mAddressType, regtype.c_str(), service->mName);
}

void GetMdnsTimeout(timeval & timeout) {}

void HandleMdnsTimeout() {}

} // namespace Mdns
} // namespace chip
68 changes: 30 additions & 38 deletions src/platform/Linux/MdnsImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include <lib/support/CHIPMemString.h>
#include <lib/support/CodeUtils.h>
#include <platform/internal/CHIPDeviceLayerInternal.h>
#include <system/SystemLayer.h>

using chip::Mdns::kMdnsTypeMaxSize;
using chip::Mdns::MdnsServiceProtocol;
Expand Down Expand Up @@ -136,8 +137,6 @@ namespace Mdns {

MdnsAvahi MdnsAvahi::sInstance;

constexpr uint64_t kUsPerSec = 1000 * 1000;

Poller::Poller()
{
mAvahiPoller.userdata = this;
Expand All @@ -150,6 +149,7 @@ Poller::Poller()
mAvahiPoller.timeout_update = TimeoutUpdate;
mAvahiPoller.timeout_free = TimeoutFree;

mEarliestTimeout = std::chrono::steady_clock::time_point();
mWatchableEvents = &DeviceLayer::SystemLayer.WatchableEventsManager();
}

Expand Down Expand Up @@ -239,9 +239,10 @@ steady_clock::time_point GetAbsTimeout(const struct timeval * timeout)

AvahiTimeout * Poller::TimeoutNew(const struct timeval * timeout, AvahiTimeoutCallback callback, void * context)
{

mTimers.emplace_back(new AvahiTimeout{ GetAbsTimeout(timeout), callback, timeout != nullptr, context, this });
return mTimers.back().get();
AvahiTimeout * timer = mTimers.back().get();
SystemTimerUpdate(timer);
return timer;
}

void Poller::TimeoutUpdate(AvahiTimeout * timer, const struct timeval * timeout)
Expand All @@ -250,6 +251,7 @@ void Poller::TimeoutUpdate(AvahiTimeout * timer, const struct timeval * timeout)
{
timer->mAbsTimeout = GetAbsTimeout(timeout);
timer->mEnabled = true;
static_cast<Poller *>(timer->mPoller)->SystemTimerUpdate(timer);
}
else
{
Expand All @@ -269,48 +271,48 @@ void Poller::TimeoutFree(AvahiTimeout & timer)
mTimers.end());
}

void Poller::GetTimeout(timeval & timeout)
void Poller::SystemTimerCallback(System::Layer * layer, void * data)
{
microseconds timeoutVal = seconds(timeout.tv_sec) + microseconds(timeout.tv_usec);
static_cast<Poller *>(data)->HandleTimeout();
}

void Poller::HandleTimeout()
{
mEarliestTimeout = std::chrono::steady_clock::time_point();
steady_clock::time_point now = steady_clock::now();

AvahiTimeout * earliest = nullptr;
for (auto && timer : mTimers)
{
steady_clock::time_point absTimeout = timer->mAbsTimeout;
steady_clock::time_point now = steady_clock::now();

if (!timer->mEnabled)
{
continue;
}
if (absTimeout < now)
if (timer->mAbsTimeout <= now)
{
timeoutVal = microseconds(0);
break;
timer->mCallback(timer.get(), timer->mContext);
}
else
{
timeoutVal = std::min(timeoutVal, duration_cast<microseconds>(absTimeout - now));
if ((earliest == nullptr) || (timer->mAbsTimeout < earliest->mAbsTimeout))
{
earliest = timer.get();
}
}
}

timeout.tv_sec = static_cast<uint64_t>(timeoutVal.count()) / kUsPerSec;
timeout.tv_usec = static_cast<uint64_t>(timeoutVal.count()) % kUsPerSec;
if (earliest)
{
SystemTimerUpdate(earliest);
}
}

void Poller::HandleTimeout()
void Poller::SystemTimerUpdate(AvahiTimeout * timer)
{
steady_clock::time_point now = steady_clock::now();

for (auto && timer : mTimers)
if ((mEarliestTimeout == std::chrono::steady_clock::time_point()) || (timer->mAbsTimeout < mEarliestTimeout))
{
if (!timer->mEnabled)
{
continue;
}
if (timer->mAbsTimeout <= now)
{
timer->mCallback(timer.get(), timer->mContext);
}
mEarliestTimeout = timer->mAbsTimeout;
auto msDelay = std::chrono::duration_cast<std::chrono::milliseconds>(steady_clock::now() - mEarliestTimeout).count();
DeviceLayer::SystemLayer.StartTimer(msDelay, SystemTimerCallback, this);
}
}

Expand Down Expand Up @@ -753,16 +755,6 @@ void MdnsAvahi::HandleResolve(AvahiServiceResolver * resolver, AvahiIfIndex inte
chip::Platform::Delete(context);
}

void GetMdnsTimeout(timeval & timeout)
{
MdnsAvahi::GetInstance().GetPoller().GetTimeout(timeout);
}

void HandleMdnsTimeout()
{
MdnsAvahi::GetInstance().GetPoller().HandleTimeout();
}

CHIP_ERROR ChipMdnsInit(MdnsAsyncReturnCallback initCallback, MdnsAsyncReturnCallback errorCallback, void * context)
{
return MdnsAvahi::GetInstance().Init(initCallback, errorCallback, context);
Expand Down
6 changes: 5 additions & 1 deletion src/platform/Linux/MdnsImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ class Poller
public:
Poller(void);

void GetTimeout(timeval & timeout);
void HandleTimeout();

const AvahiPoll * GetAvahiPoll(void) const { return &mAvahiPoller; }
Expand All @@ -88,8 +87,13 @@ class Poller
static void TimeoutFree(AvahiTimeout * timer);
void TimeoutFree(AvahiTimeout & timer);

void SystemTimerUpdate(AvahiTimeout * timer);
static void SystemTimerCallback(System::Layer * layer, void * data);

std::vector<std::unique_ptr<AvahiWatch>> mWatches;
std::vector<std::unique_ptr<AvahiTimeout>> mTimers;
std::chrono::steady_clock::time_point mEarliestTimeout;

AvahiPoll mAvahiPoller;
System::WatchableEventManager * mWatchableEvents;
};
Expand Down
11 changes: 0 additions & 11 deletions src/system/WatchableEventManagerLibevent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,6 @@
#include <fcntl.h>
#include <unistd.h>

#if CHIP_DEVICE_CONFIG_ENABLE_MDNS && !__ZEPHYR__

namespace chip {
namespace Mdns {
void GetMdnsTimeout(timeval & timeout);
void HandleMdnsTimeout();
} // namespace Mdns
} // namespace chip

#endif // CHIP_DEVICE_CONFIG_ENABLE_MDNS && !__ZEPHYR__

#ifndef CHIP_CONFIG_LIBEVENT_DEBUG_CHECKS
#define CHIP_CONFIG_LIBEVENT_DEBUG_CHECKS 1
#endif
Expand Down
19 changes: 0 additions & 19 deletions src/system/WatchableEventManagerSelect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,6 @@
#define PTHREAD_NULL 0
#endif // CHIP_SYSTEM_CONFIG_POSIX_LOCKING && !defined(PTHREAD_NULL)

#if CHIP_DEVICE_CONFIG_ENABLE_MDNS && !__ZEPHYR__

namespace chip {
namespace Mdns {
void GetMdnsTimeout(timeval & timeout);
void HandleMdnsTimeout();
} // namespace Mdns
} // namespace chip

#endif // CHIP_DEVICE_CONFIG_ENABLE_MDNS && !__ZEPHYR__

namespace chip {
namespace System {

Expand Down Expand Up @@ -340,10 +329,6 @@ void WatchableEventManager::PrepareEvents()
const Clock::MonotonicMilliseconds sleepTime = (awakenTime > currentTime) ? (awakenTime - currentTime) : 0;
MillisecondsToTimeval(sleepTime, mNextTimeout);

#if CHIP_DEVICE_CONFIG_ENABLE_MDNS && !__ZEPHYR__ && !__MBED__
chip::Mdns::GetMdnsTimeout(mNextTimeout);
#endif // CHIP_DEVICE_CONFIG_ENABLE_MDNS && !__ZEPHYR__

mMaxFd = -1;
FD_ZERO(&mSelected.mReadSet);
FD_ZERO(&mSelected.mWriteSet);
Expand Down Expand Up @@ -410,10 +395,6 @@ void WatchableEventManager::HandleEvents()
}
}

#if CHIP_DEVICE_CONFIG_ENABLE_MDNS && !__ZEPHYR__ && !__MBED__
chip::Mdns::HandleMdnsTimeout();
#endif // CHIP_DEVICE_CONFIG_ENABLE_MDNS && !__ZEPHYR__

#if CHIP_SYSTEM_CONFIG_POSIX_LOCKING
mHandleSelectThread = PTHREAD_NULL;
#endif // CHIP_SYSTEM_CONFIG_POSIX_LOCKING
Expand Down