Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ntcore] DispatcherBase::Flush: Use wpi::Now()

Browse Source 
This is faster on some platforms than steady_clock, and will more
consistently support simulation timing.
This commit is contained in:
Peter Johnson
2020-12-12 21:13:16 -08:00
parent d85a6d8fe4
commit acfbb1a44a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ntcore/src/main/native/cpp/Dispatcher.cpp
View File

@@ -12,6 +12,7 @@
#include <wpi/TCPAcceptor.h>
#include <wpi/TCPConnector.h>
#include <wpi/timestamp.h>
#include "IConnectionNotifier.h"
#include "IStorage.h"
@@ -217,11 +218,11 @@ void DispatcherBase::SetIdentity(const Twine& name) {
}
void DispatcherBase::Flush() {
auto now = std::chrono::steady_clock::now();
auto now = wpi::Now();
{
std::scoped_lock lock(m_flush_mutex);
// don't allow flushes more often than every 5 ms
if ((now - m_last_flush) < std::chrono::milliseconds(5)) return;
if ((now - m_last_flush) < 5000) return;
m_last_flush = now;
m_do_flush = true;
}

5
ntcore/src/main/native/cpp/Dispatcher.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2015-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2015-2020 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -9,7 +9,6 @@
#define NTCORE_DISPATCHER_H_
#include <atomic>
#include <chrono>
#include <functional>
#include <memory>
#include <string>
@@ -116,7 +115,7 @@ class DispatcherBase : public IDispatcher {
// Condition variable for forced dispatch wakeup (flush)
wpi::mutex m_flush_mutex;
wpi::condition_variable m_flush_cv;
std::chrono::steady_clock::time_point m_last_flush;
uint64_t m_last_flush;
bool m_do_flush = false;
// Condition variable for client reconnect (uses user mutex)