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

Move entirety of llvm namespace to wpi namespace.

Browse Source 
During shared library loading, a different libLLVM can be pulled in, causing
llvm symbols from dependent libraries to resolve to that library instead of
this one. This has been seen in the wild with the Mesa OpenGL implementation
in JavaFX applications (see wpilibsuite/shuffleboard#361).

This is clearly a very breaking change. For some level of backwards
compatibility, a namespace alias from llvm to wpi is performed in the "llvm"
headers.  Unfortunately, forward declarations of llvm classes will still break,
but compilers seem to generate clear error messages in those cases
("namespace alias 'llvm' not allowed here, assuming 'wpi'").

This change also moves all the wpiutil headers to a single "wpi" subdirectory
from the previously split "llvm", "support", "tcpsockets", and "udpsockets".
Shim headers will be added for backwards compatibility in a later commit.
This commit is contained in:
Peter Johnson
2018-04-29 23:33:19 -07:00
parent 93859eb84f
commit f84018af5f
377 changed files with 2747 additions and 2742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
cameraserver/src/main/native/include/CameraServer.h
View File

@@ -14,11 +14,11 @@
#include <string>
#include <vector>
#include <llvm/DenseMap.h>
#include <llvm/StringMap.h>
#include <llvm/StringRef.h>
#include <networktables/NetworkTable.h>
#include <support/mutex.h>
#include <wpi/DenseMap.h>
#include <wpi/StringMap.h>
#include <wpi/StringRef.h>
#include <wpi/mutex.h>
#include "cscore.h"
@@ -72,7 +72,7 @@ class CameraServer {
* @param name The name to give the camera
* @param dev The device number of the camera interface
*/
cs::UsbCamera StartAutomaticCapture(llvm::StringRef name, int dev);
cs::UsbCamera StartAutomaticCapture(wpi::StringRef name, int dev);
/**
* Start automatically capturing images to send to the dashboard.
@@ -80,8 +80,8 @@ class CameraServer {
* @param name The name to give the camera
* @param path The device path (e.g. "/dev/video0") of the camera
*/
cs::UsbCamera StartAutomaticCapture(llvm::StringRef name,
llvm::StringRef path);
cs::UsbCamera StartAutomaticCapture(wpi::StringRef name,
wpi::StringRef path);
#endif
/**
@@ -99,7 +99,7 @@ class CameraServer {
*
* @param host Camera host IP or DNS name (e.g. "10.x.y.11")
*/
cs::AxisCamera AddAxisCamera(llvm::StringRef host);
cs::AxisCamera AddAxisCamera(wpi::StringRef host);
/**
* Adds an Axis IP camera.
@@ -126,7 +126,7 @@ class CameraServer {
*
* @param hosts Array of Camera host IPs/DNS names
*/
cs::AxisCamera AddAxisCamera(llvm::ArrayRef<std::string> hosts);
cs::AxisCamera AddAxisCamera(wpi::ArrayRef<std::string> hosts);
/**
* Adds an Axis IP camera.
@@ -144,7 +144,7 @@ class CameraServer {
* @param name The name to give the camera
* @param host Camera host IP or DNS name (e.g. "10.x.y.11")
*/
cs::AxisCamera AddAxisCamera(llvm::StringRef name, llvm::StringRef host);
cs::AxisCamera AddAxisCamera(wpi::StringRef name, wpi::StringRef host);
/**
* Adds an Axis IP camera.
@@ -152,7 +152,7 @@ class CameraServer {
* @param name The name to give the camera
* @param host Camera host IP or DNS name (e.g. "10.x.y.11")
*/
cs::AxisCamera AddAxisCamera(llvm::StringRef name, const char* host);
cs::AxisCamera AddAxisCamera(wpi::StringRef name, const char* host);
/**
* Adds an Axis IP camera.
@@ -160,7 +160,7 @@ class CameraServer {
* @param name The name to give the camera
* @param host Camera host IP or DNS name (e.g. "10.x.y.11")
*/
cs::AxisCamera AddAxisCamera(llvm::StringRef name, const std::string& host);
cs::AxisCamera AddAxisCamera(wpi::StringRef name, const std::string& host);
/**
* Adds an Axis IP camera.
@@ -168,8 +168,8 @@ class CameraServer {
* @param name The name to give the camera
* @param hosts Array of Camera host IPs/DNS names
*/
cs::AxisCamera AddAxisCamera(llvm::StringRef name,
llvm::ArrayRef<std::string> hosts);
cs::AxisCamera AddAxisCamera(wpi::StringRef name,
wpi::ArrayRef<std::string> hosts);
/**
* Adds an Axis IP camera.
@@ -178,7 +178,7 @@ class CameraServer {
* @param hosts Array of Camera host IPs/DNS names
*/
template <typename T>
cs::AxisCamera AddAxisCamera(llvm::StringRef name,
cs::AxisCamera AddAxisCamera(wpi::StringRef name,
std::initializer_list<T> hosts);
/**
@@ -204,7 +204,7 @@ class CameraServer {
*
* @param name Camera name
*/
cs::CvSink GetVideo(llvm::StringRef name);
cs::CvSink GetVideo(wpi::StringRef name);
/**
* Create a MJPEG stream with OpenCV input. This can be called to pass custom
@@ -214,21 +214,21 @@ class CameraServer {
* @param width Width of the image being sent
* @param height Height of the image being sent
*/
cs::CvSource PutVideo(llvm::StringRef name, int width, int height);
cs::CvSource PutVideo(wpi::StringRef name, int width, int height);
/**
* Adds a MJPEG server at the next available port.
*
* @param name Server name
*/
cs::MjpegServer AddServer(llvm::StringRef name);
cs::MjpegServer AddServer(wpi::StringRef name);
/**
* Adds a MJPEG server.
*
* @param name Server name
*/
cs::MjpegServer AddServer(llvm::StringRef name, int port);
cs::MjpegServer AddServer(wpi::StringRef name, int port);
/**
* Adds an already created server.
@@ -242,7 +242,7 @@ class CameraServer {
*
* @param name Server name
*/
void RemoveServer(llvm::StringRef name);
void RemoveServer(wpi::StringRef name);
/**
* Get server for the primary camera feed.
@@ -257,7 +257,7 @@ class CameraServer {
*
* @param name Server name
*/
cs::VideoSink GetServer(llvm::StringRef name);
cs::VideoSink GetServer(wpi::StringRef name);
/**
* Adds an already created camera.
@@ -271,7 +271,7 @@ class CameraServer {
*
* @param name Camera name
*/
void RemoveCamera(llvm::StringRef name);
void RemoveCamera(wpi::StringRef name);
/**
* Sets the size of the image to use. Use the public kSize constants to set
@@ -297,9 +297,9 @@ class CameraServer {
wpi::mutex m_mutex;
std::atomic<int> m_defaultUsbDevice;
std::string m_primarySourceName;
llvm::StringMap<cs::VideoSource> m_sources;
llvm::StringMap<cs::VideoSink> m_sinks;
llvm::DenseMap<CS_Source, std::shared_ptr<nt::NetworkTable>> m_tables;
wpi::StringMap<cs::VideoSource> m_sources;
wpi::StringMap<cs::VideoSink> m_sinks;
wpi::DenseMap<CS_Source, std::shared_ptr<nt::NetworkTable>> m_tables;
std::shared_ptr<nt::NetworkTable> m_publishTable;
cs::VideoListener m_videoListener;
int m_tableListener;

2
cameraserver/src/main/native/include/CameraServer.inc
View File

@@ -20,7 +20,7 @@ inline cs::AxisCamera CameraServer::AddAxisCamera(
template <typename T>
inline cs::AxisCamera CameraServer::AddAxisCamera(
llvm::StringRef name, std::initializer_list<T> hosts) {
wpi::StringRef name, std::initializer_list<T> hosts) {
std::vector<std::string> vec;
vec.reserve(hosts.size());
for (const auto& host : hosts) vec.emplace_back(host);

8
cameraserver/src/main/native/include/CameraServerShared.h
View File

@@ -11,7 +11,7 @@
#include <thread>
#include <utility>
#include <llvm/StringRef.h>
#include <wpi/StringRef.h>
namespace frc {
class CameraServerShared {
@@ -19,9 +19,9 @@ class CameraServerShared {
virtual void ReportUsbCamera(int id) = 0;
virtual void ReportAxisCamera(int id) = 0;
virtual void ReportVideoServer(int id) = 0;
virtual void SetCameraServerError(llvm::StringRef error) = 0;
virtual void SetVisionRunnerError(llvm::StringRef error) = 0;
virtual void ReportDriverStationError(llvm::StringRef error) = 0;
virtual void SetCameraServerError(wpi::StringRef error) = 0;
virtual void SetVisionRunnerError(wpi::StringRef error) = 0;
virtual void ReportDriverStationError(wpi::StringRef error) = 0;
virtual std::pair<std::thread::id, bool> GetRobotMainThreadId() const = 0;
};