Add ability to run robot main loop in a separate thread (#1895)

Default behavior is still to run the robot main loop in the main thread.

The ability to run the robot main loop in a separate thread and add a hook
for running a different function in the main thread is needed for simulation
GUI support on some platforms.
This commit is contained in:
Peter Johnson
2019-09-28 15:43:24 -07:00
committed by GitHub
parent 457f94ba26
commit b23baf611a
12 changed files with 239 additions and 18 deletions

View File

@@ -0,0 +1,64 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2019 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. */
/*----------------------------------------------------------------------------*/
#include "hal/Main.h"
#include <wpi/condition_variable.h>
#include <wpi/mutex.h>
static void DefaultMain(void*);
static void DefaultExit(void*);
static bool gHasMain = false;
static void* gMainParam = nullptr;
static void (*gMainFunc)(void*) = DefaultMain;
static void (*gExitFunc)(void*) = DefaultExit;
static bool gExited = false;
struct MainObj {
wpi::mutex gExitMutex;
wpi::condition_variable gExitCv;
};
static MainObj* mainObj;
static void DefaultMain(void*) {
std::unique_lock lock{mainObj->gExitMutex};
mainObj->gExitCv.wait(lock, [] { return gExited; });
}
static void DefaultExit(void*) {
std::lock_guard lock{mainObj->gExitMutex};
gExited = true;
mainObj->gExitCv.notify_all();
}
namespace hal {
namespace init {
void InitializeMain() {
static MainObj mO;
mainObj = &mO;
}
} // namespace init
} // namespace hal
extern "C" {
void HAL_SetMain(void* param, void (*mainFunc)(void*),
void (*exitFunc)(void*)) {
gHasMain = true;
gMainParam = param;
gMainFunc = mainFunc;
gExitFunc = exitFunc;
}
HAL_Bool HAL_HasMain(void) { return gHasMain; }
void HAL_RunMain(void) { gMainFunc(gMainParam); }
void HAL_ExitMain(void) { gExitFunc(gMainParam); }
} // extern "C"

View File

@@ -17,6 +17,7 @@
#include "HALUtil.h"
#include "edu_wpi_first_hal_HAL.h"
#include "hal/DriverStation.h"
#include "hal/Main.h"
using namespace frc;
using namespace wpi::java;
@@ -35,6 +36,42 @@ Java_edu_wpi_first_hal_HAL_initialize
return HAL_Initialize(timeout, mode);
}
/*
* Class: edu_wpi_first_hal_HAL
* Method: hasMain
* Signature: ()Z
*/
JNIEXPORT jboolean JNICALL
Java_edu_wpi_first_hal_HAL_hasMain
(JNIEnv*, jclass)
{
return HAL_HasMain();
}
/*
* Class: edu_wpi_first_hal_HAL
* Method: runMain
* Signature: ()V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_HAL_runMain
(JNIEnv*, jclass)
{
HAL_RunMain();
}
/*
* Class: edu_wpi_first_hal_HAL
* Method: exitMain
* Signature: ()V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_HAL_exitMain
(JNIEnv*, jclass)
{
HAL_ExitMain();
}
/*
* Class: edu_wpi_first_hal_HAL
* Method: observeUserProgramStarting