feb19b588b
A problem since c6561a99d8 (wsd: test:
correctly stop SocketPoll in UnitTimeout, 2022-04-21), the trouble was
that calling UnitWSD::returnValue() from UnitTimeout::returnValue()
deletes the 'this' pointer, so we need to copy the interesting data
members to the stack before calling the base.
Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: I86583ae516e2b2f367fbf5cb2a9401cc21f1b1cf
79 lines
1.9 KiB
C++
79 lines
1.9 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
|
|
/*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include <chrono>
|
|
|
|
#include <cassert>
|
|
#include <sysexits.h>
|
|
|
|
#include <Log.hpp>
|
|
#include <Util.hpp>
|
|
#include <Unit.hpp>
|
|
|
|
class UnitTimeout : public UnitWSD
|
|
{
|
|
std::atomic<bool> _timedOut;
|
|
public:
|
|
UnitTimeout()
|
|
: UnitWSD("UnitTimeout")
|
|
, _timedOut(false)
|
|
{
|
|
setTimeout(std::chrono::milliseconds(10));
|
|
}
|
|
|
|
virtual void timeout() override
|
|
{
|
|
_timedOut = true;
|
|
UnitBase::timeout();
|
|
}
|
|
|
|
virtual void returnValue(int & retValue) override
|
|
{
|
|
bool timedOut = _timedOut;
|
|
bool setRetValue = _setRetValue;
|
|
int retVal = _retValue;
|
|
|
|
UnitWSD::returnValue(retValue); // Always call base.
|
|
// Note that at this point 'this' is deleted.
|
|
if (!timedOut)
|
|
{
|
|
LOG_TST("ERROR: Failed to timeout");
|
|
retValue = EX_SOFTWARE;
|
|
}
|
|
else
|
|
{
|
|
assert(setRetValue);
|
|
assert(retVal == EX_SOFTWARE);
|
|
// we wanted a timeout.
|
|
// Test passed by timing-out as expected.
|
|
retValue = EX_OK;
|
|
}
|
|
}
|
|
|
|
// sanity check the non-unit-test paths
|
|
static void testDefaultKits()
|
|
{
|
|
bool madeWSD = init(UnitType::Wsd, std::string());
|
|
assert(madeWSD);
|
|
delete UnitBase::Global;
|
|
UnitBase::Global = nullptr;
|
|
bool madeKit = init(UnitType::Kit, std::string());
|
|
assert(madeKit);
|
|
delete UnitBase::Global;
|
|
UnitBase::Global = nullptr;
|
|
}
|
|
};
|
|
|
|
UnitBase *unit_create_wsd(void)
|
|
{
|
|
UnitTimeout::testDefaultKits();
|
|
return new UnitTimeout();
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|