95eb849217
Re-think the plumbing between the different parts of the C++ Online code. Do try to have it work more like in real Online on all but the lowest socket level. Except that we don't have multiple processes, but threads inside the same process. And instead of using actual system sockets for WebSocket traffic between the threads, we use our own FakeSocket things, with no WebSocket framing of messages. Reduce the amount of #ifdef MOBILEAPP a bit also by compiling in the UnitFoo things. Hardcode that so that no unit testing is ever attempted, though. We don't try to dlopen any library. Corresponding changes in the app Objective-C code. Plus fixes and functionality improvements. Now it gets so far that the JavaScript code thinks it has the document tiles presented, and doesn't crash. But it hangs occasionally. And all tiles show up blank. Anyway, progress. Change-Id: I769497c9a46ddb74984bc7af36d132b7b43895d4
215 lines
4.8 KiB
C++
215 lines
4.8 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* 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 <iostream>
|
|
#include "Unit.hpp"
|
|
|
|
#include <cassert>
|
|
#include <dlfcn.h>
|
|
#include <fstream>
|
|
|
|
#include <Poco/Thread.h>
|
|
#include <Poco/Util/Application.h>
|
|
|
|
#include "Log.hpp"
|
|
#include "Util.hpp"
|
|
|
|
#include <common/SigUtil.hpp>
|
|
|
|
UnitBase *UnitBase::Global = nullptr;
|
|
|
|
static Poco::Thread TimeoutThread("unit timeout");
|
|
|
|
UnitBase *UnitBase::linkAndCreateUnit(UnitType type, const std::string &unitLibPath)
|
|
{
|
|
#ifndef MOBILEAPP
|
|
void *dlHandle = dlopen(unitLibPath.c_str(), RTLD_GLOBAL|RTLD_NOW);
|
|
if (!dlHandle)
|
|
{
|
|
LOG_ERR("Failed to load " << unitLibPath << ": " << dlerror());
|
|
return nullptr;
|
|
}
|
|
|
|
const char *symbol = nullptr;
|
|
switch (type)
|
|
{
|
|
case UnitType::Wsd:
|
|
symbol = "unit_create_wsd";
|
|
break;
|
|
case UnitType::Kit:
|
|
symbol = "unit_create_kit";
|
|
break;
|
|
}
|
|
CreateUnitHooksFunction* createHooks;
|
|
createHooks = reinterpret_cast<CreateUnitHooksFunction *>(dlsym(dlHandle, symbol));
|
|
if (!createHooks)
|
|
{
|
|
LOG_ERR("No " << symbol << " symbol in " << unitLibPath);
|
|
return nullptr;
|
|
}
|
|
UnitBase *hooks = createHooks();
|
|
|
|
if (hooks)
|
|
hooks->setHandle(dlHandle);
|
|
|
|
return hooks;
|
|
#else
|
|
return nullptr;
|
|
#endif
|
|
}
|
|
|
|
bool UnitBase::init(UnitType type, const std::string &unitLibPath)
|
|
{
|
|
assert(!Global);
|
|
if (!unitLibPath.empty())
|
|
{
|
|
Global = linkAndCreateUnit(type, unitLibPath);
|
|
if (Global && type == UnitType::Kit)
|
|
{
|
|
TimeoutThread.startFunc([](){
|
|
Poco::Thread::trySleep(Global->_timeoutMilliSeconds);
|
|
if (!Global->_timeoutShutdown)
|
|
{
|
|
LOG_ERR("Unit test timeout");
|
|
Global->timeout();
|
|
}
|
|
});
|
|
}
|
|
}
|
|
else
|
|
{
|
|
switch (type)
|
|
{
|
|
case UnitType::Wsd:
|
|
Global = new UnitWSD();
|
|
break;
|
|
case UnitType::Kit:
|
|
Global = new UnitKit();
|
|
break;
|
|
default:
|
|
assert(false);
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (Global)
|
|
Global->_type = type;
|
|
|
|
return Global != nullptr;
|
|
}
|
|
|
|
bool UnitBase::isUnitTesting()
|
|
{
|
|
return Global && Global->_dlHandle;
|
|
}
|
|
|
|
void UnitBase::setTimeout(int timeoutMilliSeconds)
|
|
{
|
|
assert(!TimeoutThread.isRunning());
|
|
_timeoutMilliSeconds = timeoutMilliSeconds;
|
|
}
|
|
|
|
UnitBase::UnitBase()
|
|
: _dlHandle(nullptr),
|
|
_setRetValue(false),
|
|
_retValue(0),
|
|
_timeoutMilliSeconds(30 * 1000),
|
|
_timeoutShutdown(false),
|
|
_type(UnitType::Wsd)
|
|
{
|
|
}
|
|
|
|
UnitBase::~UnitBase()
|
|
{
|
|
// FIXME: we should really clean-up properly.
|
|
// if (_dlHandle)
|
|
// dlclose(_dlHandle);
|
|
_dlHandle = nullptr;
|
|
}
|
|
|
|
UnitWSD::UnitWSD()
|
|
: _hasKitHooks(false)
|
|
{
|
|
}
|
|
|
|
UnitWSD::~UnitWSD()
|
|
{
|
|
}
|
|
|
|
void UnitWSD::configure(Poco::Util::LayeredConfiguration &config)
|
|
{
|
|
if (isUnitTesting())
|
|
{
|
|
// Force HTTP - helps stracing.
|
|
config.setBool("ssl.enable", false);
|
|
// Use http:// everywhere.
|
|
config.setBool("ssl.termination", false);
|
|
// Force console output - easier to debug.
|
|
config.setBool("logging.file[@enable]", false);
|
|
}
|
|
// else - a product run.
|
|
}
|
|
|
|
void UnitWSD::lookupTile(int part, int width, int height, int tilePosX, int tilePosY,
|
|
int tileWidth, int tileHeight, std::unique_ptr<std::fstream>& cacheFile)
|
|
{
|
|
if (cacheFile && cacheFile->is_open())
|
|
{
|
|
onTileCacheHit(part, width, height, tilePosX, tilePosY, tileWidth, tileHeight);
|
|
}
|
|
else
|
|
{
|
|
onTileCacheMiss(part, width, height, tilePosX, tilePosY, tileWidth, tileHeight);
|
|
}
|
|
}
|
|
|
|
UnitKit::UnitKit()
|
|
{
|
|
}
|
|
|
|
UnitKit::~UnitKit()
|
|
{
|
|
}
|
|
|
|
void UnitBase::exitTest(TestResult result)
|
|
{
|
|
LOG_INF("exitTest: " << (int)result << ". Flagging for termination.");
|
|
_setRetValue = true;
|
|
_retValue = result == TestResult::Ok ?
|
|
Poco::Util::Application::EXIT_OK :
|
|
Poco::Util::Application::EXIT_SOFTWARE;
|
|
TerminationFlag = true;
|
|
SocketPoll::wakeupWorld();
|
|
}
|
|
|
|
void UnitBase::timeout()
|
|
{
|
|
if (isUnitTesting())
|
|
{
|
|
LOG_ERR("Timed out waiting for unit test to complete");
|
|
exitTest(TestResult::TimedOut);
|
|
}
|
|
}
|
|
|
|
void UnitBase::returnValue(int &retValue)
|
|
{
|
|
if (_setRetValue)
|
|
retValue = _retValue;
|
|
|
|
_timeoutShutdown = true;
|
|
TimeoutThread.wakeUp();
|
|
TimeoutThread.join();
|
|
|
|
delete Global;
|
|
Global = nullptr;
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|