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

Solve some safety issues with RPCs (#1127)

Browse Source 
Java would never properly dispose, and C++'s were easy to respond after disposing.
We now return a bool if the call was successful or not.
This commit is contained in:
Thad House
2018-06-03 08:43:48 -07:00
committed by Peter Johnson
parent 6aebba5452
commit 8eafe7f325
10 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ntcore/src/main/native/include/ntcore_c.h
View File

@@ -851,9 +851,10 @@ NT_Bool NT_WaitForRpcCallQueue(NT_Inst inst, double timeout);
* @param call RPC call handle (from NT_RpcAnswer)
* @param result result raw data that will be provided to remote caller
* @param result_len length of result in bytes
* @return true if the response was posted, otherwise false
*/
void NT_PostRpcResponse(NT_Entry entry, NT_RpcCall call, const char* result,
size_t result_len);
NT_Bool NT_PostRpcResponse(NT_Entry entry, NT_RpcCall call, const char* result,
size_t result_len);
/**
* Call a RPC function. May be used on either the client or server.

15
ntcore/src/main/native/include/ntcore_cpp.h
View File

@@ -14,6 +14,7 @@
#include <functional>
#include <memory>
#include <string>
#include <thread>
#include <utility>
#include <vector>
@@ -132,7 +133,7 @@ class RpcAnswer {
NT_Entry entry;
/** Call handle. */
NT_RpcCall call;
mutable NT_RpcCall call;
/** Entry name. */
std::string name;
@@ -152,8 +153,9 @@ class RpcAnswer {
/**
* Post RPC response (return value) for a polled RPC.
* @param result result raw data that will be provided to remote caller
* @return True if posting the response is valid, otherwise false
*/
void PostResponse(StringRef result) const;
bool PostResponse(StringRef result) const;
friend void swap(RpcAnswer& first, RpcAnswer& second) {
using std::swap;
@@ -936,8 +938,9 @@ bool WaitForRpcCallQueue(NT_Inst inst, double timeout);
* @param entry entry handle of RPC entry (from RpcAnswer)
* @param call RPC call handle (from RpcAnswer)
* @param result result raw data that will be provided to remote caller
* @return true if the response was posted, otherwise false
*/
void PostRpcResponse(NT_Entry entry, NT_RpcCall call, StringRef result);
bool PostRpcResponse(NT_Entry entry, NT_RpcCall call, StringRef result);
/**
* Call a RPC function. May be used on either the client or server.
@@ -1480,8 +1483,10 @@ bool WaitForLoggerQueue(NT_Inst inst, double timeout);
/** @} */
inline void RpcAnswer::PostResponse(StringRef result) const {
PostRpcResponse(entry, call, result);
inline bool RpcAnswer::PostResponse(StringRef result) const {
auto ret = PostRpcResponse(entry, call, result);
call = 0;
return ret;
}
} // namespace nt