diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml index 332c312c87..9fc1ff6682 100644 --- a/.github/workflows/sanitizers.yml +++ b/.github/workflows/sanitizers.yml @@ -15,7 +15,7 @@ jobs: - name: asan cmake-flags: "-DCMAKE_BUILD_TYPE=Asan" ctest-env: "" - ctest-flags: "-E 'wpiutil|ntcore|wpilibc'" + ctest-flags: "-E 'wpinet|wpiutil|ntcore|wpilibc'" - name: tsan cmake-flags: "-DCMAKE_BUILD_TYPE=Tsan" ctest-env: "TSAN_OPTIONS=second_deadlock_stack=1" diff --git a/.styleguide b/.styleguide index b17762ed05..05958bd400 100644 --- a/.styleguide +++ b/.styleguide @@ -44,4 +44,5 @@ includeOtherLibs { ^wpi/ ^wpigui ^wpimath/ + ^wpinet/ } diff --git a/CMakeLists.txt b/CMakeLists.txt index 7eacb876cb..22a94023da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -148,6 +148,7 @@ find_package(LIBSSH 0.7.1) if (WITH_FLAT_INSTALL) set(WPIUTIL_DEP_REPLACE "include($\{SELF_DIR\}/wpiutil-config.cmake)") +set(WPINET_DEP_REPLACE "include($\{SELF_DIR\}/wpinet-config.cmake)") set(NTCORE_DEP_REPLACE "include($\{SELF_DIR\}/ntcore-config.cmake)") set(CSCORE_DEP_REPLACE_IMPL "include(\${SELF_DIR}/cscore-config.cmake)") set(CAMERASERVER_DEP_REPLACE_IMPL "include(\${SELF_DIR}/cameraserver-config.cmake)") @@ -157,6 +158,7 @@ set(WPILIBC_DEP_REPLACE_IMPL "include(\${SELF_DIR}/wpilibc-config.cmake)") set(WPILIBNEWCOMMANDS_DEP_REPLACE "include(\${SELF_DIR}/wpilibNewcommands-config.cmake)") else() set(WPIUTIL_DEP_REPLACE "find_dependency(wpiutil)") +set(WPINET_DEP_REPLACE "find_dependency(wpinet)") set(NTCORE_DEP_REPLACE "find_dependency(ntcore)") set(CSCORE_DEP_REPLACE_IMPL "find_dependency(cscore)") set(CAMERASERVER_DEP_REPLACE_IMPL "find_dependency(cameraserver)") @@ -245,6 +247,7 @@ if (WITH_TESTS) endif() add_subdirectory(wpiutil) +add_subdirectory(wpinet) add_subdirectory(ntcore) if (WITH_WPIMATH) diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index ba862911ad..7c81bef39e 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -24,9 +24,7 @@ LLVM wpiutil/src/main/native/include/wpi/{various files} JSON for Modern C++ wpiutil/src/main/native/include/wpi/json.h wpiutil/src/main/native/cpp/json_*.cpp wpiutil/src/test/native/cpp/json/ -libuv wpiutil/src/main/native/include/uv.h - wpiutil/src/main/native/include/uv/ - wpiutil/src/main/native/libuv/ +libuv wpinet/src/main/native/thirdparty/libuv/ fmtlib wpiutil/src/main/native/fmtlib/ sigslot wpiutil/src/main/native/include/wpi/Signal.h wpiutil/src/test/native/cpp/sigslot/ @@ -34,11 +32,11 @@ tcpsockets wpiutil/src/main/native/cpp/TCP{Stream,Connector,Acceptor} wpiutil/src/main/native/include/wpi/TCP*.h MPack wpiutil/src/main/native/include/mpack.h wpiutil/src/main/native/cpp/mpack.cpp -Bootstrap wpiutil/src/main/native/resources/bootstrap-* -CoreUI wpiutil/src/main/native/resources/coreui-* -Feather Icons wpiutil/src/main/native/resources/feather-* -jQuery wpiutil/src/main/native/resources/jquery-* -popper.js wpiutil/src/main/native/resources/popper-* +Bootstrap wpinet/src/main/native/resources/bootstrap-* +CoreUI wpinet/src/main/native/resources/coreui-* +Feather Icons wpinet/src/main/native/resources/feather-* +jQuery wpinet/src/main/native/resources/jquery-* +popper.js wpinet/src/main/native/resources/popper-* units wpimath/src/main/native/include/units/ Eigen wpimath/src/main/native/eigeninclude/ wpimath/src/main/native/include/unsupported/ diff --git a/cameraserver/build.gradle b/cameraserver/build.gradle index 7a611e64fb..00e0861b49 100644 --- a/cameraserver/build.gradle +++ b/cameraserver/build.gradle @@ -11,9 +11,11 @@ apply from: "${rootDir}/shared/javacpp/setupBuild.gradle" dependencies { implementation project(':wpiutil') + implementation project(':wpinet') implementation project(':ntcore') implementation project(':cscore') devImplementation project(':wpiutil') + devImplementation project(':wpinet') devImplementation project(':ntcore') devImplementation project(':cscore') } @@ -70,6 +72,7 @@ model { } lib project: ':ntcore', library: 'ntcore', linkage: 'shared' lib project: ':cscore', library: 'cscore', linkage: 'shared' + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' } } diff --git a/cameraserver/multiCameraServer/build.gradle b/cameraserver/multiCameraServer/build.gradle index f7a78c17d2..7c846fb5a7 100644 --- a/cameraserver/multiCameraServer/build.gradle +++ b/cameraserver/multiCameraServer/build.gradle @@ -30,6 +30,7 @@ dependencies { implementation 'com.google.code.gson:gson:2.8.9' implementation project(':wpiutil') + implementation project(':wpinet') implementation project(':ntcore') implementation project(':cscore') implementation project(':cameraserver') @@ -55,6 +56,7 @@ model { lib project: ':cameraserver', library: 'cameraserver', linkage: 'static' lib project: ':ntcore', library: 'ntcore', linkage: 'static' lib project: ':cscore', library: 'cscore', linkage: 'static' + lib project: ':wpinet', library: 'wpinet', linkage: 'static' lib project: ':wpiutil', library: 'wpiutil', linkage: 'static' } } diff --git a/crossConnIntegrationTests/build.gradle b/crossConnIntegrationTests/build.gradle index 8775359b04..9320c4ec5c 100644 --- a/crossConnIntegrationTests/build.gradle +++ b/crossConnIntegrationTests/build.gradle @@ -91,6 +91,7 @@ model { } project(':hal').addHalDependency(binary, 'shared') project(':hal').addHalJniDependency(binary) + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' if (binary.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { nativeUtils.useRequiredLibrary(binary, 'ni_link_libraries', 'ni_runtime_libraries') diff --git a/crossConnIntegrationTests/src/main/native/cpp/mockds/MockDS.cpp b/crossConnIntegrationTests/src/main/native/cpp/mockds/MockDS.cpp index b2e5c2df80..2e53a9ab5e 100644 --- a/crossConnIntegrationTests/src/main/native/cpp/mockds/MockDS.cpp +++ b/crossConnIntegrationTests/src/main/native/cpp/mockds/MockDS.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include static void LoggerFunc(unsigned int level, const char* file, unsigned int line, const char* msg) { diff --git a/cscore/.styleguide b/cscore/.styleguide index f0732e1bf8..f5e99ed9f1 100644 --- a/cscore/.styleguide +++ b/cscore/.styleguide @@ -36,4 +36,5 @@ includeOtherLibs { ^support/ ^tcpsockets/ ^wpi/ + ^wpinet/ } diff --git a/cscore/CMakeLists.txt b/cscore/CMakeLists.txt index 9ab9ca709c..0b39f27df6 100644 --- a/cscore/CMakeLists.txt +++ b/cscore/CMakeLists.txt @@ -33,7 +33,7 @@ target_include_directories(cscore PUBLIC $) target_include_directories(cscore PRIVATE src/main/native/cpp) wpilib_target_warnings(cscore) -target_link_libraries(cscore PUBLIC wpiutil ${OpenCV_LIBS}) +target_link_libraries(cscore PUBLIC wpinet wpiutil ${OpenCV_LIBS}) set_property(TARGET cscore PROPERTY FOLDER "libraries") diff --git a/cscore/build.gradle b/cscore/build.gradle index cd03465dcc..416537b3d5 100644 --- a/cscore/build.gradle +++ b/cscore/build.gradle @@ -45,6 +45,7 @@ model { return } lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' if (it.targetPlatform.operatingSystem.linux) { it.linker.args '-Wl,--version-script=' + file('src/main/native/LinuxSymbolScript.txt') @@ -55,6 +56,15 @@ model { } } } + binaries { + all { + if (!it.buildable || !(it instanceof NativeBinarySpec)) { + return + } + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' + lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' + } + } } @@ -190,6 +200,7 @@ model { targetBuildTypes 'debug' binaries.all { lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib project: ':wpigui', library: 'wpigui', linkage: 'static' lib library: 'cscore', linkage: 'shared' nativeUtils.useRequiredLibrary(it, 'imgui_static') @@ -220,6 +231,7 @@ model { targetBuildTypes 'debug' binaries.all { lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib library: 'cscore', linkage: 'shared' } sources { diff --git a/cscore/src/main/native/cpp/HttpCameraImpl.cpp b/cscore/src/main/native/cpp/HttpCameraImpl.cpp index 9756a5dbe3..aa7f705a87 100644 --- a/cscore/src/main/native/cpp/HttpCameraImpl.cpp +++ b/cscore/src/main/native/cpp/HttpCameraImpl.cpp @@ -6,8 +6,8 @@ #include #include -#include #include +#include #include "Handle.h" #include "Instance.h" diff --git a/cscore/src/main/native/cpp/HttpCameraImpl.h b/cscore/src/main/native/cpp/HttpCameraImpl.h index 2c589362e2..c5646baa93 100644 --- a/cscore/src/main/native/cpp/HttpCameraImpl.h +++ b/cscore/src/main/native/cpp/HttpCameraImpl.h @@ -14,12 +14,12 @@ #include #include -#include #include #include #include #include #include +#include #include "SourceImpl.h" #include "cscore_cpp.h" diff --git a/cscore/src/main/native/cpp/Instance.h b/cscore/src/main/native/cpp/Instance.h index f84eacf4d0..323092fc02 100644 --- a/cscore/src/main/native/cpp/Instance.h +++ b/cscore/src/main/native/cpp/Instance.h @@ -8,8 +8,8 @@ #include #include -#include #include +#include #include "Log.h" #include "NetworkListener.h" diff --git a/cscore/src/main/native/cpp/MjpegServerImpl.cpp b/cscore/src/main/native/cpp/MjpegServerImpl.cpp index 6a8cd2b602..8a07f38bd3 100644 --- a/cscore/src/main/native/cpp/MjpegServerImpl.cpp +++ b/cscore/src/main/native/cpp/MjpegServerImpl.cpp @@ -7,13 +7,13 @@ #include #include -#include #include #include -#include #include -#include -#include +#include +#include +#include +#include #include "Handle.h" #include "Instance.h" diff --git a/cscore/src/main/native/cpp/MjpegServerImpl.h b/cscore/src/main/native/cpp/MjpegServerImpl.h index e323e69b48..01f41da3b7 100644 --- a/cscore/src/main/native/cpp/MjpegServerImpl.h +++ b/cscore/src/main/native/cpp/MjpegServerImpl.h @@ -12,13 +12,13 @@ #include #include -#include -#include #include #include #include #include -#include +#include +#include +#include #include "SinkImpl.h" diff --git a/cscore/src/main/native/cpp/cscore_cpp.cpp b/cscore/src/main/native/cpp/cscore_cpp.cpp index 3b4e5703bc..c497f5f037 100644 --- a/cscore/src/main/native/cpp/cscore_cpp.cpp +++ b/cscore/src/main/native/cpp/cscore_cpp.cpp @@ -5,8 +5,8 @@ #include "cscore_cpp.h" #include -#include #include +#include #include "Handle.h" #include "Instance.h" diff --git a/cscore/src/main/native/linux/UsbCameraListener.cpp b/cscore/src/main/native/linux/UsbCameraListener.cpp index 40e84c5daf..c5a993470c 100644 --- a/cscore/src/main/native/linux/UsbCameraListener.cpp +++ b/cscore/src/main/native/linux/UsbCameraListener.cpp @@ -4,10 +4,10 @@ #include "UsbCameraListener.h" -#include #include -#include -#include +#include +#include +#include #include "Notifier.h" diff --git a/glass/build.gradle b/glass/build.gradle index cd77f45a0b..c0701f4832 100644 --- a/glass/build.gradle +++ b/glass/build.gradle @@ -151,6 +151,7 @@ if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxra } lib library: nativeName, linkage: 'static' lib project: ':ntcore', library: 'ntcore', linkage: 'shared' + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' lib project: ':wpimath', library: 'wpimath', linkage: 'shared' lib project: ':wpigui', library: 'wpigui', linkage: 'static' @@ -189,6 +190,7 @@ if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxra lib library: 'glassnt', linkage: 'static' lib library: nativeName, linkage: 'static' lib project: ':ntcore', library: 'ntcore', linkage: 'static' + lib project: ':wpinet', library: 'wpinet', linkage: 'static' lib project: ':wpiutil', library: 'wpiutil', linkage: 'static' lib project: ':wpimath', library: 'wpimath', linkage: 'static' lib project: ':wpigui', library: 'wpigui', linkage: 'static' diff --git a/myRobot/build.gradle b/myRobot/build.gradle index 7e8e72e823..f0cc377f46 100644 --- a/myRobot/build.gradle +++ b/myRobot/build.gradle @@ -44,6 +44,7 @@ dependencies { implementation project(':wpimath') implementation project(':hal') implementation project(':wpiutil') + implementation project(':wpinet') implementation project(':ntcore') implementation project(':cscore') implementation project(':cameraserver') @@ -169,9 +170,11 @@ model { lib project: ':ntcore', library: 'ntcoreJNIShared', linkage: 'shared' lib project: ':cscore', library: 'cscoreJNIShared', linkage: 'shared' lib project: ':wpimath', library: 'wpimathJNIShared', linkage: 'shared' + lib project: ':wpinet', library: 'wpinetJNIShared', linkage: 'shared' lib project: ':wpiutil', library: 'wpiutilJNIShared', linkage: 'shared' project(':hal').addHalDependency(binary, 'shared') project(':hal').addHalJniDependency(binary) + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' if (binary.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { nativeUtils.useRequiredLibrary(binary, 'ni_link_libraries', 'ni_runtime_libraries') @@ -213,6 +216,7 @@ model { lib project: ':ntcore', library: 'ntcore', linkage: 'static' lib project: ':cscore', library: 'cscore', linkage: 'static' project(':hal').addHalDependency(binary, 'static') + lib project: ':wpinet', library: 'wpinet', linkage: 'static' lib project: ':wpiutil', library: 'wpiutil', linkage: 'static' if (binary.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { nativeUtils.useRequiredLibrary(binary, 'ni_link_libraries', 'ni_runtime_libraries') diff --git a/ntcore/.styleguide b/ntcore/.styleguide index 8cf3a512f0..ef9cbb7ca1 100644 --- a/ntcore/.styleguide +++ b/ntcore/.styleguide @@ -30,4 +30,5 @@ includeOtherLibs { ^fmt/ ^support/ ^wpi/ + ^wpinet/ } diff --git a/ntcore/CMakeLists.txt b/ntcore/CMakeLists.txt index 44992efb29..0edc4ffee7 100644 --- a/ntcore/CMakeLists.txt +++ b/ntcore/CMakeLists.txt @@ -14,7 +14,7 @@ target_include_directories(ntcore PUBLIC $) wpilib_target_warnings(ntcore) target_compile_features(ntcore PUBLIC cxx_std_17) -target_link_libraries(ntcore PUBLIC wpiutil) +target_link_libraries(ntcore PUBLIC wpinet wpiutil) set_property(TARGET ntcore PROPERTY FOLDER "libraries") diff --git a/ntcore/build.gradle b/ntcore/build.gradle index 67674c6a7a..30e3e7eaa8 100644 --- a/ntcore/build.gradle +++ b/ntcore/build.gradle @@ -5,6 +5,19 @@ ext { apply from: "${rootDir}/shared/jni/setupBuild.gradle" +model { + components {} + binaries { + all { + if (!it.buildable || !(it instanceof NativeBinarySpec)) { + return + } + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' + lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' + } + } +} + Action> symbolFilter = { symbols -> symbols.removeIf({ !it.startsWith('NT_') }) } as Action>; diff --git a/ntcore/src/main/native/cpp/Dispatcher.cpp b/ntcore/src/main/native/cpp/Dispatcher.cpp index f09bc8ddd5..5941810c32 100644 --- a/ntcore/src/main/native/cpp/Dispatcher.cpp +++ b/ntcore/src/main/native/cpp/Dispatcher.cpp @@ -9,11 +9,11 @@ #include #include -#include -#include #include #include #include +#include +#include #include "IConnectionNotifier.h" #include "IStorage.h" diff --git a/ntcore/src/main/native/cpp/DsClient.cpp b/ntcore/src/main/native/cpp/DsClient.cpp index 9ed185041c..ebc51c7e2c 100644 --- a/ntcore/src/main/native/cpp/DsClient.cpp +++ b/ntcore/src/main/native/cpp/DsClient.cpp @@ -6,9 +6,9 @@ #include #include -#include #include -#include +#include +#include #include "Dispatcher.h" #include "Log.h" diff --git a/ntcore/src/main/native/cpp/NetworkConnection.cpp b/ntcore/src/main/native/cpp/NetworkConnection.cpp index 838eecbc45..3832d087dc 100644 --- a/ntcore/src/main/native/cpp/NetworkConnection.cpp +++ b/ntcore/src/main/native/cpp/NetworkConnection.cpp @@ -6,9 +6,9 @@ #include -#include -#include #include +#include +#include #include "IConnectionNotifier.h" #include "Log.h" diff --git a/outlineviewer/build.gradle b/outlineviewer/build.gradle index 5b4ee6ed40..17c5baf8b9 100644 --- a/outlineviewer/build.gradle +++ b/outlineviewer/build.gradle @@ -100,6 +100,7 @@ if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxra lib project: ':glass', library: 'glassnt', linkage: 'static' lib project: ':glass', library: 'glass', linkage: 'static' lib project: ':ntcore', library: 'ntcore', linkage: 'static' + lib project: ':wpinet', library: 'wpinet', linkage: 'static' lib project: ':wpiutil', library: 'wpiutil', linkage: 'static' lib project: ':wpigui', library: 'wpigui', linkage: 'static' nativeUtils.useRequiredLibrary(it, 'imgui_static') diff --git a/roborioteamnumbersetter/.styleguide b/roborioteamnumbersetter/.styleguide index 1d448980c2..65af50d981 100644 --- a/roborioteamnumbersetter/.styleguide +++ b/roborioteamnumbersetter/.styleguide @@ -25,4 +25,5 @@ includeOtherLibs { ^ntcore ^wpi/ ^wpigui + ^wpinet/ } diff --git a/roborioteamnumbersetter/CMakeLists.txt b/roborioteamnumbersetter/CMakeLists.txt index 3d81f3e5cd..3895baf3bd 100644 --- a/roborioteamnumbersetter/CMakeLists.txt +++ b/roborioteamnumbersetter/CMakeLists.txt @@ -19,7 +19,7 @@ endif() add_executable(roborioteamnumbersetter ${rtns_src} ${rtns_resources_src} ${rtns_rc} ${APP_ICON_MACOSX}) wpilib_link_macos_gui(roborioteamnumbersetter) -target_link_libraries(roborioteamnumbersetter libglass ${LIBSSH_LIBRARIES}) +target_link_libraries(roborioteamnumbersetter libglass wpinet ${LIBSSH_LIBRARIES}) target_include_directories(roborioteamnumbersetter PRIVATE ${LIBSSH_INCLUDE_DIRS}) if (WIN32) diff --git a/roborioteamnumbersetter/build.gradle b/roborioteamnumbersetter/build.gradle index 2b1a22982a..4a08fdcc19 100644 --- a/roborioteamnumbersetter/build.gradle +++ b/roborioteamnumbersetter/build.gradle @@ -113,6 +113,7 @@ if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxra } it.cppCompiler.define("LIBSSH_STATIC") lib project: ':glass', library: 'glass', linkage: 'static' + lib project: ':wpinet', library: 'wpinet', linkage: 'static' lib project: ':wpiutil', library: 'wpiutil', linkage: 'static' lib project: ':wpigui', library: 'wpigui', linkage: 'static' nativeUtils.useRequiredLibrary(it, 'imgui_static', 'libssh') diff --git a/roborioteamnumbersetter/src/main/native/cpp/App.cpp b/roborioteamnumbersetter/src/main/native/cpp/App.cpp index f803e2292c..e6421d5ec0 100644 --- a/roborioteamnumbersetter/src/main/native/cpp/App.cpp +++ b/roborioteamnumbersetter/src/main/native/cpp/App.cpp @@ -4,6 +4,7 @@ #include #include +#include #ifndef _WIN32 #include @@ -19,13 +20,11 @@ #include #include #include +#include #include +#include #include -#include -#include -#include "wpi/SmallString.h" #include "DeploySession.h" -#include "wpi/MulticastServiceResolver.h" namespace gui = wpi::gui; diff --git a/roborioteamnumbersetter/src/main/native/cpp/DeploySession.cpp b/roborioteamnumbersetter/src/main/native/cpp/DeploySession.cpp index 81c69c4b4d..c660fca762 100644 --- a/roborioteamnumbersetter/src/main/native/cpp/DeploySession.cpp +++ b/roborioteamnumbersetter/src/main/native/cpp/DeploySession.cpp @@ -12,10 +12,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "SshSession.h" diff --git a/settings.gradle b/settings.gradle index a2a2eccbad..64f99ceb93 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,6 +17,7 @@ Properties props = System.getProperties(); props.setProperty("org.gradle.internal.native.headers.unresolved.dependencies.ignore", "true"); include 'wpiutil' +include 'wpinet' include 'ntcore' include 'hal' include 'cscore' diff --git a/shared/plugins/setupBuild.gradle b/shared/plugins/setupBuild.gradle index 2097acecb6..6b0eb0771f 100644 --- a/shared/plugins/setupBuild.gradle +++ b/shared/plugins/setupBuild.gradle @@ -34,6 +34,9 @@ if (!project.hasProperty('onlylinuxathena')) { if (project.hasProperty('includeNtCore')) { lib project: ':ntcore', library: 'ntcore', linkage: 'shared' } + if (project.hasProperty('includeWpinet')) { + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' + } if (project.hasProperty('includeWpiutil')) { lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' } @@ -60,6 +63,9 @@ if (!project.hasProperty('onlylinuxathena')) { if (project.hasProperty('includeNtCore')) { lib project: ':ntcore', library: 'ntcore', linkage: 'shared' } + if (project.hasProperty('includeWpinet')) { + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' + } lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { nativeUtils.useRequiredLibrary(it, 'ni_link_libraries', 'ni_runtime_libraries') diff --git a/simulation/halsim_ds_socket/CMakeLists.txt b/simulation/halsim_ds_socket/CMakeLists.txt index bc9adb1041..6d770d9a1e 100644 --- a/simulation/halsim_ds_socket/CMakeLists.txt +++ b/simulation/halsim_ds_socket/CMakeLists.txt @@ -7,7 +7,7 @@ file(GLOB halsim_ds_socket_src src/main/native/cpp/*.cpp) add_library(halsim_ds_socket SHARED ${halsim_ds_socket_src}) wpilib_target_warnings(halsim_ds_socket) set_target_properties(halsim_ds_socket PROPERTIES DEBUG_POSTFIX "d") -target_link_libraries(halsim_ds_socket PUBLIC hal) +target_link_libraries(halsim_ds_socket PUBLIC hal wpinet) target_include_directories(halsim_ds_socket PRIVATE src/main/native/include) diff --git a/simulation/halsim_ds_socket/build.gradle b/simulation/halsim_ds_socket/build.gradle index 63c55760c3..f21fb552b9 100644 --- a/simulation/halsim_ds_socket/build.gradle +++ b/simulation/halsim_ds_socket/build.gradle @@ -44,8 +44,13 @@ model { } } binaries { + all { + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' + lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' + } withType(GoogleTestTestSuiteBinarySpec) { project(':hal').addHalDependency(it, 'shared') + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' lib library: pluginName, linkage: 'shared' if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { diff --git a/simulation/halsim_ds_socket/src/main/native/cpp/main.cpp b/simulation/halsim_ds_socket/src/main/native/cpp/main.cpp index 799cdd9f95..af84632935 100644 --- a/simulation/halsim_ds_socket/src/main/native/cpp/main.cpp +++ b/simulation/halsim_ds_socket/src/main/native/cpp/main.cpp @@ -21,12 +21,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #if defined(Win32) || defined(_WIN32) #pragma comment(lib, "Ws2_32.lib") diff --git a/simulation/halsim_ds_socket/src/main/native/include/DSCommPacket.h b/simulation/halsim_ds_socket/src/main/native/include/DSCommPacket.h index 5b8b45df95..914b07b9e1 100644 --- a/simulation/halsim_ds_socket/src/main/native/include/DSCommPacket.h +++ b/simulation/halsim_ds_socket/src/main/native/include/DSCommPacket.h @@ -8,8 +8,8 @@ #include #include -#include #include +#include class DSCommPacketTest; diff --git a/simulation/halsim_ws_client/build.gradle b/simulation/halsim_ws_client/build.gradle index 7d32586f66..1fe4d2950b 100644 --- a/simulation/halsim_ws_client/build.gradle +++ b/simulation/halsim_ws_client/build.gradle @@ -27,6 +27,7 @@ if (!project.hasProperty('onlylinuxathena')) { return } + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib project: ":simulation:halsim_ws_core", library: "halsim_ws_core", linkage: "static" } } diff --git a/simulation/halsim_ws_client/src/main/native/cpp/HALSimWS.cpp b/simulation/halsim_ws_client/src/main/native/cpp/HALSimWS.cpp index 9c23885843..f4c5926f96 100644 --- a/simulation/halsim_ws_client/src/main/native/cpp/HALSimWS.cpp +++ b/simulation/halsim_ws_client/src/main/native/cpp/HALSimWS.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include "HALSimWSClientConnection.h" diff --git a/simulation/halsim_ws_client/src/main/native/cpp/HALSimWSClient.cpp b/simulation/halsim_ws_client/src/main/native/cpp/HALSimWSClient.cpp index dfa54d29f4..1df7ebc737 100644 --- a/simulation/halsim_ws_client/src/main/native/cpp/HALSimWSClient.cpp +++ b/simulation/halsim_ws_client/src/main/native/cpp/HALSimWSClient.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include using namespace wpilibws; diff --git a/simulation/halsim_ws_client/src/main/native/cpp/HALSimWSClientConnection.cpp b/simulation/halsim_ws_client/src/main/native/cpp/HALSimWSClientConnection.cpp index 22dadb1245..10ea8af2e3 100644 --- a/simulation/halsim_ws_client/src/main/native/cpp/HALSimWSClientConnection.cpp +++ b/simulation/halsim_ws_client/src/main/native/cpp/HALSimWSClientConnection.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include "HALSimWS.h" diff --git a/simulation/halsim_ws_client/src/main/native/include/HALSimWS.h b/simulation/halsim_ws_client/src/main/native/include/HALSimWS.h index 9563482032..5bec17cdbb 100644 --- a/simulation/halsim_ws_client/src/main/native/include/HALSimWS.h +++ b/simulation/halsim_ws_client/src/main/native/include/HALSimWS.h @@ -10,10 +10,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace wpi { class json; diff --git a/simulation/halsim_ws_client/src/main/native/include/HALSimWSClient.h b/simulation/halsim_ws_client/src/main/native/include/HALSimWSClient.h index f048b4058e..d5cdbbbafd 100644 --- a/simulation/halsim_ws_client/src/main/native/include/HALSimWSClient.h +++ b/simulation/halsim_ws_client/src/main/native/include/HALSimWSClient.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include "HALSimWS.h" diff --git a/simulation/halsim_ws_client/src/main/native/include/HALSimWSClientConnection.h b/simulation/halsim_ws_client/src/main/native/include/HALSimWSClientConnection.h index dddd885c64..b712e70897 100644 --- a/simulation/halsim_ws_client/src/main/native/include/HALSimWSClientConnection.h +++ b/simulation/halsim_ws_client/src/main/native/include/HALSimWSClientConnection.h @@ -8,10 +8,10 @@ #include #include -#include #include -#include -#include +#include +#include +#include #include "HALSimWS.h" diff --git a/simulation/halsim_ws_core/CMakeLists.txt b/simulation/halsim_ws_core/CMakeLists.txt index 56b176668d..91bcbb25b3 100644 --- a/simulation/halsim_ws_core/CMakeLists.txt +++ b/simulation/halsim_ws_core/CMakeLists.txt @@ -7,7 +7,7 @@ file(GLOB halsim_ws_core_src src/main/native/cpp/*.cpp) add_library(halsim_ws_core STATIC ${halsim_ws_core_src}) wpilib_target_warnings(halsim_ws_core) set_target_properties(halsim_ws_core PROPERTIES DEBUG_POSTFIX "d" POSITION_INDEPENDENT_CODE ON) -target_link_libraries(halsim_ws_core PUBLIC hal) +target_link_libraries(halsim_ws_core PUBLIC hal wpinet) target_include_directories(halsim_ws_core PUBLIC src/main/native/include) diff --git a/simulation/halsim_ws_core/build.gradle b/simulation/halsim_ws_core/build.gradle index 8e1f7ab8ca..abdfddc0b2 100644 --- a/simulation/halsim_ws_core/build.gradle +++ b/simulation/halsim_ws_core/build.gradle @@ -8,7 +8,7 @@ if (!project.hasProperty('onlylinuxathena')) { ext { includeWpiutil = true - includeNtCore = true + includeWpinet = true pluginName = 'halsim_ws_core' } @@ -41,6 +41,7 @@ if (!project.hasProperty('onlylinuxathena')) { } binaries.all { project(':hal').addHalDependency(it, 'shared') + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' } appendDebugPathToBinaries(binaries) diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_SimDevice.h b/simulation/halsim_ws_core/src/main/native/include/WSProvider_SimDevice.h index c4d4347635..3a1ff5f76a 100644 --- a/simulation/halsim_ws_core/src/main/native/include/WSProvider_SimDevice.h +++ b/simulation/halsim_ws_core/src/main/native/include/WSProvider_SimDevice.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include "WSBaseProvider.h" #include "WSProviderContainer.h" diff --git a/simulation/halsim_ws_server/build.gradle b/simulation/halsim_ws_server/build.gradle index 16cb24ed6e..94237d426d 100644 --- a/simulation/halsim_ws_server/build.gradle +++ b/simulation/halsim_ws_server/build.gradle @@ -51,6 +51,7 @@ model { return } + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib project: ":simulation:halsim_ws_core", library: "halsim_ws_core", linkage: "static" } diff --git a/simulation/halsim_ws_server/src/main/native/cpp/HALSimHttpConnection.cpp b/simulation/halsim_ws_server/src/main/native/cpp/HALSimHttpConnection.cpp index 3a2e3b2d24..77dec08f0c 100644 --- a/simulation/halsim_ws_server/src/main/native/cpp/HALSimHttpConnection.cpp +++ b/simulation/halsim_ws_server/src/main/native/cpp/HALSimHttpConnection.cpp @@ -9,14 +9,14 @@ #include #include -#include #include #include -#include #include #include -#include -#include +#include +#include +#include +#include namespace uv = wpi::uv; diff --git a/simulation/halsim_ws_server/src/main/native/cpp/HALSimWeb.cpp b/simulation/halsim_ws_server/src/main/native/cpp/HALSimWeb.cpp index 43e3b08962..8a6df97810 100644 --- a/simulation/halsim_ws_server/src/main/native/cpp/HALSimWeb.cpp +++ b/simulation/halsim_ws_server/src/main/native/cpp/HALSimWeb.cpp @@ -6,12 +6,12 @@ #include #include -#include -#include #include -#include -#include -#include +#include +#include +#include +#include +#include #include "HALSimHttpConnection.h" diff --git a/simulation/halsim_ws_server/src/main/native/include/HALSimHttpConnection.h b/simulation/halsim_ws_server/src/main/native/include/HALSimHttpConnection.h index 217e2ba4bb..91cfb61dfc 100644 --- a/simulation/halsim_ws_server/src/main/native/include/HALSimHttpConnection.h +++ b/simulation/halsim_ws_server/src/main/native/include/HALSimHttpConnection.h @@ -10,10 +10,10 @@ #include #include -#include #include -#include -#include +#include +#include +#include #include "HALSimWeb.h" diff --git a/simulation/halsim_ws_server/src/main/native/include/HALSimWSServer.h b/simulation/halsim_ws_server/src/main/native/include/HALSimWSServer.h index 484bfffb14..842e5b2dcb 100644 --- a/simulation/halsim_ws_server/src/main/native/include/HALSimWSServer.h +++ b/simulation/halsim_ws_server/src/main/native/include/HALSimWSServer.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include "HALSimWeb.h" diff --git a/simulation/halsim_ws_server/src/main/native/include/HALSimWeb.h b/simulation/halsim_ws_server/src/main/native/include/HALSimWeb.h index 83a680e74f..de5d1f227a 100644 --- a/simulation/halsim_ws_server/src/main/native/include/HALSimWeb.h +++ b/simulation/halsim_ws_server/src/main/native/include/HALSimWeb.h @@ -11,9 +11,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include namespace wpi { class json; diff --git a/simulation/halsim_ws_server/src/test/native/cpp/WebServerClientTest.cpp b/simulation/halsim_ws_server/src/test/native/cpp/WebServerClientTest.cpp index f13a0c65b3..fff4ae90ba 100644 --- a/simulation/halsim_ws_server/src/test/native/cpp/WebServerClientTest.cpp +++ b/simulation/halsim_ws_server/src/test/native/cpp/WebServerClientTest.cpp @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include static constexpr int kTcpConnectAttemptTimeout = 1000; diff --git a/simulation/halsim_ws_server/src/test/native/cpp/main.cpp b/simulation/halsim_ws_server/src/test/native/cpp/main.cpp index ef31ba1fb8..6a81441e22 100644 --- a/simulation/halsim_ws_server/src/test/native/cpp/main.cpp +++ b/simulation/halsim_ws_server/src/test/native/cpp/main.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include "HALSimWSServer.h" #include "WebServerClientTest.h" diff --git a/simulation/halsim_ws_server/src/test/native/include/WebServerClientTest.h b/simulation/halsim_ws_server/src/test/native/include/WebServerClientTest.h index 08db565e85..cda61ddf65 100644 --- a/simulation/halsim_ws_server/src/test/native/include/WebServerClientTest.h +++ b/simulation/halsim_ws_server/src/test/native/include/WebServerClientTest.h @@ -7,14 +7,14 @@ #include #include -#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace wpilibws { diff --git a/wpilibNewCommands/build.gradle b/wpilibNewCommands/build.gradle index 3c9f0c4dd7..9c6348a56c 100644 --- a/wpilibNewCommands/build.gradle +++ b/wpilibNewCommands/build.gradle @@ -15,12 +15,14 @@ apply from: "${rootDir}/shared/javacpp/setupBuild.gradle" dependencies { implementation project(':wpiutil') + implementation project(':wpinet') implementation project(':ntcore') implementation project(':cscore') implementation project(':hal') implementation project(':wpimath') implementation project(':wpilibj') devImplementation project(':wpiutil') + devImplementation project(':wpinet') devImplementation project(':ntcore') devImplementation project(':cscore') devImplementation project(':hal') @@ -71,10 +73,12 @@ model { lib project: ':ntcore', library: 'ntcore', linkage: 'shared' project(':hal').addHalDependency(it, 'shared') lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib project: ':wpimath', library: 'wpimath', linkage: 'shared' if (it.component.name == "${nativeName}Dev") { lib project: ':ntcore', library: 'ntcoreJNIShared', linkage: 'shared' + lib project: ':wpinet', library: 'wpinetJNIShared', linkage: 'shared' lib project: ':wpiutil', library: 'wpiutilJNIShared', linkage: 'shared' project(':hal').addHalJniDependency(it) } diff --git a/wpilibc/build.gradle b/wpilibc/build.gradle index c9c2670d07..f3676ba781 100644 --- a/wpilibc/build.gradle +++ b/wpilibc/build.gradle @@ -116,6 +116,7 @@ model { cppCompiler.define 'DYNAMIC_CAMERA_SERVER' lib project: ':ntcore', library: 'ntcore', linkage: 'shared' project(':hal').addHalDependency(it, 'shared') + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' lib project: ':wpimath', library: 'wpimath', linkage: 'shared' } @@ -135,6 +136,7 @@ model { binaries.all { lib project: ':ntcore', library: 'ntcore', linkage: 'shared' project(':hal').addHalDependency(it, 'shared') + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' lib project: ':wpimath', library: 'wpimath', linkage: 'shared' @@ -172,6 +174,7 @@ model { lib project: ':ntcore', library: 'ntcore', linkage: 'shared' lib project: ':cscore', library: 'cscore', linkage: 'shared' project(':hal').addHalDependency(it, 'shared') + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' lib project: ':wpimath', library: 'wpimath', linkage: 'shared' lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared' @@ -222,6 +225,7 @@ model { lib project: ':ntcore', library: 'ntcore', linkage: 'shared' lib project: ':cscore', library: 'cscore', linkage: 'shared' project(':hal').addHalDependency(it, 'shared') + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' lib project: ':wpimath', library: 'wpimath', linkage: 'shared' lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared' diff --git a/wpilibcExamples/build.gradle b/wpilibcExamples/build.gradle index 50f06d1772..975a301b12 100644 --- a/wpilibcExamples/build.gradle +++ b/wpilibcExamples/build.gradle @@ -71,6 +71,7 @@ model { lib project: ':cscore', library: 'cscore', linkage: 'shared' project(':hal').addHalDependency(binary, 'shared') lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared' + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' } sources { @@ -98,6 +99,7 @@ model { lib project: ':cscore', library: 'cscore', linkage: 'shared' project(':hal').addHalDependency(binary, 'shared') lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared' + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' if (binary.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { nativeUtils.useRequiredLibrary(binary, 'ni_link_libraries', 'ni_runtime_libraries') @@ -145,6 +147,7 @@ model { lib project: ':cscore', library: 'cscore', linkage: 'shared' project(':hal').addHalDependency(binary, 'shared') lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared' + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' binary.tasks.withType(CppCompile) { if (!(binary.toolChain in VisualCpp)) { @@ -216,6 +219,7 @@ model { lib project: ':cscore', library: 'cscore', linkage: 'shared' project(':hal').addHalDependency(it, 'shared') lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared' + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { nativeUtils.useRequiredLibrary(it, 'ni_link_libraries', 'ni_runtime_libraries') diff --git a/wpilibcIntegrationTests/build.gradle b/wpilibcIntegrationTests/build.gradle index dbfda457e3..c46605d3df 100644 --- a/wpilibcIntegrationTests/build.gradle +++ b/wpilibcIntegrationTests/build.gradle @@ -53,6 +53,7 @@ model { project(':hal').addHalDependency(binary, 'shared') project(':hal').addHalJniDependency(binary) lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared' if (binary.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { nativeUtils.useRequiredLibrary(binary, 'ni_link_libraries', 'ni_runtime_libraries') diff --git a/wpilibcIntegrationTests/src/main/native/cpp/mockds/MockDS.cpp b/wpilibcIntegrationTests/src/main/native/cpp/mockds/MockDS.cpp index b2e5c2df80..2e53a9ab5e 100644 --- a/wpilibcIntegrationTests/src/main/native/cpp/mockds/MockDS.cpp +++ b/wpilibcIntegrationTests/src/main/native/cpp/mockds/MockDS.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include static void LoggerFunc(unsigned int level, const char* file, unsigned int line, const char* msg) { diff --git a/wpilibj/build.gradle b/wpilibj/build.gradle index 665560cbb7..f5b579fbfe 100644 --- a/wpilibj/build.gradle +++ b/wpilibj/build.gradle @@ -62,6 +62,7 @@ repositories { dependencies { implementation project(':hal') implementation project(':wpiutil') + implementation project(':wpinet') implementation project(':wpimath') implementation project(':ntcore') implementation project(':cscore') @@ -69,6 +70,7 @@ dependencies { testImplementation 'org.mockito:mockito-core:4.1.0' devImplementation project(':hal') devImplementation project(':wpiutil') + devImplementation project(':wpinet') devImplementation project(':wpimath') devImplementation project(':ntcore') devImplementation project(':cscore') @@ -110,10 +112,12 @@ model { binaries.all { lib project: ':ntcore', library: 'ntcore', linkage: 'shared' lib project: ':cscore', library: 'cscore', linkage: 'shared' + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' lib project: ':wpimath', library: 'wpimath', linkage: 'shared' lib project: ':ntcore', library: 'ntcoreJNIShared', linkage: 'shared' lib project: ':cscore', library: 'cscoreJNIShared', linkage: 'shared' + lib project: ':wpinet', library: 'wpinetJNIShared', linkage: 'shared' lib project: ':wpiutil', library: 'wpiutilJNIShared', linkage: 'shared' lib project: ':wpimath', library: 'wpimathJNIShared', linkage: 'shared' lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared' diff --git a/wpilibjExamples/build.gradle b/wpilibjExamples/build.gradle index 12a38e80e6..431dbd5ad1 100644 --- a/wpilibjExamples/build.gradle +++ b/wpilibjExamples/build.gradle @@ -31,6 +31,7 @@ dependencies { implementation project(':wpimath') implementation project(':hal') implementation project(':wpiutil') + implementation project(':wpinet') implementation project(':ntcore') implementation project(':cscore') implementation project(':cameraserver') @@ -118,6 +119,8 @@ model { project(':hal').addHalJniDependency(binary) lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' lib project: ':wpiutil', library: 'wpiutilJNI', linkage: 'shared' + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' + lib project: ':wpinet', library: 'wpinetJNI', linkage: 'shared' lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared' if (binary.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { nativeUtils.useRequiredLibrary(binary, 'ni_link_libraries', 'ni_runtime_libraries') diff --git a/wpilibjIntegrationTests/build.gradle b/wpilibjIntegrationTests/build.gradle index d2daedaec1..b5b48aba59 100644 --- a/wpilibjIntegrationTests/build.gradle +++ b/wpilibjIntegrationTests/build.gradle @@ -24,6 +24,7 @@ dependencies { implementation project(':wpimath') implementation project(':hal') implementation project(':wpiutil') + implementation project(':wpinet') implementation project(':ntcore') implementation project(':cscore') implementation project(':cameraserver') diff --git a/wpinet/.styleguide b/wpinet/.styleguide new file mode 100644 index 0000000000..92a2608225 --- /dev/null +++ b/wpinet/.styleguide @@ -0,0 +1,41 @@ +cppHeaderFileInclude { + \.h$ + \.inc$ + \.inl$ +} + +cppSrcFileInclude { + \.cpp$ +} + +generatedFileExclude { + src/main/native/cpp/http_parser\.cpp$ + src/main/native/include/wpinet/http_parser\.h$ + src/main/native/thirdparty/libuv/ + src/main/native/resources/ + src/main/native/linux/AvahiClient +} + +licenseUpdateExclude { + src/main/native/cpp/TCPAcceptor\.cpp$ + src/main/native/cpp/TCPConnector\.cpp$ + src/main/native/cpp/TCPStream\.cpp$ + src/main/native/include/wpinet/TCPAcceptor\.h$ + src/main/native/include/wpinet/TCPConnector\.h$ + src/main/native/include/wpinet/TCPStream\.h$ +} + +repoRootNameOverride { + wpinet +} + +includeGuardRoots { + wpinet/src/main/native/cpp/ + wpinet/src/main/native/include/wpinet/ + wpinet/src/test/native/cpp/ +} + +includeOtherLibs { + ^fmt/ + ^wpi/ +} diff --git a/wpinet/CMakeLists.txt b/wpinet/CMakeLists.txt new file mode 100644 index 0000000000..0236051c61 --- /dev/null +++ b/wpinet/CMakeLists.txt @@ -0,0 +1,218 @@ +project(wpinet) + +include(SubDirList) +include(GenResources) +include(CompileWarnings) +include(AddTest) + +file(GLOB wpinet_jni_src src/main/native/cpp/jni/WPINetJNI.cpp) + +# Java bindings +if (WITH_JAVA) + find_package(Java REQUIRED) + find_package(JNI REQUIRED) + include(UseJava) + set(CMAKE_JAVA_COMPILE_FLAGS "-encoding" "UTF8" "-Xlint:unchecked") + + set(CMAKE_JNI_TARGET true) + + file(GLOB_RECURSE JAVA_SOURCES src/main/java/*.java) + + if(${CMAKE_VERSION} VERSION_LESS "3.11.0") + set(CMAKE_JAVA_COMPILE_FLAGS "-h" "${CMAKE_CURRENT_BINARY_DIR}/jniheaders") + add_jar(wpinet_jar ${JAVA_SOURCES} INCLUDE_JARS wpiutil_jar OUTPUT_NAME wpinet) + else() + add_jar(wpinet_jar ${JAVA_SOURCES} INCLUDE_JARS wpiutil_jar OUTPUT_NAME wpinet GENERATE_NATIVE_HEADERS wpinet_jni_headers) + endif() + + get_property(WPINET_JAR_FILE TARGET wpinet_jar PROPERTY JAR_FILE) + install(FILES ${WPINET_JAR_FILE} DESTINATION "${java_lib_dest}") + + set_property(TARGET wpinet_jar PROPERTY FOLDER "java") + + add_library(wpinetjni ${wpinet_jni_src}) + wpilib_target_warnings(wpinetjni) + target_link_libraries(wpinetjni PUBLIC wpinet) + + set_property(TARGET wpinetjni PROPERTY FOLDER "libraries") + + if(${CMAKE_VERSION} VERSION_LESS "3.11.0") + target_include_directories(wpinetjni PRIVATE ${JNI_INCLUDE_DIRS}) + target_include_directories(wpinetjni PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/jniheaders") + else() + target_link_libraries(wpinetjni PRIVATE wpinet_jni_headers) + endif() + add_dependencies(wpinetjni wpinet_jar) + + if (MSVC) + install(TARGETS wpinetjni RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) + endif() + + install(TARGETS wpinetjni EXPORT wpinetjni DESTINATION "${main_lib_dest}") + +endif() + +set(THREADS_PREFER_PTHREAD_FLAG ON) +find_package(Threads REQUIRED) + +if (NOT MSVC AND NOT APPLE) + find_library(ATOMIC NAMES atomic libatomic.so.1) + if (ATOMIC) + message(STATUS "Found libatomic: ${ATOMIC}") + endif() +endif() + +GENERATE_RESOURCES(src/main/native/resources generated/main/cpp WPI wpi wpinet_resources_src) + +file(GLOB_RECURSE wpinet_native_src src/main/native/cpp/*.cpp) +list(REMOVE_ITEM wpinet_native_src ${wpinet_jni_src}) +file(GLOB_RECURSE wpinet_unix_src src/main/native/unix/*.cpp) +file(GLOB_RECURSE wpinet_linux_src src/main/native/linux/*.cpp) +file(GLOB_RECURSE wpinet_macos_src src/main/native/macOS/*.cpp) +file(GLOB_RECURSE wpinet_windows_src src/main/native/windows/*.cpp) + +file(GLOB uv_native_src src/main/native/thirdparty/libuv/src/*.cpp) + +file(GLOB uv_windows_src src/main/native/thirdparty/libuv/src/win/*.cpp) + +set(uv_unix_src + src/main/native/thirdparty/libuv/src/unix/async.cpp + src/main/native/thirdparty/libuv/src/unix/core.cpp + src/main/native/thirdparty/libuv/src/unix/dl.cpp + src/main/native/thirdparty/libuv/src/unix/fs.cpp + src/main/native/thirdparty/libuv/src/unix/getaddrinfo.cpp + src/main/native/thirdparty/libuv/src/unix/getnameinfo.cpp + src/main/native/thirdparty/libuv/src/unix/loop-watcher.cpp + src/main/native/thirdparty/libuv/src/unix/loop.cpp + src/main/native/thirdparty/libuv/src/unix/pipe.cpp + src/main/native/thirdparty/libuv/src/unix/poll.cpp + src/main/native/thirdparty/libuv/src/unix/process.cpp + src/main/native/thirdparty/libuv/src/unix/signal.cpp + src/main/native/thirdparty/libuv/src/unix/stream.cpp + src/main/native/thirdparty/libuv/src/unix/tcp.cpp + src/main/native/thirdparty/libuv/src/unix/thread.cpp + src/main/native/thirdparty/libuv/src/unix/tty.cpp + src/main/native/thirdparty/libuv/src/unix/udp.cpp +) + +set(uv_darwin_src + src/main/native/thirdparty/libuv/src/unix/bsd-ifaddrs.cpp + src/main/native/thirdparty/libuv/src/unix/darwin.cpp + src/main/native/thirdparty/libuv/src/unix/darwin-proctitle.cpp + src/main/native/thirdparty/libuv/src/unix/fsevents.cpp + src/main/native/thirdparty/libuv/src/unix/kqueue.cpp + src/main/native/thirdparty/libuv/src/unix/proctitle.cpp +) + +set(uv_linux_src + src/main/native/thirdparty/libuv/src/unix/linux-core.cpp + src/main/native/thirdparty/libuv/src/unix/linux-inotify.cpp + src/main/native/thirdparty/libuv/src/unix/linux-syscalls.cpp + src/main/native/thirdparty/libuv/src/unix/procfs-exepath.cpp + src/main/native/thirdparty/libuv/src/unix/proctitle.cpp + src/main/native/thirdparty/libuv/src/unix/sysinfo-loadavg.cpp +) + +add_library(wpinet ${wpinet_native_src} ${wpinet_resources_src}) +set_target_properties(wpinet PROPERTIES DEBUG_POSTFIX "d") + +set_property(TARGET wpinet PROPERTY FOLDER "libraries") + +target_compile_features(wpinet PUBLIC cxx_std_17) +wpilib_target_warnings(wpinet) +target_link_libraries(wpinet PUBLIC wpiutil) + +if (NOT USE_VCPKG_LIBUV) + target_sources(wpinet PRIVATE ${uv_native_src}) + install(DIRECTORY src/main/native/thirdparty/libuv/include/ DESTINATION "${include_dest}/wpinet") + target_include_directories(wpinet PRIVATE + src/main/native/thirdparty/libuv/src) + target_include_directories(wpinet PUBLIC + $ + $) + if(NOT MSVC) + target_sources(wpinet PRIVATE ${uv_unix_src}) + if (APPLE) + target_sources(wpinet PRIVATE ${uv_darwin_src}) + else() + target_sources(wpinet PRIVATE ${uv_linux_src}) + endif() + target_compile_definitions(wpinet PRIVATE -D_GNU_SOURCE) + else() + target_sources(wpinet PRIVATE ${uv_windows_src}) + if(BUILD_SHARED_LIBS) + target_compile_definitions(wpinet PRIVATE -DBUILDING_UV_SHARED) + endif() + endif() +else() + find_package(unofficial-libuv CONFIG REQUIRED) + target_link_libraries(wpinet unofficial::libuv::libuv) +endif() + +if (MSVC) + target_sources(wpinet PRIVATE ${wpinet_windows_src}) +else () + target_sources(wpinet PRIVATE ${wpinet_unix_src}) + if (APPLE) + target_sources(wpinet PRIVATE ${wpinet_macos_src}) + else() + target_sources(wpinet PRIVATE ${wpinet_linux_src}) + endif() +endif() + +target_include_directories(wpinet PUBLIC + $ + $) + +install(TARGETS wpinet EXPORT wpinet DESTINATION "${main_lib_dest}") +install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/wpinet") + +if (WITH_JAVA AND MSVC) + install(TARGETS wpinet RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) +endif() + +if (WITH_FLAT_INSTALL) + set (wpinet_config_dir ${wpilib_dest}) +else() + set (wpinet_config_dir share/wpinet) +endif() + +configure_file(wpinet-config.cmake.in ${WPILIB_BINARY_DIR}/wpinet-config.cmake ) +install(FILES ${WPILIB_BINARY_DIR}/wpinet-config.cmake DESTINATION ${wpinet_config_dir}) +install(EXPORT wpinet DESTINATION ${wpinet_config_dir}) + +SUBDIR_LIST(wpinet_examples "${CMAKE_CURRENT_SOURCE_DIR}/examples") +foreach(example ${wpinet_examples}) + file(GLOB wpinet_example_src examples/${example}/*.cpp) + if(wpinet_example_src) + add_executable(wpinet_${example} ${wpinet_example_src}) + wpilib_target_warnings(wpinet_${example}) + target_link_libraries(wpinet_${example} wpinet) + set_property(TARGET wpinet_${example} PROPERTY FOLDER "examples") + endif() +endforeach() + +if (UNIX AND NOT APPLE) + set (LIBUTIL -lutil) +else() + set (LIBUTIL) +endif() + +file(GLOB netconsoleServer_src src/netconsoleServer/native/cpp/*.cpp) +add_executable(netconsoleServer ${netconsoleServer_src}) +wpilib_target_warnings(netconsoleServer) +target_link_libraries(netconsoleServer wpinet ${LIBUTIL}) + +file(GLOB netconsoleTee_src src/netconsoleTee/native/cpp/*.cpp) +add_executable(netconsoleTee ${netconsoleTee_src}) +wpilib_target_warnings(netconsoleTee) +target_link_libraries(netconsoleTee wpinet) + +set_property(TARGET netconsoleServer PROPERTY FOLDER "examples") +set_property(TARGET netconsoleTee PROPERTY FOLDER "examples") + +if (WITH_TESTS) + wpilib_add_test(wpinet src/test/native/cpp) + target_include_directories(wpinet_test PRIVATE src/test/native/include) + target_link_libraries(wpinet_test wpinet ${LIBUTIL} gmock_main) +endif() diff --git a/wpinet/build.gradle b/wpinet/build.gradle new file mode 100644 index 0000000000..748a62438b --- /dev/null +++ b/wpinet/build.gradle @@ -0,0 +1,284 @@ +apply from: "${rootDir}/shared/resources.gradle" + +ext { + skipJniCheck = true + baseId = 'wpinet' + groupId = 'edu.wpi.first.net' + + nativeName = 'wpinet' + devMain = 'edu.wpi.first.net.DevMain' + def generateTask = createGenerateResourcesTask('main', 'WPI', 'wpi', project) + + splitSetup = { + it.tasks.withType(CppCompile) { + dependsOn generateTask + } + it.sources { + libuvCpp(CppSourceSet) { + source { + srcDirs 'src/main/native/thirdparty/libuv/src' + include '*.cpp' + } + exportedHeaders { + srcDirs 'src/main/native/include', 'src/main/native/thirdparty/libuv/include', 'src/main/native/thirdparty/libuv/src' + } + } + resourcesCpp(CppSourceSet) { + source { + srcDirs "$buildDir/generated/main/cpp", "$rootDir/shared/singlelib" + include '*.cpp' + } + exportedHeaders { + srcDirs 'src/main/native/include' + } + } + } + if (!it.targetPlatform.operatingSystem.isWindows()) { + it.cppCompiler.define '_GNU_SOURCE' + it.sources { + libuvUnixCpp(CppSourceSet) { + source { + srcDirs 'src/main/native/thirdparty/libuv/src/unix' + includes = [ + 'async.cpp', + 'core.cpp', + 'dl.cpp', + 'fs.cpp', + 'getaddrinfo.cpp', + 'getnameinfo.cpp', + 'loop-watcher.cpp', + 'loop.cpp', + 'pipe.cpp', + 'poll.cpp', + 'process.cpp', + 'signal.cpp', + 'stream.cpp', + 'tcp.cpp', + 'thread.cpp', + 'timer.cpp', + 'tty.cpp', + 'udp.cpp', + ] + } + exportedHeaders { + srcDirs 'src/main/native/include', 'src/main/native/thirdparty/libuv/include', 'src/main/native/thirdparty/libuv/src' + } + } + wpinetUnixCpp(CppSourceSet) { + source { + srcDirs 'src/main/native/unix' + include '**/*.cpp' + } + exportedHeaders { + srcDirs 'src/main/native/include', 'src/main/native/cpp' + include '**/*.h' + } + } + } + } + if (it.targetPlatform.operatingSystem.isWindows()) { + if (it in SharedLibraryBinarySpec) { + it.cppCompiler.define 'BUILDING_UV_SHARED' + } + it.sources { + libuvWindowsCpp(CppSourceSet) { + source { + srcDirs 'src/main/native/thirdparty/libuv/src/win' + include '*.cpp' + } + exportedHeaders { + srcDirs 'src/main/native/include', 'src/main/native/thirdparty/libuv/include', 'src/main/native/thirdparty/libuv/src' + } + } + wpinetWindowsCpp(CppSourceSet) { + source { + srcDirs 'src/main/native/windows' + include '**/*.cpp' + } + exportedHeaders { + srcDirs 'src/main/native/include', 'src/main/native/cpp' + include '**/*.h' + } + } + } + } else if (it.targetPlatform.operatingSystem.isMacOsX()) { + it.sources { + libuvMacCpp(CppSourceSet) { + source { + srcDirs 'src/main/native/thirdparty/libuv/src/unix' + includes = [ + 'bsd-ifaddrs.cpp', + 'darwin.cpp', + 'darwin-proctitle.cpp', + 'fsevents.cpp', + 'kqueue.cpp', + 'proctitle.cpp' + ] + } + exportedHeaders { + srcDirs 'src/main/native/include', 'src/main/native/thirdparty/libuv/include', 'src/main/native/thirdparty/libuv/src' + } + } + wpinetmacOSCpp(CppSourceSet) { + source { + srcDirs 'src/main/native/macOS' + include '**/*.cpp' + } + exportedHeaders { + srcDirs 'src/main/native/include', 'src/main/native/cpp' + include '**/*.h' + } + } + } + } else { + it.sources { + libuvLinuxCpp(CppSourceSet) { + source { + srcDirs 'src/main/native/thirdparty/libuv/src/unix' + includes = [ + 'linux-core.cpp', + 'linux-inotify.cpp', + 'linux-syscalls.cpp', + 'procfs-exepath.cpp', + 'proctitle.cpp', + 'sysinfo-loadavg.cpp', + ] + } + exportedHeaders { + srcDirs 'src/main/native/include', 'src/main/native/thirdparty/libuv/include', 'src/main/native/thirdparty/libuv/src' + } + } + wpinetLinuxCpp(CppSourceSet) { + source { + srcDirs 'src/main/native/linux' + include '**/*.cpp' + } + exportedHeaders { + srcDirs 'src/main/native/include', 'src/main/native/cpp', 'src/main/native/fmtlib/include' + include '**/*.h' + } + } + } + } + } +} + +def examplesMap = [:]; +file("$projectDir/examples").list(new FilenameFilter() { + @Override + public boolean accept(File current, String name) { + return new File(current, name).isDirectory(); + } + }).each { + examplesMap.put(it, []) + } + +apply from: "${rootDir}/shared/jni/setupBuild.gradle" + +nativeUtils.exportsConfigs { + wpinet { + x86ExcludeSymbols = [ + '_CT??_R0?AV_System_error', + '_CT??_R0?AVexception', + '_CT??_R0?AVfailure', + '_CT??_R0?AVruntime_error', + '_CT??_R0?AVsystem_error', + '_CTA5?AVfailure', + '_TI5?AVfailure', + '_CT??_R0?AVout_of_range', + '_CTA3?AVout_of_range', + '_TI3?AVout_of_range', + '_CT??_R0?AVbad_cast' + ] + x64ExcludeSymbols = [ + '_CT??_R0?AV_System_error', + '_CT??_R0?AVexception', + '_CT??_R0?AVfailure', + '_CT??_R0?AVruntime_error', + '_CT??_R0?AVsystem_error', + '_CTA5?AVfailure', + '_TI5?AVfailure', + '_CT??_R0?AVout_of_range', + '_CTA3?AVout_of_range', + '_TI3?AVout_of_range', + '_CT??_R0?AVbad_cast' + ] + } +} + +cppHeadersZip { + from('src/main/native/thirdparty/libuv/include') { + into '/' + } +} + +model { + components { + all { + it.sources.each { + it.exportedHeaders { + srcDirs 'src/main/native/include', 'src/main/native/thirdparty/libuv/include', 'src/main/native/thirdparty/libuv/src' + } + } + } + } +} + +model { + components { + examplesMap.each { key, value -> + "${key}"(NativeExecutableSpec) { + targetBuildTypes 'debug' + binaries.all { + lib library: 'wpinet', linkage: 'shared' + lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' + } + sources { + cpp { + source { + srcDirs 'examples/' + "${key}" + include '**/*.cpp' + } + } + } + } + } + netconsoleServer(NativeExecutableSpec) { + targetBuildTypes 'release' + sources { + cpp { + source { + srcDirs = [ + 'src/netconsoleServer/native/cpp' + ] + includes = ['**/*.cpp'] + } + } + } + binaries.all { binary -> + lib project: ':wpinet', library: 'wpinet', linkage: 'static' + lib project: ':wpiutil', library: 'wpiutil', linkage: 'static' + if (binary.targetPlatform.operatingSystem.isLinux()) { + linker.args "-lutil" + } + } + } + netconsoleTee(NativeExecutableSpec) { + targetBuildTypes 'release' + sources { + cpp { + source { + srcDirs = [ + 'src/netconsoleTee/native/cpp' + ] + includes = ['**/*.cpp'] + } + } + } + binaries.all { binary -> + lib project: ':wpinet', library: 'wpinet', linkage: 'static' + lib project: ':wpiutil', library: 'wpiutil', linkage: 'static' + } + } + } +} diff --git a/wpiutil/examples/dsclient/dsclient.cpp b/wpinet/examples/dsclient/dsclient.cpp similarity index 86% rename from wpiutil/examples/dsclient/dsclient.cpp rename to wpinet/examples/dsclient/dsclient.cpp index 69c1061fdd..5135d70a91 100644 --- a/wpiutil/examples/dsclient/dsclient.cpp +++ b/wpinet/examples/dsclient/dsclient.cpp @@ -4,11 +4,12 @@ #include -#include "fmt/format.h" -#include "wpi/DsClient.h" -#include "wpi/EventLoopRunner.h" -#include "wpi/Logger.h" -#include "wpi/uv/Error.h" +#include +#include + +#include "wpinet/DsClient.h" +#include "wpinet/EventLoopRunner.h" +#include "wpinet/uv/Error.h" namespace uv = wpi::uv; diff --git a/wpiutil/examples/parallelconnect/parallelconnect.cpp b/wpinet/examples/parallelconnect/parallelconnect.cpp similarity index 90% rename from wpiutil/examples/parallelconnect/parallelconnect.cpp rename to wpinet/examples/parallelconnect/parallelconnect.cpp index 929c84716e..fecdac8473 100644 --- a/wpiutil/examples/parallelconnect/parallelconnect.cpp +++ b/wpinet/examples/parallelconnect/parallelconnect.cpp @@ -4,11 +4,12 @@ #include -#include "wpi/EventLoopRunner.h" -#include "wpi/Logger.h" -#include "wpi/ParallelTcpConnector.h" -#include "wpi/uv/Error.h" -#include "wpi/uv/Tcp.h" +#include + +#include "wpinet/EventLoopRunner.h" +#include "wpinet/ParallelTcpConnector.h" +#include "wpinet/uv/Error.h" +#include "wpinet/uv/Tcp.h" namespace uv = wpi::uv; diff --git a/wpiutil/examples/webserver/webserver.cpp b/wpinet/examples/webserver/webserver.cpp similarity index 92% rename from wpiutil/examples/webserver/webserver.cpp rename to wpinet/examples/webserver/webserver.cpp index 503405f208..0f1e5c4b03 100644 --- a/wpiutil/examples/webserver/webserver.cpp +++ b/wpinet/examples/webserver/webserver.cpp @@ -4,12 +4,13 @@ #include -#include "fmt/format.h" -#include "wpi/EventLoopRunner.h" -#include "wpi/HttpServerConnection.h" -#include "wpi/UrlParser.h" -#include "wpi/uv/Loop.h" -#include "wpi/uv/Tcp.h" +#include + +#include "wpinet/EventLoopRunner.h" +#include "wpinet/HttpServerConnection.h" +#include "wpinet/UrlParser.h" +#include "wpinet/uv/Loop.h" +#include "wpinet/uv/Tcp.h" namespace uv = wpi::uv; diff --git a/wpinet/src/dev/java/edu/wpi/first/net/DevMain.java b/wpinet/src/dev/java/edu/wpi/first/net/DevMain.java new file mode 100644 index 0000000000..7c71a457d0 --- /dev/null +++ b/wpinet/src/dev/java/edu/wpi/first/net/DevMain.java @@ -0,0 +1,17 @@ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. + +package edu.wpi.first.net; + +import edu.wpi.first.util.RuntimeDetector; + +public final class DevMain { + /** Main entry point. */ + public static void main(String[] args) { + System.out.println("Hello World!"); + System.out.println(RuntimeDetector.getPlatformPath()); + } + + private DevMain() {} +} diff --git a/wpinet/src/dev/native/cpp/main.cpp b/wpinet/src/dev/native/cpp/main.cpp new file mode 100644 index 0000000000..d0e2f9260e --- /dev/null +++ b/wpinet/src/dev/native/cpp/main.cpp @@ -0,0 +1,11 @@ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. + +#include +#include + +int main() { + wpi::SmallString<128> v1("Hello"); + fmt::print("{}\n", v1.str()); +} diff --git a/wpiutil/src/main/java/edu/wpi/first/util/MulticastServiceAnnouncer.java b/wpinet/src/main/java/edu/wpi/first/net/MulticastServiceAnnouncer.java similarity index 71% rename from wpiutil/src/main/java/edu/wpi/first/util/MulticastServiceAnnouncer.java rename to wpinet/src/main/java/edu/wpi/first/net/MulticastServiceAnnouncer.java index 1c4b2ac42a..7420a75b88 100644 --- a/wpiutil/src/main/java/edu/wpi/first/util/MulticastServiceAnnouncer.java +++ b/wpinet/src/main/java/edu/wpi/first/net/MulticastServiceAnnouncer.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.util; +package edu.wpi.first.net; import java.util.Map; @@ -23,23 +23,23 @@ public class MulticastServiceAnnouncer implements AutoCloseable { String[] keys = txt.keySet().toArray(String[]::new); String[] values = txt.values().toArray(String[]::new); m_handle = - WPIUtilJNI.createMulticastServiceAnnouncer(serviceName, serviceType, port, keys, values); + WPINetJNI.createMulticastServiceAnnouncer(serviceName, serviceType, port, keys, values); } @Override public void close() { - WPIUtilJNI.freeMulticastServiceAnnouncer(m_handle); + WPINetJNI.freeMulticastServiceAnnouncer(m_handle); } public void start() { - WPIUtilJNI.startMulticastServiceAnnouncer(m_handle); + WPINetJNI.startMulticastServiceAnnouncer(m_handle); } public void stop() { - WPIUtilJNI.stopMulticastServiceAnnouncer(m_handle); + WPINetJNI.stopMulticastServiceAnnouncer(m_handle); } public boolean hasImplementation() { - return WPIUtilJNI.getMulticastServiceAnnouncerHasImplementation(m_handle); + return WPINetJNI.getMulticastServiceAnnouncerHasImplementation(m_handle); } } diff --git a/wpiutil/src/main/java/edu/wpi/first/util/MulticastServiceResolver.java b/wpinet/src/main/java/edu/wpi/first/net/MulticastServiceResolver.java similarity index 60% rename from wpiutil/src/main/java/edu/wpi/first/util/MulticastServiceResolver.java rename to wpinet/src/main/java/edu/wpi/first/net/MulticastServiceResolver.java index 3e331f2515..2426de29d6 100644 --- a/wpiutil/src/main/java/edu/wpi/first/util/MulticastServiceResolver.java +++ b/wpinet/src/main/java/edu/wpi/first/net/MulticastServiceResolver.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.util; +package edu.wpi.first.net; /** Class to resolve a service over mDNS. */ public class MulticastServiceResolver implements AutoCloseable { @@ -14,31 +14,31 @@ public class MulticastServiceResolver implements AutoCloseable { * @param serviceType service type to look for */ public MulticastServiceResolver(String serviceType) { - m_handle = WPIUtilJNI.createMulticastServiceResolver(serviceType); + m_handle = WPINetJNI.createMulticastServiceResolver(serviceType); } @Override public void close() { - WPIUtilJNI.freeMulticastServiceResolver(m_handle); + WPINetJNI.freeMulticastServiceResolver(m_handle); } public void start() { - WPIUtilJNI.startMulticastServiceResolver(m_handle); + WPINetJNI.startMulticastServiceResolver(m_handle); } public void stop() { - WPIUtilJNI.stopMulticastServiceResolver(m_handle); + WPINetJNI.stopMulticastServiceResolver(m_handle); } public boolean hasImplementation() { - return WPIUtilJNI.getMulticastServiceResolverHasImplementation(m_handle); + return WPINetJNI.getMulticastServiceResolverHasImplementation(m_handle); } public int getEventHandle() { - return WPIUtilJNI.getMulticastServiceResolverEventHandle(m_handle); + return WPINetJNI.getMulticastServiceResolverEventHandle(m_handle); } public ServiceData[] getData() { - return WPIUtilJNI.getMulticastServiceResolverData(m_handle); + return WPINetJNI.getMulticastServiceResolverData(m_handle); } } diff --git a/wpiutil/src/main/java/edu/wpi/first/util/net/PortForwarder.java b/wpinet/src/main/java/edu/wpi/first/net/PortForwarder.java similarity index 84% rename from wpiutil/src/main/java/edu/wpi/first/util/net/PortForwarder.java rename to wpinet/src/main/java/edu/wpi/first/net/PortForwarder.java index 5c4c20a599..904e4f03f2 100644 --- a/wpiutil/src/main/java/edu/wpi/first/util/net/PortForwarder.java +++ b/wpinet/src/main/java/edu/wpi/first/net/PortForwarder.java @@ -2,9 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.util.net; - -import edu.wpi.first.util.WPIUtilJNI; +package edu.wpi.first.net; /** * Forward ports to another host. This is primarily useful for accessing Ethernet-connected devices @@ -24,7 +22,7 @@ public final class PortForwarder { * @param remotePort remote port number */ public static void add(int port, String remoteHost, int remotePort) { - WPIUtilJNI.addPortForwarder(port, remoteHost, remotePort); + WPINetJNI.addPortForwarder(port, remoteHost, remotePort); } /** @@ -33,6 +31,6 @@ public final class PortForwarder { * @param port local port number */ public static void remove(int port) { - WPIUtilJNI.removePortForwarder(port); + WPINetJNI.removePortForwarder(port); } } diff --git a/wpiutil/src/main/java/edu/wpi/first/util/ServiceData.java b/wpinet/src/main/java/edu/wpi/first/net/ServiceData.java similarity index 98% rename from wpiutil/src/main/java/edu/wpi/first/util/ServiceData.java rename to wpinet/src/main/java/edu/wpi/first/net/ServiceData.java index 0e5601010a..126526b2c7 100644 --- a/wpiutil/src/main/java/edu/wpi/first/util/ServiceData.java +++ b/wpinet/src/main/java/edu/wpi/first/net/ServiceData.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.util; +package edu.wpi.first.net; import java.util.HashMap; import java.util.Map; diff --git a/wpinet/src/main/java/edu/wpi/first/net/WPINetJNI.java b/wpinet/src/main/java/edu/wpi/first/net/WPINetJNI.java new file mode 100644 index 0000000000..d0bcf7d4a9 --- /dev/null +++ b/wpinet/src/main/java/edu/wpi/first/net/WPINetJNI.java @@ -0,0 +1,85 @@ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. + +package edu.wpi.first.net; + +import edu.wpi.first.util.RuntimeLoader; +import java.io.IOException; +import java.util.concurrent.atomic.AtomicBoolean; + +public class WPINetJNI { + static boolean libraryLoaded = false; + static RuntimeLoader loader = null; + + public static class Helper { + private static AtomicBoolean extractOnStaticLoad = new AtomicBoolean(true); + + public static boolean getExtractOnStaticLoad() { + return extractOnStaticLoad.get(); + } + + public static void setExtractOnStaticLoad(boolean load) { + extractOnStaticLoad.set(load); + } + } + + static { + if (Helper.getExtractOnStaticLoad()) { + try { + loader = + new RuntimeLoader<>( + "wpinetjni", RuntimeLoader.getDefaultExtractionRoot(), WPINetJNI.class); + loader.loadLibrary(); + } catch (IOException ex) { + ex.printStackTrace(); + System.exit(1); + } + libraryLoaded = true; + } + } + + /** + * Force load the library. + * + * @throws IOException if the library failed to load + */ + public static synchronized void forceLoad() throws IOException { + if (libraryLoaded) { + return; + } + loader = + new RuntimeLoader<>("wpinetjni", RuntimeLoader.getDefaultExtractionRoot(), WPINetJNI.class); + loader.loadLibrary(); + libraryLoaded = true; + } + + public static native void addPortForwarder(int port, String remoteHost, int remotePort); + + public static native void removePortForwarder(int port); + + public static native int createMulticastServiceAnnouncer( + String serviceName, String serviceType, int port, String[] keys, String[] values); + + public static native void freeMulticastServiceAnnouncer(int handle); + + public static native void startMulticastServiceAnnouncer(int handle); + + public static native void stopMulticastServiceAnnouncer(int handle); + + public static native boolean getMulticastServiceAnnouncerHasImplementation(int handle); + + public static native int createMulticastServiceResolver(String serviceType); + + public static native void freeMulticastServiceResolver(int handle); + + public static native void startMulticastServiceResolver(int handle); + + public static native void stopMulticastServiceResolver(int handle); + + public static native boolean getMulticastServiceResolverHasImplementation(int handle); + + public static native int getMulticastServiceResolverEventHandle(int handle); + + public static native ServiceData[] getMulticastServiceResolverData(int handle); +} diff --git a/wpiutil/src/main/native/cpp/DsClient.cpp b/wpinet/src/main/native/cpp/DsClient.cpp similarity index 96% rename from wpiutil/src/main/native/cpp/DsClient.cpp rename to wpinet/src/main/native/cpp/DsClient.cpp index 455f10c2e8..96ea43013e 100644 --- a/wpiutil/src/main/native/cpp/DsClient.cpp +++ b/wpinet/src/main/native/cpp/DsClient.cpp @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/DsClient.h" +#include "wpinet/DsClient.h" #include +#include #include #include -#include -#include -#include "wpi/Logger.h" +#include "wpinet/uv/Tcp.h" +#include "wpinet/uv/Timer.h" using namespace wpi; diff --git a/wpiutil/src/main/native/cpp/EventLoopRunner.cpp b/wpinet/src/main/native/cpp/EventLoopRunner.cpp similarity index 90% rename from wpiutil/src/main/native/cpp/EventLoopRunner.cpp rename to wpinet/src/main/native/cpp/EventLoopRunner.cpp index c86176ef2d..7c7e79c116 100644 --- a/wpiutil/src/main/native/cpp/EventLoopRunner.cpp +++ b/wpinet/src/main/native/cpp/EventLoopRunner.cpp @@ -2,13 +2,14 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/EventLoopRunner.h" +#include "wpinet/EventLoopRunner.h" -#include "wpi/SmallVector.h" -#include "wpi/condition_variable.h" -#include "wpi/mutex.h" -#include "wpi/uv/AsyncFunction.h" -#include "wpi/uv/Loop.h" +#include +#include +#include + +#include "wpinet/uv/AsyncFunction.h" +#include "wpinet/uv/Loop.h" using namespace wpi; diff --git a/wpiutil/src/main/native/cpp/HttpParser.cpp b/wpinet/src/main/native/cpp/HttpParser.cpp similarity index 99% rename from wpiutil/src/main/native/cpp/HttpParser.cpp rename to wpinet/src/main/native/cpp/HttpParser.cpp index 3c18e0f6f8..c428da2606 100644 --- a/wpiutil/src/main/native/cpp/HttpParser.cpp +++ b/wpinet/src/main/native/cpp/HttpParser.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/HttpParser.h" +#include "wpinet/HttpParser.h" using namespace wpi; diff --git a/wpiutil/src/main/native/cpp/HttpServerConnection.cpp b/wpinet/src/main/native/cpp/HttpServerConnection.cpp similarity index 95% rename from wpiutil/src/main/native/cpp/HttpServerConnection.cpp rename to wpinet/src/main/native/cpp/HttpServerConnection.cpp index 716d2af11a..9967017527 100644 --- a/wpiutil/src/main/native/cpp/HttpServerConnection.cpp +++ b/wpinet/src/main/native/cpp/HttpServerConnection.cpp @@ -2,15 +2,16 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/HttpServerConnection.h" +#include "wpinet/HttpServerConnection.h" -#include "fmt/format.h" -#include "wpi/SmallString.h" -#include "wpi/SmallVector.h" -#include "wpi/SpanExtras.h" -#include "wpi/StringExtras.h" -#include "wpi/fmt/raw_ostream.h" -#include "wpi/raw_uv_ostream.h" +#include +#include +#include +#include +#include +#include + +#include "wpinet/raw_uv_ostream.h" using namespace wpi; diff --git a/wpiutil/src/main/native/cpp/HttpUtil.cpp b/wpinet/src/main/native/cpp/HttpUtil.cpp similarity index 98% rename from wpiutil/src/main/native/cpp/HttpUtil.cpp rename to wpinet/src/main/native/cpp/HttpUtil.cpp index b8b7cc88cd..c4de9d0672 100644 --- a/wpiutil/src/main/native/cpp/HttpUtil.cpp +++ b/wpinet/src/main/native/cpp/HttpUtil.cpp @@ -2,15 +2,16 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/HttpUtil.h" +#include "wpinet/HttpUtil.h" #include -#include "fmt/format.h" -#include "wpi/Base64.h" -#include "wpi/StringExtras.h" -#include "wpi/TCPConnector.h" -#include "wpi/raw_ostream.h" +#include +#include +#include +#include + +#include "wpinet/TCPConnector.h" namespace wpi { diff --git a/wpiutil/src/main/native/cpp/MimeTypes.cpp b/wpinet/src/main/native/cpp/MimeTypes.cpp similarity index 95% rename from wpiutil/src/main/native/cpp/MimeTypes.cpp rename to wpinet/src/main/native/cpp/MimeTypes.cpp index 5f5bf592ef..d5f6fb3d9e 100644 --- a/wpiutil/src/main/native/cpp/MimeTypes.cpp +++ b/wpinet/src/main/native/cpp/MimeTypes.cpp @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/MimeTypes.h" +#include "wpinet/MimeTypes.h" -#include "wpi/StringExtras.h" -#include "wpi/StringMap.h" +#include +#include namespace wpi { diff --git a/wpiutil/src/main/native/cpp/MulticastHandleManager.cpp b/wpinet/src/main/native/cpp/MulticastHandleManager.cpp similarity index 100% rename from wpiutil/src/main/native/cpp/MulticastHandleManager.cpp rename to wpinet/src/main/native/cpp/MulticastHandleManager.cpp diff --git a/wpiutil/src/main/native/cpp/MulticastHandleManager.h b/wpinet/src/main/native/cpp/MulticastHandleManager.h similarity index 80% rename from wpiutil/src/main/native/cpp/MulticastHandleManager.h rename to wpinet/src/main/native/cpp/MulticastHandleManager.h index be8d061659..8c070f74a6 100644 --- a/wpiutil/src/main/native/cpp/MulticastHandleManager.h +++ b/wpinet/src/main/native/cpp/MulticastHandleManager.h @@ -6,10 +6,11 @@ #include -#include "wpi/DenseMap.h" -#include "wpi/MulticastServiceAnnouncer.h" -#include "wpi/MulticastServiceResolver.h" -#include "wpi/UidVector.h" +#include +#include + +#include "wpinet/MulticastServiceAnnouncer.h" +#include "wpinet/MulticastServiceResolver.h" namespace wpi { struct MulticastHandleManager { diff --git a/wpiutil/src/main/native/cpp/MulticastServiceAnnouncer.cpp b/wpinet/src/main/native/cpp/MulticastServiceAnnouncer.cpp similarity index 97% rename from wpiutil/src/main/native/cpp/MulticastServiceAnnouncer.cpp rename to wpinet/src/main/native/cpp/MulticastServiceAnnouncer.cpp index 736a03da0d..daa7e8df03 100644 --- a/wpiutil/src/main/native/cpp/MulticastServiceAnnouncer.cpp +++ b/wpinet/src/main/native/cpp/MulticastServiceAnnouncer.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/MulticastServiceAnnouncer.h" +#include "wpinet/MulticastServiceAnnouncer.h" #include diff --git a/wpiutil/src/main/native/cpp/MulticastServiceResolver.cpp b/wpinet/src/main/native/cpp/MulticastServiceResolver.cpp similarity index 98% rename from wpiutil/src/main/native/cpp/MulticastServiceResolver.cpp rename to wpinet/src/main/native/cpp/MulticastServiceResolver.cpp index b834f17336..c16db2e2e8 100644 --- a/wpiutil/src/main/native/cpp/MulticastServiceResolver.cpp +++ b/wpinet/src/main/native/cpp/MulticastServiceResolver.cpp @@ -2,10 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/MulticastServiceResolver.h" +#include "wpinet/MulticastServiceResolver.h" + +#include #include "MulticastHandleManager.h" -#include "wpi/MemAlloc.h" extern "C" { WPI_MulticastServiceResolverHandle WPI_CreateMulticastServiceResolver( diff --git a/wpiutil/src/main/native/cpp/ParallelTcpConnector.cpp b/wpinet/src/main/native/cpp/ParallelTcpConnector.cpp similarity index 96% rename from wpiutil/src/main/native/cpp/ParallelTcpConnector.cpp rename to wpinet/src/main/native/cpp/ParallelTcpConnector.cpp index 5a8394ae27..f60a3ca6c9 100644 --- a/wpiutil/src/main/native/cpp/ParallelTcpConnector.cpp +++ b/wpinet/src/main/native/cpp/ParallelTcpConnector.cpp @@ -2,16 +2,16 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/ParallelTcpConnector.h" +#include "wpinet/ParallelTcpConnector.h" #include +#include -#include "wpi/Logger.h" -#include "wpi/uv/GetAddrInfo.h" -#include "wpi/uv/Loop.h" -#include "wpi/uv/Tcp.h" -#include "wpi/uv/Timer.h" -#include "wpi/uv/util.h" +#include "wpinet/uv/GetAddrInfo.h" +#include "wpinet/uv/Loop.h" +#include "wpinet/uv/Tcp.h" +#include "wpinet/uv/Timer.h" +#include "wpinet/uv/util.h" using namespace wpi; diff --git a/wpiutil/src/main/native/cpp/PortForwarder.cpp b/wpinet/src/main/native/cpp/PortForwarder.cpp similarity index 95% rename from wpiutil/src/main/native/cpp/PortForwarder.cpp rename to wpinet/src/main/native/cpp/PortForwarder.cpp index a423d48bd3..257b6209b6 100644 --- a/wpiutil/src/main/native/cpp/PortForwarder.cpp +++ b/wpinet/src/main/native/cpp/PortForwarder.cpp @@ -2,14 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/PortForwarder.h" +#include "wpinet/PortForwarder.h" -#include "fmt/format.h" -#include "wpi/DenseMap.h" -#include "wpi/EventLoopRunner.h" -#include "wpi/uv/GetAddrInfo.h" -#include "wpi/uv/Tcp.h" -#include "wpi/uv/Timer.h" +#include +#include + +#include "wpinet/EventLoopRunner.h" +#include "wpinet/uv/GetAddrInfo.h" +#include "wpinet/uv/Tcp.h" +#include "wpinet/uv/Timer.h" using namespace wpi; diff --git a/wpiutil/src/main/native/cpp/SocketError.cpp b/wpinet/src/main/native/cpp/SocketError.cpp similarity index 95% rename from wpiutil/src/main/native/cpp/SocketError.cpp rename to wpinet/src/main/native/cpp/SocketError.cpp index 3f08d1e52b..233c5de366 100644 --- a/wpiutil/src/main/native/cpp/SocketError.cpp +++ b/wpinet/src/main/native/cpp/SocketError.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/SocketError.h" +#include "wpinet/SocketError.h" #ifdef _WIN32 #include diff --git a/wpiutil/src/main/native/cpp/TCPAcceptor.cpp b/wpinet/src/main/native/cpp/TCPAcceptor.cpp similarity index 97% rename from wpiutil/src/main/native/cpp/TCPAcceptor.cpp rename to wpinet/src/main/native/cpp/TCPAcceptor.cpp index 8d12ac3a12..6871ea9a69 100644 --- a/wpiutil/src/main/native/cpp/TCPAcceptor.cpp +++ b/wpinet/src/main/native/cpp/TCPAcceptor.cpp @@ -21,7 +21,7 @@ limitations under the License. */ -#include "wpi/TCPAcceptor.h" +#include "wpinet/TCPAcceptor.h" #include #include @@ -38,9 +38,10 @@ #include #endif -#include "wpi/Logger.h" -#include "wpi/SmallString.h" -#include "wpi/SocketError.h" +#include +#include + +#include "wpinet/SocketError.h" using namespace wpi; diff --git a/wpiutil/src/main/native/cpp/TCPConnector.cpp b/wpinet/src/main/native/cpp/TCPConnector.cpp similarity index 97% rename from wpiutil/src/main/native/cpp/TCPConnector.cpp rename to wpinet/src/main/native/cpp/TCPConnector.cpp index ed97962463..f22ad38c48 100644 --- a/wpiutil/src/main/native/cpp/TCPConnector.cpp +++ b/wpinet/src/main/native/cpp/TCPConnector.cpp @@ -21,7 +21,7 @@ limitations under the License */ -#include "wpi/TCPConnector.h" +#include "wpinet/TCPConnector.h" #include @@ -40,10 +40,11 @@ #include #endif -#include "wpi/Logger.h" -#include "wpi/SmallString.h" -#include "wpi/SocketError.h" -#include "wpi/TCPStream.h" +#include +#include + +#include "wpinet/SocketError.h" +#include "wpinet/TCPStream.h" using namespace wpi; diff --git a/wpiutil/src/main/native/cpp/TCPConnector_parallel.cpp b/wpinet/src/main/native/cpp/TCPConnector_parallel.cpp similarity index 96% rename from wpiutil/src/main/native/cpp/TCPConnector_parallel.cpp rename to wpinet/src/main/native/cpp/TCPConnector_parallel.cpp index 26258cf197..f1f89c6862 100644 --- a/wpiutil/src/main/native/cpp/TCPConnector_parallel.cpp +++ b/wpinet/src/main/native/cpp/TCPConnector_parallel.cpp @@ -2,16 +2,16 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/TCPConnector.h" // NOLINT(build/include_order) +#include "wpinet/TCPConnector.h" // NOLINT(build/include_order) #include #include #include #include -#include "wpi/SmallSet.h" -#include "wpi/condition_variable.h" -#include "wpi/mutex.h" +#include +#include +#include using namespace wpi; diff --git a/wpiutil/src/main/native/cpp/TCPStream.cpp b/wpinet/src/main/native/cpp/TCPStream.cpp similarity index 99% rename from wpiutil/src/main/native/cpp/TCPStream.cpp rename to wpinet/src/main/native/cpp/TCPStream.cpp index 45671611d4..920f7b1591 100644 --- a/wpiutil/src/main/native/cpp/TCPStream.cpp +++ b/wpinet/src/main/native/cpp/TCPStream.cpp @@ -21,7 +21,7 @@ limitations under the License. */ -#include "wpi/TCPStream.h" +#include "wpinet/TCPStream.h" #include diff --git a/wpiutil/src/main/native/cpp/UDPClient.cpp b/wpinet/src/main/native/cpp/UDPClient.cpp similarity index 98% rename from wpiutil/src/main/native/cpp/UDPClient.cpp rename to wpinet/src/main/native/cpp/UDPClient.cpp index 108ef5424c..e13463c5b5 100644 --- a/wpiutil/src/main/native/cpp/UDPClient.cpp +++ b/wpinet/src/main/native/cpp/UDPClient.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/UDPClient.h" +#include "wpinet/UDPClient.h" #ifdef _WIN32 #include @@ -15,9 +15,10 @@ #include #endif -#include "wpi/Logger.h" -#include "wpi/SmallString.h" -#include "wpi/SocketError.h" +#include +#include + +#include "wpinet/SocketError.h" using namespace wpi; diff --git a/wpiutil/src/main/native/cpp/WebSocket.cpp b/wpinet/src/main/native/cpp/WebSocket.cpp similarity index 98% rename from wpiutil/src/main/native/cpp/WebSocket.cpp rename to wpinet/src/main/native/cpp/WebSocket.cpp index 4bb49d3391..bbb98979e6 100644 --- a/wpiutil/src/main/native/cpp/WebSocket.cpp +++ b/wpinet/src/main/native/cpp/WebSocket.cpp @@ -2,19 +2,20 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/WebSocket.h" +#include "wpinet/WebSocket.h" #include -#include "fmt/format.h" -#include "wpi/Base64.h" -#include "wpi/HttpParser.h" -#include "wpi/SmallString.h" -#include "wpi/SmallVector.h" -#include "wpi/StringExtras.h" -#include "wpi/raw_uv_ostream.h" -#include "wpi/sha1.h" -#include "wpi/uv/Stream.h" +#include +#include +#include +#include +#include +#include + +#include "wpinet/HttpParser.h" +#include "wpinet/raw_uv_ostream.h" +#include "wpinet/uv/Stream.h" using namespace wpi; diff --git a/wpiutil/src/main/native/cpp/WebSocketServer.cpp b/wpinet/src/main/native/cpp/WebSocketServer.cpp similarity index 96% rename from wpiutil/src/main/native/cpp/WebSocketServer.cpp rename to wpinet/src/main/native/cpp/WebSocketServer.cpp index 1562f3bf04..6a87d8f633 100644 --- a/wpiutil/src/main/native/cpp/WebSocketServer.cpp +++ b/wpinet/src/main/native/cpp/WebSocketServer.cpp @@ -2,15 +2,16 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/WebSocketServer.h" +#include "wpinet/WebSocketServer.h" #include -#include "wpi/StringExtras.h" -#include "wpi/fmt/raw_ostream.h" -#include "wpi/raw_uv_ostream.h" -#include "wpi/uv/Buffer.h" -#include "wpi/uv/Stream.h" +#include +#include + +#include "wpinet/raw_uv_ostream.h" +#include "wpinet/uv/Buffer.h" +#include "wpinet/uv/Stream.h" using namespace wpi; diff --git a/wpiutil/src/main/native/cpp/hostname.cpp b/wpinet/src/main/native/cpp/hostname.cpp similarity index 95% rename from wpiutil/src/main/native/cpp/hostname.cpp rename to wpinet/src/main/native/cpp/hostname.cpp index d907023ff4..ae25b29bc8 100644 --- a/wpiutil/src/main/native/cpp/hostname.cpp +++ b/wpinet/src/main/native/cpp/hostname.cpp @@ -2,14 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/hostname.h" +#include "wpinet/hostname.h" #include #include #include +#include + #include "uv.h" -#include "wpi/SmallVector.h" namespace wpi { diff --git a/wpiutil/src/main/native/cpp/http_parser.cpp b/wpinet/src/main/native/cpp/http_parser.cpp similarity index 99% rename from wpiutil/src/main/native/cpp/http_parser.cpp rename to wpinet/src/main/native/cpp/http_parser.cpp index bc442b2ce2..2bec4a74b8 100644 --- a/wpiutil/src/main/native/cpp/http_parser.cpp +++ b/wpinet/src/main/native/cpp/http_parser.cpp @@ -18,7 +18,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "wpi/http_parser.h" +#include "wpinet/http_parser.h" #include #include #include diff --git a/wpinet/src/main/native/cpp/jni/WPINetJNI.cpp b/wpinet/src/main/native/cpp/jni/WPINetJNI.cpp new file mode 100644 index 0000000000..d82a7db797 --- /dev/null +++ b/wpinet/src/main/native/cpp/jni/WPINetJNI.cpp @@ -0,0 +1,331 @@ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. + +#include + +#include + +#include "../MulticastHandleManager.h" +#include "edu_wpi_first_net_WPINetJNI.h" +#include "wpinet/MulticastServiceAnnouncer.h" +#include "wpinet/MulticastServiceResolver.h" +#include "wpinet/PortForwarder.h" + +using namespace wpi::java; + +static JClass serviceDataCls; +static JGlobal serviceDataEmptyArray; + +extern "C" { + +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) { + JNIEnv* env; + if (vm->GetEnv(reinterpret_cast(&env), JNI_VERSION_1_6) != JNI_OK) { + return JNI_ERR; + } + + serviceDataCls = JClass{env, "edu/wpi/first/util/ServiceData"}; + if (!serviceDataCls) { + return JNI_ERR; + } + + serviceDataEmptyArray = JGlobal{ + env, env->NewObjectArray(0, serviceDataCls, nullptr)}; + if (serviceDataEmptyArray == nullptr) { + return JNI_ERR; + } + + return JNI_VERSION_1_6; +} + +JNIEXPORT void JNICALL JNI_OnUnload(JavaVM* vm, void* reserved) { + JNIEnv* env; + if (vm->GetEnv(reinterpret_cast(&env), JNI_VERSION_1_6) != JNI_OK) { + return; + } + + serviceDataEmptyArray.free(env); + serviceDataCls.free(env); +} + +/* + * Class: edu_wpi_first_util_WPIUtilJNI + * Method: addPortForwarder + * Signature: (ILjava/lang/String;I)V + */ +JNIEXPORT void JNICALL +Java_edu_wpi_first_util_WPIUtilJNI_addPortForwarder + (JNIEnv* env, jclass, jint port, jstring remoteHost, jint remotePort) +{ + wpi::PortForwarder::GetInstance().Add(static_cast(port), + JStringRef{env, remoteHost}.str(), + static_cast(remotePort)); +} + +/* + * Class: edu_wpi_first_util_WPIUtilJNI + * Method: removePortForwarder + * Signature: (I)V + */ +JNIEXPORT void JNICALL +Java_edu_wpi_first_util_WPIUtilJNI_removePortForwarder + (JNIEnv* env, jclass, jint port) +{ + wpi::PortForwarder::GetInstance().Remove(port); +} + +/* + * Class: edu_wpi_first_util_WPIUtilJNI + * Method: createMulticastServiceAnnouncer + * Signature: (Ljava/lang/String;Ljava/lang/String;I[Ljava/lang/Object;[Ljava/lang/Object;)I + */ +JNIEXPORT jint JNICALL +Java_edu_wpi_first_util_WPIUtilJNI_createMulticastServiceAnnouncer + (JNIEnv* env, jclass, jstring serviceName, jstring serviceType, jint port, + jobjectArray keys, jobjectArray values) +{ + auto& manager = wpi::GetMulticastManager(); + std::scoped_lock lock{manager.mutex}; + + JStringRef serviceNameRef{env, serviceName}; + JStringRef serviceTypeRef{env, serviceType}; + + size_t keysLen = env->GetArrayLength(keys); + wpi::SmallVector, 8> txtVec; + txtVec.reserve(keysLen); + for (size_t i = 0; i < keysLen; i++) { + JLocal key{ + env, static_cast(env->GetObjectArrayElement(keys, i))}; + JLocal value{ + env, static_cast(env->GetObjectArrayElement(values, i))}; + + txtVec.emplace_back(std::pair{ + JStringRef{env, key}.str(), JStringRef{env, value}.str()}); + } + + auto announcer = std::make_unique( + serviceNameRef.str(), serviceTypeRef.str(), port, txtVec); + + size_t index = manager.handleIds.emplace_back(1); + + manager.announcers[index] = std::move(announcer); + + return static_cast(index); +} + +/* + * Class: edu_wpi_first_util_WPIUtilJNI + * Method: freeMulticastServiceAnnouncer + * Signature: (I)V + */ +JNIEXPORT void JNICALL +Java_edu_wpi_first_util_WPIUtilJNI_freeMulticastServiceAnnouncer + (JNIEnv* env, jclass, jint handle) +{ + auto& manager = wpi::GetMulticastManager(); + std::scoped_lock lock{manager.mutex}; + manager.announcers[handle] = nullptr; + manager.handleIds.erase(handle); +} + +/* + * Class: edu_wpi_first_util_WPIUtilJNI + * Method: startMulticastServiceAnnouncer + * Signature: (I)V + */ +JNIEXPORT void JNICALL +Java_edu_wpi_first_util_WPIUtilJNI_startMulticastServiceAnnouncer + (JNIEnv* env, jclass, jint handle) +{ + auto& manager = wpi::GetMulticastManager(); + std::scoped_lock lock{manager.mutex}; + auto& announcer = manager.announcers[handle]; + announcer->Start(); +} + +/* + * Class: edu_wpi_first_util_WPIUtilJNI + * Method: stopMulticastServiceAnnouncer + * Signature: (I)V + */ +JNIEXPORT void JNICALL +Java_edu_wpi_first_util_WPIUtilJNI_stopMulticastServiceAnnouncer + (JNIEnv* env, jclass, jint handle) +{ + auto& manager = wpi::GetMulticastManager(); + std::scoped_lock lock{manager.mutex}; + auto& announcer = manager.announcers[handle]; + announcer->Stop(); +} + +/* + * Class: edu_wpi_first_util_WPIUtilJNI + * Method: getMulticastServiceAnnouncerHasImplementation + * Signature: (I)Z + */ +JNIEXPORT jboolean JNICALL +Java_edu_wpi_first_util_WPIUtilJNI_getMulticastServiceAnnouncerHasImplementation + (JNIEnv* env, jclass, jint handle) +{ + auto& manager = wpi::GetMulticastManager(); + std::scoped_lock lock{manager.mutex}; + auto& announcer = manager.announcers[handle]; + return announcer->HasImplementation(); +} + +/* + * Class: edu_wpi_first_util_WPIUtilJNI + * Method: createMulticastServiceResolver + * Signature: (Ljava/lang/String;)I + */ +JNIEXPORT jint JNICALL +Java_edu_wpi_first_util_WPIUtilJNI_createMulticastServiceResolver + (JNIEnv* env, jclass, jstring serviceType) +{ + auto& manager = wpi::GetMulticastManager(); + std::scoped_lock lock{manager.mutex}; + JStringRef serviceTypeRef{env, serviceType}; + + auto resolver = + std::make_unique(serviceTypeRef.str()); + + size_t index = manager.handleIds.emplace_back(2); + + manager.resolvers[index] = std::move(resolver); + + return static_cast(index); +} + +/* + * Class: edu_wpi_first_util_WPIUtilJNI + * Method: freeMulticastServiceResolver + * Signature: (I)V + */ +JNIEXPORT void JNICALL +Java_edu_wpi_first_util_WPIUtilJNI_freeMulticastServiceResolver + (JNIEnv* env, jclass, jint handle) +{ + auto& manager = wpi::GetMulticastManager(); + std::scoped_lock lock{manager.mutex}; + manager.resolvers[handle] = nullptr; + manager.handleIds.erase(handle); +} + +/* + * Class: edu_wpi_first_util_WPIUtilJNI + * Method: startMulticastServiceResolver + * Signature: (I)V + */ +JNIEXPORT void JNICALL +Java_edu_wpi_first_util_WPIUtilJNI_startMulticastServiceResolver + (JNIEnv* env, jclass, jint handle) +{ + auto& manager = wpi::GetMulticastManager(); + std::scoped_lock lock{manager.mutex}; + auto& resolver = manager.resolvers[handle]; + resolver->Start(); +} + +/* + * Class: edu_wpi_first_util_WPIUtilJNI + * Method: stopMulticastServiceResolver + * Signature: (I)V + */ +JNIEXPORT void JNICALL +Java_edu_wpi_first_util_WPIUtilJNI_stopMulticastServiceResolver + (JNIEnv* env, jclass, jint handle) +{ + auto& manager = wpi::GetMulticastManager(); + std::scoped_lock lock{manager.mutex}; + auto& resolver = manager.resolvers[handle]; + resolver->Stop(); +} + +/* + * Class: edu_wpi_first_util_WPIUtilJNI + * Method: getMulticastServiceResolverHasImplementation + * Signature: (I)Z + */ +JNIEXPORT jboolean JNICALL +Java_edu_wpi_first_util_WPIUtilJNI_getMulticastServiceResolverHasImplementation + (JNIEnv* env, jclass, jint handle) +{ + auto& manager = wpi::GetMulticastManager(); + std::scoped_lock lock{manager.mutex}; + auto& resolver = manager.resolvers[handle]; + return resolver->HasImplementation(); +} + +/* + * Class: edu_wpi_first_util_WPIUtilJNI + * Method: getMulticastServiceResolverEventHandle + * Signature: (I)I + */ +JNIEXPORT jint JNICALL +Java_edu_wpi_first_util_WPIUtilJNI_getMulticastServiceResolverEventHandle + (JNIEnv* env, jclass, jint handle) +{ + auto& manager = wpi::GetMulticastManager(); + std::scoped_lock lock{manager.mutex}; + auto& resolver = manager.resolvers[handle]; + return resolver->GetEventHandle(); +} + +/* + * Class: edu_wpi_first_util_WPIUtilJNI + * Method: getMulticastServiceResolverData + * Signature: (I)[Ljava/lang/Object; + */ +JNIEXPORT jobjectArray JNICALL +Java_edu_wpi_first_util_WPIUtilJNI_getMulticastServiceResolverData + (JNIEnv* env, jclass, jint handle) +{ + static jmethodID constructor = + env->GetMethodID(serviceDataCls, "", + "(JILjava/lang/String;Ljava/lang/String;[Ljava/lang/" + "String;[Ljava/lang/String;)V"); + auto& manager = wpi::GetMulticastManager(); + std::vector allData; + { + std::scoped_lock lock{manager.mutex}; + auto& resolver = manager.resolvers[handle]; + allData = resolver->GetData(); + } + if (allData.empty()) { + return serviceDataEmptyArray; + } + + JLocal returnData{ + env, env->NewObjectArray(allData.size(), serviceDataCls, nullptr)}; + + for (auto&& data : allData) { + JLocal serviceName{env, MakeJString(env, data.serviceName)}; + JLocal hostName{env, MakeJString(env, data.hostName)}; + + wpi::SmallVector keysRef; + wpi::SmallVector valuesRef; + + size_t index = 0; + for (auto&& txt : data.txt) { + keysRef.emplace_back(txt.first); + valuesRef.emplace_back(txt.second); + } + + JLocal keys{env, MakeJStringArray(env, keysRef)}; + JLocal values{env, MakeJStringArray(env, valuesRef)}; + + JLocal dataItem{ + env, env->NewObject(serviceDataCls, constructor, + static_cast(data.ipv4Address), + static_cast(data.port), serviceName.obj(), + hostName.obj(), keys.obj(), values.obj())}; + + env->SetObjectArrayElement(returnData, index, dataItem); + index++; + } + + return returnData; +} + +} // extern "C" diff --git a/wpiutil/src/main/native/cpp/raw_socket_istream.cpp b/wpinet/src/main/native/cpp/raw_socket_istream.cpp similarity index 90% rename from wpiutil/src/main/native/cpp/raw_socket_istream.cpp rename to wpinet/src/main/native/cpp/raw_socket_istream.cpp index c6b759e1d7..b57d83d76e 100644 --- a/wpiutil/src/main/native/cpp/raw_socket_istream.cpp +++ b/wpinet/src/main/native/cpp/raw_socket_istream.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/raw_socket_istream.h" +#include "wpinet/raw_socket_istream.h" -#include "wpi/NetworkStream.h" +#include "wpinet/NetworkStream.h" using namespace wpi; diff --git a/wpiutil/src/main/native/cpp/raw_socket_ostream.cpp b/wpinet/src/main/native/cpp/raw_socket_ostream.cpp similarity index 91% rename from wpiutil/src/main/native/cpp/raw_socket_ostream.cpp rename to wpinet/src/main/native/cpp/raw_socket_ostream.cpp index af01c848a9..5eb0b2b0af 100644 --- a/wpiutil/src/main/native/cpp/raw_socket_ostream.cpp +++ b/wpinet/src/main/native/cpp/raw_socket_ostream.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/raw_socket_ostream.h" +#include "wpinet/raw_socket_ostream.h" -#include "wpi/NetworkStream.h" +#include "wpinet/NetworkStream.h" using namespace wpi; diff --git a/wpiutil/src/main/native/cpp/raw_uv_ostream.cpp b/wpinet/src/main/native/cpp/raw_uv_ostream.cpp similarity index 96% rename from wpiutil/src/main/native/cpp/raw_uv_ostream.cpp rename to wpinet/src/main/native/cpp/raw_uv_ostream.cpp index f055a2a210..fdbd1b0084 100644 --- a/wpiutil/src/main/native/cpp/raw_uv_ostream.cpp +++ b/wpinet/src/main/native/cpp/raw_uv_ostream.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/raw_uv_ostream.h" +#include "wpinet/raw_uv_ostream.h" #include diff --git a/wpiutil/src/main/native/cpp/uv/Async.cpp b/wpinet/src/main/native/cpp/uv/Async.cpp similarity index 92% rename from wpiutil/src/main/native/cpp/uv/Async.cpp rename to wpinet/src/main/native/cpp/uv/Async.cpp index c9d698e974..f84bb9b4c7 100644 --- a/wpiutil/src/main/native/cpp/uv/Async.cpp +++ b/wpinet/src/main/native/cpp/uv/Async.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/Async.h" +#include "wpinet/uv/Async.h" -#include "wpi/uv/Loop.h" +#include "wpinet/uv/Loop.h" namespace wpi::uv { diff --git a/wpiutil/src/main/native/cpp/uv/Check.cpp b/wpinet/src/main/native/cpp/uv/Check.cpp similarity index 92% rename from wpiutil/src/main/native/cpp/uv/Check.cpp rename to wpinet/src/main/native/cpp/uv/Check.cpp index 97265d40a6..13c2229a5f 100644 --- a/wpiutil/src/main/native/cpp/uv/Check.cpp +++ b/wpinet/src/main/native/cpp/uv/Check.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/Check.h" +#include "wpinet/uv/Check.h" -#include "wpi/uv/Loop.h" +#include "wpinet/uv/Loop.h" namespace wpi::uv { diff --git a/wpiutil/src/main/native/cpp/uv/FsEvent.cpp b/wpinet/src/main/native/cpp/uv/FsEvent.cpp similarity index 94% rename from wpiutil/src/main/native/cpp/uv/FsEvent.cpp rename to wpinet/src/main/native/cpp/uv/FsEvent.cpp index 3c83d1d00a..044390edcc 100644 --- a/wpiutil/src/main/native/cpp/uv/FsEvent.cpp +++ b/wpinet/src/main/native/cpp/uv/FsEvent.cpp @@ -2,12 +2,13 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/FsEvent.h" +#include "wpinet/uv/FsEvent.h" #include -#include "wpi/SmallString.h" -#include "wpi/uv/Loop.h" +#include + +#include "wpinet/uv/Loop.h" namespace wpi::uv { diff --git a/wpiutil/src/main/native/cpp/uv/GetAddrInfo.cpp b/wpinet/src/main/native/cpp/uv/GetAddrInfo.cpp similarity index 92% rename from wpiutil/src/main/native/cpp/uv/GetAddrInfo.cpp rename to wpinet/src/main/native/cpp/uv/GetAddrInfo.cpp index 2e6e38f653..14721f2052 100644 --- a/wpiutil/src/main/native/cpp/uv/GetAddrInfo.cpp +++ b/wpinet/src/main/native/cpp/uv/GetAddrInfo.cpp @@ -2,11 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/GetAddrInfo.h" +#include "wpinet/uv/GetAddrInfo.h" -#include "wpi/SmallString.h" -#include "wpi/uv/Loop.h" -#include "wpi/uv/util.h" +#include + +#include "wpinet/uv/Loop.h" +#include "wpinet/uv/util.h" namespace wpi::uv { diff --git a/wpiutil/src/main/native/cpp/uv/GetNameInfo.cpp b/wpinet/src/main/native/cpp/uv/GetNameInfo.cpp similarity index 96% rename from wpiutil/src/main/native/cpp/uv/GetNameInfo.cpp rename to wpinet/src/main/native/cpp/uv/GetNameInfo.cpp index 4e662f3f35..a6ad36d7ab 100644 --- a/wpiutil/src/main/native/cpp/uv/GetNameInfo.cpp +++ b/wpinet/src/main/native/cpp/uv/GetNameInfo.cpp @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/GetNameInfo.h" +#include "wpinet/uv/GetNameInfo.h" -#include "wpi/uv/Loop.h" -#include "wpi/uv/util.h" +#include "wpinet/uv/Loop.h" +#include "wpinet/uv/util.h" namespace wpi::uv { diff --git a/wpiutil/src/main/native/cpp/uv/Handle.cpp b/wpinet/src/main/native/cpp/uv/Handle.cpp similarity index 96% rename from wpiutil/src/main/native/cpp/uv/Handle.cpp rename to wpinet/src/main/native/cpp/uv/Handle.cpp index 74c4c60c3c..04af133c23 100644 --- a/wpiutil/src/main/native/cpp/uv/Handle.cpp +++ b/wpinet/src/main/native/cpp/uv/Handle.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/Handle.h" +#include "wpinet/uv/Handle.h" using namespace wpi::uv; diff --git a/wpiutil/src/main/native/cpp/uv/Idle.cpp b/wpinet/src/main/native/cpp/uv/Idle.cpp similarity index 92% rename from wpiutil/src/main/native/cpp/uv/Idle.cpp rename to wpinet/src/main/native/cpp/uv/Idle.cpp index 6bf8602aa6..452bc7ea34 100644 --- a/wpiutil/src/main/native/cpp/uv/Idle.cpp +++ b/wpinet/src/main/native/cpp/uv/Idle.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/Idle.h" +#include "wpinet/uv/Idle.h" -#include "wpi/uv/Loop.h" +#include "wpinet/uv/Loop.h" namespace wpi::uv { diff --git a/wpiutil/src/main/native/cpp/uv/Loop.cpp b/wpinet/src/main/native/cpp/uv/Loop.cpp similarity index 98% rename from wpiutil/src/main/native/cpp/uv/Loop.cpp rename to wpinet/src/main/native/cpp/uv/Loop.cpp index c5b716376c..d48e230dab 100644 --- a/wpiutil/src/main/native/cpp/uv/Loop.cpp +++ b/wpinet/src/main/native/cpp/uv/Loop.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/Loop.h" +#include "wpinet/uv/Loop.h" using namespace wpi::uv; diff --git a/wpiutil/src/main/native/cpp/uv/NameToAddr.cpp b/wpinet/src/main/native/cpp/uv/NameToAddr.cpp similarity index 94% rename from wpiutil/src/main/native/cpp/uv/NameToAddr.cpp rename to wpinet/src/main/native/cpp/uv/NameToAddr.cpp index 23ec6da6fa..2f3a003248 100644 --- a/wpiutil/src/main/native/cpp/uv/NameToAddr.cpp +++ b/wpinet/src/main/native/cpp/uv/NameToAddr.cpp @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/util.h" // NOLINT(build/include_order) +#include "wpinet/uv/util.h" // NOLINT(build/include_order) #include -#include "wpi/SmallString.h" +#include namespace wpi::uv { diff --git a/wpiutil/src/main/native/cpp/uv/NetworkStream.cpp b/wpinet/src/main/native/cpp/uv/NetworkStream.cpp similarity index 95% rename from wpiutil/src/main/native/cpp/uv/NetworkStream.cpp rename to wpinet/src/main/native/cpp/uv/NetworkStream.cpp index 0bc3337348..3538596b5d 100644 --- a/wpiutil/src/main/native/cpp/uv/NetworkStream.cpp +++ b/wpinet/src/main/native/cpp/uv/NetworkStream.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/NetworkStream.h" +#include "wpinet/uv/NetworkStream.h" namespace wpi::uv { diff --git a/wpiutil/src/main/native/cpp/uv/Pipe.cpp b/wpinet/src/main/native/cpp/uv/Pipe.cpp similarity index 98% rename from wpiutil/src/main/native/cpp/uv/Pipe.cpp rename to wpinet/src/main/native/cpp/uv/Pipe.cpp index b5ca673651..9548874bdf 100644 --- a/wpiutil/src/main/native/cpp/uv/Pipe.cpp +++ b/wpinet/src/main/native/cpp/uv/Pipe.cpp @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/Pipe.h" +#include "wpinet/uv/Pipe.h" #include -#include "wpi/SmallString.h" +#include namespace wpi::uv { diff --git a/wpiutil/src/main/native/cpp/uv/Poll.cpp b/wpinet/src/main/native/cpp/uv/Poll.cpp similarity index 97% rename from wpiutil/src/main/native/cpp/uv/Poll.cpp rename to wpinet/src/main/native/cpp/uv/Poll.cpp index 090a40b4b1..3713453189 100644 --- a/wpiutil/src/main/native/cpp/uv/Poll.cpp +++ b/wpinet/src/main/native/cpp/uv/Poll.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/Poll.h" +#include "wpinet/uv/Poll.h" -#include "wpi/uv/Loop.h" +#include "wpinet/uv/Loop.h" namespace wpi::uv { diff --git a/wpiutil/src/main/native/cpp/uv/Prepare.cpp b/wpinet/src/main/native/cpp/uv/Prepare.cpp similarity index 92% rename from wpiutil/src/main/native/cpp/uv/Prepare.cpp rename to wpinet/src/main/native/cpp/uv/Prepare.cpp index 048fd08029..e4ca160859 100644 --- a/wpiutil/src/main/native/cpp/uv/Prepare.cpp +++ b/wpinet/src/main/native/cpp/uv/Prepare.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/Prepare.h" +#include "wpinet/uv/Prepare.h" -#include "wpi/uv/Loop.h" +#include "wpinet/uv/Loop.h" namespace wpi::uv { diff --git a/wpiutil/src/main/native/cpp/uv/Process.cpp b/wpinet/src/main/native/cpp/uv/Process.cpp similarity index 96% rename from wpiutil/src/main/native/cpp/uv/Process.cpp rename to wpinet/src/main/native/cpp/uv/Process.cpp index c8d522904c..b97d9fc02d 100644 --- a/wpiutil/src/main/native/cpp/uv/Process.cpp +++ b/wpinet/src/main/native/cpp/uv/Process.cpp @@ -2,11 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/Process.h" +#include "wpinet/uv/Process.h" -#include "wpi/SmallString.h" -#include "wpi/uv/Loop.h" -#include "wpi/uv/Pipe.h" +#include + +#include "wpinet/uv/Loop.h" +#include "wpinet/uv/Pipe.h" namespace wpi::uv { diff --git a/wpiutil/src/main/native/cpp/uv/Signal.cpp b/wpinet/src/main/native/cpp/uv/Signal.cpp similarity index 92% rename from wpiutil/src/main/native/cpp/uv/Signal.cpp rename to wpinet/src/main/native/cpp/uv/Signal.cpp index 81d7c3e1dc..10dd7b4d72 100644 --- a/wpiutil/src/main/native/cpp/uv/Signal.cpp +++ b/wpinet/src/main/native/cpp/uv/Signal.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/Signal.h" +#include "wpinet/uv/Signal.h" -#include "wpi/uv/Loop.h" +#include "wpinet/uv/Loop.h" namespace wpi::uv { diff --git a/wpiutil/src/main/native/cpp/uv/Stream.cpp b/wpinet/src/main/native/cpp/uv/Stream.cpp similarity index 98% rename from wpiutil/src/main/native/cpp/uv/Stream.cpp rename to wpinet/src/main/native/cpp/uv/Stream.cpp index a37750b102..94fd48b61c 100644 --- a/wpiutil/src/main/native/cpp/uv/Stream.cpp +++ b/wpinet/src/main/native/cpp/uv/Stream.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/Stream.h" +#include "wpinet/uv/Stream.h" -#include "wpi/SmallVector.h" +#include using namespace wpi; using namespace wpi::uv; diff --git a/wpiutil/src/main/native/cpp/uv/Tcp.cpp b/wpinet/src/main/native/cpp/uv/Tcp.cpp similarity index 98% rename from wpiutil/src/main/native/cpp/uv/Tcp.cpp rename to wpinet/src/main/native/cpp/uv/Tcp.cpp index 6f92557fb9..db17876781 100644 --- a/wpiutil/src/main/native/cpp/uv/Tcp.cpp +++ b/wpinet/src/main/native/cpp/uv/Tcp.cpp @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/Tcp.h" +#include "wpinet/uv/Tcp.h" #include -#include "wpi/uv/util.h" +#include "wpinet/uv/util.h" namespace wpi::uv { diff --git a/wpiutil/src/main/native/cpp/uv/Timer.cpp b/wpinet/src/main/native/cpp/uv/Timer.cpp similarity index 94% rename from wpiutil/src/main/native/cpp/uv/Timer.cpp rename to wpinet/src/main/native/cpp/uv/Timer.cpp index 33fd8511fe..9d5217367b 100644 --- a/wpiutil/src/main/native/cpp/uv/Timer.cpp +++ b/wpinet/src/main/native/cpp/uv/Timer.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/Timer.h" +#include "wpinet/uv/Timer.h" -#include "wpi/uv/Loop.h" +#include "wpinet/uv/Loop.h" namespace wpi::uv { diff --git a/wpiutil/src/main/native/cpp/uv/Tty.cpp b/wpinet/src/main/native/cpp/uv/Tty.cpp similarity index 90% rename from wpiutil/src/main/native/cpp/uv/Tty.cpp rename to wpinet/src/main/native/cpp/uv/Tty.cpp index 4531deda7c..6043a93ca4 100644 --- a/wpiutil/src/main/native/cpp/uv/Tty.cpp +++ b/wpinet/src/main/native/cpp/uv/Tty.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/Tty.h" +#include "wpinet/uv/Tty.h" -#include "wpi/uv/Loop.h" +#include "wpinet/uv/Loop.h" namespace wpi::uv { diff --git a/wpiutil/src/main/native/cpp/uv/Udp.cpp b/wpinet/src/main/native/cpp/uv/Udp.cpp similarity index 97% rename from wpiutil/src/main/native/cpp/uv/Udp.cpp rename to wpinet/src/main/native/cpp/uv/Udp.cpp index bea2b57c14..28e7901c12 100644 --- a/wpiutil/src/main/native/cpp/uv/Udp.cpp +++ b/wpinet/src/main/native/cpp/uv/Udp.cpp @@ -2,13 +2,14 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/Udp.h" +#include "wpinet/uv/Udp.h" #include -#include "wpi/SmallString.h" -#include "wpi/SmallVector.h" -#include "wpi/uv/util.h" +#include +#include + +#include "wpinet/uv/util.h" namespace { diff --git a/wpiutil/src/main/native/cpp/uv/Work.cpp b/wpinet/src/main/native/cpp/uv/Work.cpp similarity index 95% rename from wpiutil/src/main/native/cpp/uv/Work.cpp rename to wpinet/src/main/native/cpp/uv/Work.cpp index 0fc254e81d..818a93b3db 100644 --- a/wpiutil/src/main/native/cpp/uv/Work.cpp +++ b/wpinet/src/main/native/cpp/uv/Work.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/Work.h" +#include "wpinet/uv/Work.h" -#include "wpi/uv/Loop.h" +#include "wpinet/uv/Loop.h" namespace wpi::uv { diff --git a/wpiutil/src/main/native/include/wpi/DsClient.h b/wpinet/src/main/native/include/wpinet/DsClient.h similarity index 98% rename from wpiutil/src/main/native/include/wpi/DsClient.h rename to wpinet/src/main/native/include/wpinet/DsClient.h index c24ba3b568..dcebe2f377 100644 --- a/wpiutil/src/main/native/include/wpi/DsClient.h +++ b/wpinet/src/main/native/include/wpinet/DsClient.h @@ -8,7 +8,7 @@ #include #include -#include "wpi/Signal.h" +#include namespace wpi { diff --git a/wpiutil/src/main/native/include/wpi/EventLoopRunner.h b/wpinet/src/main/native/include/wpinet/EventLoopRunner.h similarity index 89% rename from wpiutil/src/main/native/include/wpi/EventLoopRunner.h rename to wpinet/src/main/native/include/wpinet/EventLoopRunner.h index 5d35d407b5..896bae3e05 100644 --- a/wpiutil/src/main/native/include/wpi/EventLoopRunner.h +++ b/wpinet/src/main/native/include/wpinet/EventLoopRunner.h @@ -2,14 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_EVENTLOOPRUNNER_H_ -#define WPIUTIL_WPI_EVENTLOOPRUNNER_H_ +#ifndef WPINET_EVENTLOOPRUNNER_H_ +#define WPINET_EVENTLOOPRUNNER_H_ #include #include -#include "wpi/SafeThread.h" -#include "wpi/uv/Loop.h" +#include + +#include "wpinet/uv/Loop.h" namespace wpi { @@ -59,4 +60,4 @@ class EventLoopRunner { } // namespace wpi -#endif // WPIUTIL_WPI_EVENTLOOPRUNNER_H_ +#endif // WPINET_EVENTLOOPRUNNER_H_ diff --git a/wpiutil/src/main/native/include/wpi/HttpParser.h b/wpinet/src/main/native/include/wpinet/HttpParser.h similarity index 97% rename from wpiutil/src/main/native/include/wpi/HttpParser.h rename to wpinet/src/main/native/include/wpinet/HttpParser.h index 72e5dad7b6..a2a6ea7404 100644 --- a/wpiutil/src/main/native/include/wpi/HttpParser.h +++ b/wpinet/src/main/native/include/wpinet/HttpParser.h @@ -2,16 +2,17 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_HTTPPARSER_H_ -#define WPIUTIL_WPI_HTTPPARSER_H_ +#ifndef WPINET_HTTPPARSER_H_ +#define WPINET_HTTPPARSER_H_ #include #include -#include "wpi/Signal.h" -#include "wpi/SmallString.h" -#include "wpi/http_parser.h" +#include +#include + +#include "wpinet/http_parser.h" namespace wpi { @@ -224,4 +225,4 @@ class HttpParser { } // namespace wpi -#endif // WPIUTIL_WPI_HTTPPARSER_H_ +#endif // WPINET_HTTPPARSER_H_ diff --git a/wpiutil/src/main/native/include/wpi/HttpServerConnection.h b/wpinet/src/main/native/include/wpinet/HttpServerConnection.h similarity index 96% rename from wpiutil/src/main/native/include/wpi/HttpServerConnection.h rename to wpinet/src/main/native/include/wpinet/HttpServerConnection.h index a4d4cf8caa..4e3b509e56 100644 --- a/wpiutil/src/main/native/include/wpi/HttpServerConnection.h +++ b/wpinet/src/main/native/include/wpinet/HttpServerConnection.h @@ -2,15 +2,16 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_HTTPSERVERCONNECTION_H_ -#define WPIUTIL_WPI_HTTPSERVERCONNECTION_H_ +#ifndef WPINET_HTTPSERVERCONNECTION_H_ +#define WPINET_HTTPSERVERCONNECTION_H_ #include #include -#include "wpi/HttpParser.h" -#include "wpi/span.h" -#include "wpi/uv/Stream.h" +#include + +#include "wpinet/HttpParser.h" +#include "wpinet/uv/Stream.h" namespace wpi { @@ -149,4 +150,4 @@ class HttpServerConnection { } // namespace wpi -#endif // WPIUTIL_WPI_HTTPSERVERCONNECTION_H_ +#endif // WPINET_HTTPSERVERCONNECTION_H_ diff --git a/wpiutil/src/main/native/include/wpi/HttpUtil.h b/wpinet/src/main/native/include/wpinet/HttpUtil.h similarity index 97% rename from wpiutil/src/main/native/include/wpi/HttpUtil.h rename to wpinet/src/main/native/include/wpinet/HttpUtil.h index b10d127a82..e3d65bf8ec 100644 --- a/wpiutil/src/main/native/include/wpi/HttpUtil.h +++ b/wpinet/src/main/native/include/wpinet/HttpUtil.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_HTTPUTIL_H_ -#define WPIUTIL_WPI_HTTPUTIL_H_ +#ifndef WPINET_HTTPUTIL_H_ +#define WPINET_HTTPUTIL_H_ #include #include @@ -13,14 +13,15 @@ #include #include -#include "wpi/NetworkStream.h" -#include "wpi/SmallString.h" -#include "wpi/SmallVector.h" -#include "wpi/StringMap.h" -#include "wpi/raw_istream.h" -#include "wpi/raw_socket_istream.h" -#include "wpi/raw_socket_ostream.h" -#include "wpi/span.h" +#include +#include +#include +#include +#include + +#include "wpinet/NetworkStream.h" +#include "wpinet/raw_socket_istream.h" +#include "wpinet/raw_socket_ostream.h" namespace wpi { @@ -419,4 +420,4 @@ class HttpMultipartScanner { #include "HttpUtil.inc" -#endif // WPIUTIL_WPI_HTTPUTIL_H_ +#endif // WPINET_HTTPUTIL_H_ diff --git a/wpiutil/src/main/native/include/wpi/HttpUtil.inc b/wpinet/src/main/native/include/wpinet/HttpUtil.inc similarity index 91% rename from wpiutil/src/main/native/include/wpi/HttpUtil.inc rename to wpinet/src/main/native/include/wpinet/HttpUtil.inc index 726cdfb158..f70b8dda01 100644 --- a/wpiutil/src/main/native/include/wpi/HttpUtil.inc +++ b/wpinet/src/main/native/include/wpinet/HttpUtil.inc @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_HTTPUTIL_INC_ -#define WPIUTIL_WPI_HTTPUTIL_INC_ +#ifndef WPINET_HTTPUTIL_INC_ +#define WPINET_HTTPUTIL_INC_ #include -#include "wpi/HttpUtil.h" +#include "wpinet/HttpUtil.h" namespace wpi { @@ -52,4 +52,4 @@ void HttpRequest::SetPath(std::string_view path_, const T& params) { } // namespace wpi -#endif // WPIUTIL_WPI_HTTPUTIL_INC_ +#endif // WPINET_HTTPUTIL_INC_ diff --git a/wpiutil/src/main/native/include/wpi/HttpWebSocketServerConnection.h b/wpinet/src/main/native/include/wpinet/HttpWebSocketServerConnection.h similarity index 87% rename from wpiutil/src/main/native/include/wpi/HttpWebSocketServerConnection.h rename to wpinet/src/main/native/include/wpinet/HttpWebSocketServerConnection.h index d89b61f0a9..f860e91e19 100644 --- a/wpiutil/src/main/native/include/wpi/HttpWebSocketServerConnection.h +++ b/wpinet/src/main/native/include/wpinet/HttpWebSocketServerConnection.h @@ -2,20 +2,21 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_HTTPWEBSOCKETSERVERCONNECTION_H_ -#define WPIUTIL_WPI_HTTPWEBSOCKETSERVERCONNECTION_H_ +#ifndef WPINET_HTTPWEBSOCKETSERVERCONNECTION_H_ +#define WPINET_HTTPWEBSOCKETSERVERCONNECTION_H_ #include #include #include #include -#include "wpi/HttpServerConnection.h" -#include "wpi/SmallVector.h" -#include "wpi/WebSocket.h" -#include "wpi/WebSocketServer.h" -#include "wpi/span.h" -#include "wpi/uv/Stream.h" +#include +#include + +#include "wpinet/HttpServerConnection.h" +#include "wpinet/WebSocket.h" +#include "wpinet/WebSocketServer.h" +#include "wpinet/uv/Stream.h" namespace wpi { @@ -89,4 +90,4 @@ class HttpWebSocketServerConnection #include "HttpWebSocketServerConnection.inc" -#endif // WPIUTIL_WPI_HTTPWEBSOCKETSERVERCONNECTION_H_ +#endif // WPINET_HTTPWEBSOCKETSERVERCONNECTION_H_ diff --git a/wpiutil/src/main/native/include/wpi/HttpWebSocketServerConnection.inc b/wpinet/src/main/native/include/wpinet/HttpWebSocketServerConnection.inc similarity index 87% rename from wpiutil/src/main/native/include/wpi/HttpWebSocketServerConnection.inc rename to wpinet/src/main/native/include/wpinet/HttpWebSocketServerConnection.inc index 68b9f2d91d..c26c864a0e 100644 --- a/wpiutil/src/main/native/include/wpi/HttpWebSocketServerConnection.inc +++ b/wpinet/src/main/native/include/wpinet/HttpWebSocketServerConnection.inc @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_HTTPWEBSOCKETSERVERCONNECTION_INC_ -#define WPIUTIL_WPI_HTTPWEBSOCKETSERVERCONNECTION_INC_ +#ifndef WPINET_HTTPWEBSOCKETSERVERCONNECTION_INC_ +#define WPINET_HTTPWEBSOCKETSERVERCONNECTION_INC_ #include -#include "wpi/HttpWebSocketServerConnection.h" +#include "wpinet/HttpWebSocketServerConnection.h" namespace wpi { @@ -53,4 +53,4 @@ HttpWebSocketServerConnection::HttpWebSocketServerConnection( } // namespace wpi -#endif // WPIUTIL_WPI_HTTPWEBSOCKETSERVERCONNECTION_INC_ +#endif // WPINET_HTTPWEBSOCKETSERVERCONNECTION_INC_ diff --git a/wpiutil/src/main/native/include/wpi/MimeTypes.h b/wpinet/src/main/native/include/wpinet/MimeTypes.h similarity index 75% rename from wpiutil/src/main/native/include/wpi/MimeTypes.h rename to wpinet/src/main/native/include/wpinet/MimeTypes.h index ce36ea26c2..2f5fe7228a 100644 --- a/wpiutil/src/main/native/include/wpi/MimeTypes.h +++ b/wpinet/src/main/native/include/wpinet/MimeTypes.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_MIMETYPES_H_ -#define WPIUTIL_WPI_MIMETYPES_H_ +#ifndef WPINET_MIMETYPES_H_ +#define WPINET_MIMETYPES_H_ #include @@ -13,4 +13,4 @@ std::string_view MimeTypeFromPath(std::string_view path); } // namespace wpi -#endif // WPIUTIL_WPI_MIMETYPES_H_ +#endif // WPINET_MIMETYPES_H_ diff --git a/wpiutil/src/main/native/include/wpi/MulticastServiceAnnouncer.h b/wpinet/src/main/native/include/wpinet/MulticastServiceAnnouncer.h similarity index 98% rename from wpiutil/src/main/native/include/wpi/MulticastServiceAnnouncer.h rename to wpinet/src/main/native/include/wpinet/MulticastServiceAnnouncer.h index 5d2048dfe9..29da3fa9cb 100644 --- a/wpiutil/src/main/native/include/wpi/MulticastServiceAnnouncer.h +++ b/wpinet/src/main/native/include/wpinet/MulticastServiceAnnouncer.h @@ -12,7 +12,7 @@ #include #include -#include "wpi/span.h" +#include namespace wpi { class MulticastServiceAnnouncer { public: diff --git a/wpiutil/src/main/native/include/wpi/MulticastServiceResolver.h b/wpinet/src/main/native/include/wpinet/MulticastServiceResolver.h similarity index 97% rename from wpiutil/src/main/native/include/wpi/MulticastServiceResolver.h rename to wpinet/src/main/native/include/wpinet/MulticastServiceResolver.h index 0b63c2f8e0..57835dc0f8 100644 --- a/wpiutil/src/main/native/include/wpi/MulticastServiceResolver.h +++ b/wpinet/src/main/native/include/wpinet/MulticastServiceResolver.h @@ -4,7 +4,7 @@ #pragma once -#include "wpi/Synchronization.h" +#include #ifdef __cplusplus #include @@ -14,8 +14,8 @@ #include #include -#include "wpi/mutex.h" -#include "wpi/span.h" +#include +#include namespace wpi { class MulticastServiceResolver { public: diff --git a/wpiutil/src/main/native/include/wpi/NetworkAcceptor.h b/wpinet/src/main/native/include/wpinet/NetworkAcceptor.h similarity index 79% rename from wpiutil/src/main/native/include/wpi/NetworkAcceptor.h rename to wpinet/src/main/native/include/wpinet/NetworkAcceptor.h index 9982360722..6fe2e3bb18 100644 --- a/wpiutil/src/main/native/include/wpi/NetworkAcceptor.h +++ b/wpinet/src/main/native/include/wpinet/NetworkAcceptor.h @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_NETWORKACCEPTOR_H_ -#define WPIUTIL_WPI_NETWORKACCEPTOR_H_ +#ifndef WPINET_NETWORKACCEPTOR_H_ +#define WPINET_NETWORKACCEPTOR_H_ #include -#include "wpi/NetworkStream.h" +#include "wpinet/NetworkStream.h" namespace wpi { @@ -26,4 +26,4 @@ class NetworkAcceptor { } // namespace wpi -#endif // WPIUTIL_WPI_NETWORKACCEPTOR_H_ +#endif // WPINET_NETWORKACCEPTOR_H_ diff --git a/wpiutil/src/main/native/include/wpi/NetworkStream.h b/wpinet/src/main/native/include/wpinet/NetworkStream.h similarity index 90% rename from wpiutil/src/main/native/include/wpi/NetworkStream.h rename to wpinet/src/main/native/include/wpinet/NetworkStream.h index b842ecdddb..8329b88403 100644 --- a/wpiutil/src/main/native/include/wpi/NetworkStream.h +++ b/wpinet/src/main/native/include/wpinet/NetworkStream.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_NETWORKSTREAM_H_ -#define WPIUTIL_WPI_NETWORKSTREAM_H_ +#ifndef WPINET_NETWORKSTREAM_H_ +#define WPINET_NETWORKSTREAM_H_ #include #include @@ -41,4 +41,4 @@ class NetworkStream { } // namespace wpi -#endif // WPIUTIL_WPI_NETWORKSTREAM_H_ +#endif // WPINET_NETWORKSTREAM_H_ diff --git a/wpiutil/src/main/native/include/wpi/ParallelTcpConnector.h b/wpinet/src/main/native/include/wpinet/ParallelTcpConnector.h similarity index 98% rename from wpiutil/src/main/native/include/wpi/ParallelTcpConnector.h rename to wpinet/src/main/native/include/wpinet/ParallelTcpConnector.h index 47c29d0220..fbcec185f6 100644 --- a/wpiutil/src/main/native/include/wpi/ParallelTcpConnector.h +++ b/wpinet/src/main/native/include/wpinet/ParallelTcpConnector.h @@ -12,8 +12,9 @@ #include #include -#include "wpi/span.h" -#include "wpi/uv/Timer.h" +#include + +#include "wpinet/uv/Timer.h" namespace wpi { diff --git a/wpiutil/src/main/native/include/wpi/PortForwarder.h b/wpinet/src/main/native/include/wpinet/PortForwarder.h similarity index 92% rename from wpiutil/src/main/native/include/wpi/PortForwarder.h rename to wpinet/src/main/native/include/wpinet/PortForwarder.h index 9e445a0368..14453a3e01 100644 --- a/wpiutil/src/main/native/include/wpi/PortForwarder.h +++ b/wpinet/src/main/native/include/wpinet/PortForwarder.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_PORTFORWARDER_H_ -#define WPIUTIL_WPI_PORTFORWARDER_H_ +#ifndef WPINET_PORTFORWARDER_H_ +#define WPINET_PORTFORWARDER_H_ #pragma once @@ -56,4 +56,4 @@ class PortForwarder { } // namespace wpi -#endif // WPIUTIL_WPI_PORTFORWARDER_H_ +#endif // WPINET_PORTFORWARDER_H_ diff --git a/wpiutil/src/main/native/include/wpi/SocketError.h b/wpinet/src/main/native/include/wpinet/SocketError.h similarity index 78% rename from wpiutil/src/main/native/include/wpi/SocketError.h rename to wpinet/src/main/native/include/wpinet/SocketError.h index b893ac6a6f..c944b0cce7 100644 --- a/wpiutil/src/main/native/include/wpi/SocketError.h +++ b/wpinet/src/main/native/include/wpinet/SocketError.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_SOCKETERROR_H_ -#define WPIUTIL_WPI_SOCKETERROR_H_ +#ifndef WPINET_SOCKETERROR_H_ +#define WPINET_SOCKETERROR_H_ #include @@ -19,4 +19,4 @@ inline std::string SocketStrerror() { } // namespace wpi -#endif // WPIUTIL_WPI_SOCKETERROR_H_ +#endif // WPINET_SOCKETERROR_H_ diff --git a/wpiutil/src/main/native/include/wpi/TCPAcceptor.h b/wpinet/src/main/native/include/wpinet/TCPAcceptor.h similarity index 88% rename from wpiutil/src/main/native/include/wpi/TCPAcceptor.h rename to wpinet/src/main/native/include/wpinet/TCPAcceptor.h index 083897adac..5ba7ce5da0 100644 --- a/wpiutil/src/main/native/include/wpi/TCPAcceptor.h +++ b/wpinet/src/main/native/include/wpinet/TCPAcceptor.h @@ -21,16 +21,16 @@ limitations under the License. */ -#ifndef WPIUTIL_WPI_TCPACCEPTOR_H_ -#define WPIUTIL_WPI_TCPACCEPTOR_H_ +#ifndef WPINET_TCPACCEPTOR_H_ +#define WPINET_TCPACCEPTOR_H_ #include #include #include #include -#include "wpi/NetworkAcceptor.h" -#include "wpi/TCPStream.h" +#include "wpinet/NetworkAcceptor.h" +#include "wpinet/TCPStream.h" namespace wpi { @@ -55,4 +55,4 @@ class TCPAcceptor : public NetworkAcceptor { } // namespace wpi -#endif // WPIUTIL_WPI_TCPACCEPTOR_H_ +#endif // WPINET_TCPACCEPTOR_H_ diff --git a/wpiutil/src/main/native/include/wpi/TCPConnector.h b/wpinet/src/main/native/include/wpinet/TCPConnector.h similarity index 88% rename from wpiutil/src/main/native/include/wpi/TCPConnector.h rename to wpinet/src/main/native/include/wpinet/TCPConnector.h index 63e8906ea5..6da4c7bb21 100644 --- a/wpiutil/src/main/native/include/wpi/TCPConnector.h +++ b/wpinet/src/main/native/include/wpinet/TCPConnector.h @@ -21,14 +21,15 @@ limitations under the License */ -#ifndef WPIUTIL_WPI_TCPCONNECTOR_H_ -#define WPIUTIL_WPI_TCPCONNECTOR_H_ +#ifndef WPINET_TCPCONNECTOR_H_ +#define WPINET_TCPCONNECTOR_H_ #include #include -#include "wpi/NetworkStream.h" -#include "wpi/span.h" +#include + +#include "wpinet/NetworkStream.h" namespace wpi { @@ -46,4 +47,4 @@ class TCPConnector { } // namespace wpi -#endif // WPIUTIL_WPI_TCPCONNECTOR_H_ +#endif // WPINET_TCPCONNECTOR_H_ diff --git a/wpiutil/src/main/native/include/wpi/TCPStream.h b/wpinet/src/main/native/include/wpinet/TCPStream.h similarity index 92% rename from wpiutil/src/main/native/include/wpi/TCPStream.h rename to wpinet/src/main/native/include/wpinet/TCPStream.h index 2d54300029..f54da48822 100644 --- a/wpiutil/src/main/native/include/wpi/TCPStream.h +++ b/wpinet/src/main/native/include/wpinet/TCPStream.h @@ -21,14 +21,14 @@ limitations under the License. */ -#ifndef WPIUTIL_WPI_TCPSTREAM_H_ -#define WPIUTIL_WPI_TCPSTREAM_H_ +#ifndef WPINET_TCPSTREAM_H_ +#define WPINET_TCPSTREAM_H_ #include #include #include -#include "wpi/NetworkStream.h" +#include "wpinet/NetworkStream.h" struct sockaddr_in; @@ -69,4 +69,4 @@ class TCPStream : public NetworkStream { } // namespace wpi -#endif // WPIUTIL_WPI_TCPSTREAM_H_ +#endif // WPINET_TCPSTREAM_H_ diff --git a/wpiutil/src/main/native/include/wpi/UDPClient.h b/wpinet/src/main/native/include/wpinet/UDPClient.h similarity index 86% rename from wpiutil/src/main/native/include/wpi/UDPClient.h rename to wpinet/src/main/native/include/wpinet/UDPClient.h index fd2e30bf30..aa776cbf24 100644 --- a/wpiutil/src/main/native/include/wpi/UDPClient.h +++ b/wpinet/src/main/native/include/wpinet/UDPClient.h @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UDPCLIENT_H_ -#define WPIUTIL_WPI_UDPCLIENT_H_ +#ifndef WPINET_UDPCLIENT_H_ +#define WPINET_UDPCLIENT_H_ #include #include -#include "wpi/SmallVector.h" -#include "wpi/mutex.h" -#include "wpi/span.h" +#include +#include +#include namespace wpi { @@ -46,4 +46,4 @@ class UDPClient { } // namespace wpi -#endif // WPIUTIL_WPI_UDPCLIENT_H_ +#endif // WPINET_UDPCLIENT_H_ diff --git a/wpiutil/src/main/native/include/wpi/UrlParser.h b/wpinet/src/main/native/include/wpinet/UrlParser.h similarity index 93% rename from wpiutil/src/main/native/include/wpi/UrlParser.h rename to wpinet/src/main/native/include/wpinet/UrlParser.h index 1932c3ef0a..92fd330ce7 100644 --- a/wpiutil/src/main/native/include/wpi/UrlParser.h +++ b/wpinet/src/main/native/include/wpinet/UrlParser.h @@ -2,13 +2,14 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_URLPARSER_H_ -#define WPIUTIL_WPI_URLPARSER_H_ +#ifndef WPINET_URLPARSER_H_ +#define WPINET_URLPARSER_H_ #include -#include "wpi/StringExtras.h" -#include "wpi/http_parser.h" +#include + +#include "wpinet/http_parser.h" namespace wpi { @@ -92,4 +93,4 @@ class UrlParser { } // namespace wpi -#endif // WPIUTIL_WPI_URLPARSER_H_ +#endif // WPINET_URLPARSER_H_ diff --git a/wpiutil/src/main/native/include/wpi/WebSocket.h b/wpinet/src/main/native/include/wpinet/WebSocket.h similarity index 98% rename from wpiutil/src/main/native/include/wpi/WebSocket.h rename to wpinet/src/main/native/include/wpinet/WebSocket.h index fc2ae4a469..622d001328 100644 --- a/wpiutil/src/main/native/include/wpi/WebSocket.h +++ b/wpinet/src/main/native/include/wpinet/WebSocket.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_WEBSOCKET_H_ -#define WPIUTIL_WPI_WEBSOCKET_H_ +#ifndef WPINET_WEBSOCKET_H_ +#define WPINET_WEBSOCKET_H_ #include @@ -14,12 +14,13 @@ #include #include -#include "wpi/Signal.h" -#include "wpi/SmallVector.h" -#include "wpi/span.h" -#include "wpi/uv/Buffer.h" -#include "wpi/uv/Error.h" -#include "wpi/uv/Timer.h" +#include +#include +#include + +#include "wpinet/uv/Buffer.h" +#include "wpinet/uv/Error.h" +#include "wpinet/uv/Timer.h" namespace wpi { @@ -474,4 +475,4 @@ class WebSocket : public std::enable_shared_from_this { } // namespace wpi -#endif // WPIUTIL_WPI_WEBSOCKET_H_ +#endif // WPINET_WEBSOCKET_H_ diff --git a/wpiutil/src/main/native/include/wpi/WebSocketServer.h b/wpinet/src/main/native/include/wpinet/WebSocketServer.h similarity index 94% rename from wpiutil/src/main/native/include/wpi/WebSocketServer.h rename to wpinet/src/main/native/include/wpinet/WebSocketServer.h index 1f76d16b91..65e7cf3c75 100644 --- a/wpiutil/src/main/native/include/wpi/WebSocketServer.h +++ b/wpinet/src/main/native/include/wpinet/WebSocketServer.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_WEBSOCKETSERVER_H_ -#define WPIUTIL_WPI_WEBSOCKETSERVER_H_ +#ifndef WPINET_WEBSOCKETSERVER_H_ +#define WPINET_WEBSOCKETSERVER_H_ #include #include @@ -12,12 +12,13 @@ #include #include -#include "wpi/HttpParser.h" -#include "wpi/Signal.h" -#include "wpi/SmallString.h" -#include "wpi/SmallVector.h" -#include "wpi/WebSocket.h" -#include "wpi/span.h" +#include +#include +#include +#include + +#include "wpinet/HttpParser.h" +#include "wpinet/WebSocket.h" namespace wpi { @@ -174,4 +175,4 @@ class WebSocketServer : public std::enable_shared_from_this { } // namespace wpi -#endif // WPIUTIL_WPI_WEBSOCKETSERVER_H_ +#endif // WPINET_WEBSOCKETSERVER_H_ diff --git a/wpiutil/src/main/native/include/wpi/WorkerThread.h b/wpinet/src/main/native/include/wpinet/WorkerThread.h similarity index 97% rename from wpiutil/src/main/native/include/wpi/WorkerThread.h rename to wpinet/src/main/native/include/wpinet/WorkerThread.h index 6c8852e4f7..b5438cc60b 100644 --- a/wpiutil/src/main/native/include/wpi/WorkerThread.h +++ b/wpinet/src/main/native/include/wpinet/WorkerThread.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_WORKERTHREAD_H_ -#define WPIUTIL_WPI_WORKERTHREAD_H_ +#ifndef WPINET_WORKERTHREAD_H_ +#define WPINET_WORKERTHREAD_H_ #include #include @@ -11,9 +11,10 @@ #include #include -#include "wpi/SafeThread.h" -#include "wpi/future.h" -#include "wpi/uv/Async.h" +#include +#include + +#include "wpinet/uv/Async.h" namespace wpi { @@ -282,4 +283,4 @@ class WorkerThread final { } // namespace wpi -#endif // WPIUTIL_WPI_WORKERTHREAD_H_ +#endif // WPINET_WORKERTHREAD_H_ diff --git a/wpiutil/src/main/native/include/wpi/hostname.h b/wpinet/src/main/native/include/wpinet/hostname.h similarity index 80% rename from wpiutil/src/main/native/include/wpi/hostname.h rename to wpinet/src/main/native/include/wpinet/hostname.h index bd93b4a0db..e356fb40ac 100644 --- a/wpiutil/src/main/native/include/wpi/hostname.h +++ b/wpinet/src/main/native/include/wpinet/hostname.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_HOSTNAME_H_ -#define WPIUTIL_WPI_HOSTNAME_H_ +#ifndef WPINET_HOSTNAME_H_ +#define WPINET_HOSTNAME_H_ #include #include @@ -16,4 +16,4 @@ std::string GetHostname(); std::string_view GetHostname(SmallVectorImpl& name); } // namespace wpi -#endif // WPIUTIL_WPI_HOSTNAME_H_ +#endif // WPINET_HOSTNAME_H_ diff --git a/wpiutil/src/main/native/include/wpi/http_parser.h b/wpinet/src/main/native/include/wpinet/http_parser.h similarity index 100% rename from wpiutil/src/main/native/include/wpi/http_parser.h rename to wpinet/src/main/native/include/wpinet/http_parser.h diff --git a/wpiutil/src/main/native/include/wpi/raw_socket_istream.h b/wpinet/src/main/native/include/wpinet/raw_socket_istream.h similarity index 79% rename from wpiutil/src/main/native/include/wpi/raw_socket_istream.h rename to wpinet/src/main/native/include/wpinet/raw_socket_istream.h index f6899e2efd..f8f41e32c6 100644 --- a/wpiutil/src/main/native/include/wpi/raw_socket_istream.h +++ b/wpinet/src/main/native/include/wpinet/raw_socket_istream.h @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_RAW_SOCKET_ISTREAM_H_ -#define WPIUTIL_WPI_RAW_SOCKET_ISTREAM_H_ +#ifndef WPINET_RAW_SOCKET_ISTREAM_H_ +#define WPINET_RAW_SOCKET_ISTREAM_H_ -#include "wpi/raw_istream.h" +#include namespace wpi { @@ -28,4 +28,4 @@ class raw_socket_istream : public raw_istream { } // namespace wpi -#endif // WPIUTIL_WPI_RAW_SOCKET_ISTREAM_H_ +#endif // WPINET_RAW_SOCKET_ISTREAM_H_ diff --git a/wpiutil/src/main/native/include/wpi/raw_socket_ostream.h b/wpinet/src/main/native/include/wpinet/raw_socket_ostream.h similarity index 83% rename from wpiutil/src/main/native/include/wpi/raw_socket_ostream.h rename to wpinet/src/main/native/include/wpinet/raw_socket_ostream.h index 5cdeb41c5e..51e0104027 100644 --- a/wpiutil/src/main/native/include/wpi/raw_socket_ostream.h +++ b/wpinet/src/main/native/include/wpinet/raw_socket_ostream.h @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_RAW_SOCKET_OSTREAM_H_ -#define WPIUTIL_WPI_RAW_SOCKET_OSTREAM_H_ +#ifndef WPINET_RAW_SOCKET_OSTREAM_H_ +#define WPINET_RAW_SOCKET_OSTREAM_H_ -#include "wpi/raw_ostream.h" +#include namespace wpi { @@ -36,4 +36,4 @@ class raw_socket_ostream : public raw_ostream { } // namespace wpi -#endif // WPIUTIL_WPI_RAW_SOCKET_OSTREAM_H_ +#endif // WPINET_RAW_SOCKET_OSTREAM_H_ diff --git a/wpiutil/src/main/native/include/wpi/raw_uv_ostream.h b/wpinet/src/main/native/include/wpinet/raw_uv_ostream.h similarity index 89% rename from wpiutil/src/main/native/include/wpi/raw_uv_ostream.h rename to wpinet/src/main/native/include/wpinet/raw_uv_ostream.h index 4773c610c0..54ee4208c2 100644 --- a/wpiutil/src/main/native/include/wpi/raw_uv_ostream.h +++ b/wpinet/src/main/native/include/wpinet/raw_uv_ostream.h @@ -2,16 +2,17 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_RAW_UV_OSTREAM_H_ -#define WPIUTIL_WPI_RAW_UV_OSTREAM_H_ +#ifndef WPINET_RAW_UV_OSTREAM_H_ +#define WPINET_RAW_UV_OSTREAM_H_ #include #include -#include "wpi/SmallVector.h" -#include "wpi/raw_ostream.h" -#include "wpi/span.h" -#include "wpi/uv/Buffer.h" +#include +#include +#include + +#include "wpinet/uv/Buffer.h" namespace wpi { @@ -71,4 +72,4 @@ class raw_uv_ostream : public raw_ostream { } // namespace wpi -#endif // WPIUTIL_WPI_RAW_UV_OSTREAM_H_ +#endif // WPINET_RAW_UV_OSTREAM_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/Async.h b/wpinet/src/main/native/include/wpinet/uv/Async.h similarity index 95% rename from wpiutil/src/main/native/include/wpi/uv/Async.h rename to wpinet/src/main/native/include/wpinet/uv/Async.h index 49f3dde4ed..820ae9fb9b 100644 --- a/wpiutil/src/main/native/include/wpi/uv/Async.h +++ b/wpinet/src/main/native/include/wpinet/uv/Async.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_ASYNC_H_ -#define WPIUTIL_WPI_UV_ASYNC_H_ +#ifndef WPINET_UV_ASYNC_H_ +#define WPINET_UV_ASYNC_H_ #include @@ -13,10 +13,11 @@ #include #include -#include "wpi/Signal.h" -#include "wpi/mutex.h" -#include "wpi/uv/Handle.h" -#include "wpi/uv/Loop.h" +#include +#include + +#include "wpinet/uv/Handle.h" +#include "wpinet/uv/Loop.h" namespace wpi::uv { @@ -171,4 +172,4 @@ class Async<> final : public HandleImpl, uv_async_t> { } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_ASYNC_H_ +#endif // WPINET_UV_ASYNC_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/AsyncFunction.h b/wpinet/src/main/native/include/wpinet/uv/AsyncFunction.h similarity index 95% rename from wpiutil/src/main/native/include/wpi/uv/AsyncFunction.h rename to wpinet/src/main/native/include/wpinet/uv/AsyncFunction.h index fa4eb90269..82a5913035 100644 --- a/wpiutil/src/main/native/include/wpi/uv/AsyncFunction.h +++ b/wpinet/src/main/native/include/wpinet/uv/AsyncFunction.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_ASYNCFUNCTION_H_ -#define WPIUTIL_WPI_UV_ASYNCFUNCTION_H_ +#ifndef WPINET_UV_ASYNCFUNCTION_H_ +#define WPINET_UV_ASYNCFUNCTION_H_ #include #include @@ -15,10 +15,11 @@ #include #include -#include "wpi/future.h" -#include "wpi/mutex.h" -#include "wpi/uv/Handle.h" -#include "wpi/uv/Loop.h" +#include +#include + +#include "wpinet/uv/Handle.h" +#include "wpinet/uv/Loop.h" namespace wpi::uv { @@ -164,4 +165,4 @@ class AsyncFunction final } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_ASYNCFUNCTION_H_ +#endif // WPINET_UV_ASYNCFUNCTION_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/Buffer.h b/wpinet/src/main/native/include/wpinet/uv/Buffer.h similarity index 96% rename from wpiutil/src/main/native/include/wpi/uv/Buffer.h rename to wpinet/src/main/native/include/wpinet/uv/Buffer.h index 51268414e9..b22753d746 100644 --- a/wpiutil/src/main/native/include/wpi/uv/Buffer.h +++ b/wpinet/src/main/native/include/wpinet/uv/Buffer.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_BUFFER_H_ -#define WPIUTIL_WPI_UV_BUFFER_H_ +#ifndef WPINET_UV_BUFFER_H_ +#define WPINET_UV_BUFFER_H_ #include @@ -12,8 +12,8 @@ #include #include -#include "wpi/SmallVector.h" -#include "wpi/span.h" +#include +#include namespace wpi::uv { @@ -160,4 +160,4 @@ class SimpleBufferPool { } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_BUFFER_H_ +#endif // WPINET_UV_BUFFER_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/Check.h b/wpinet/src/main/native/include/wpinet/uv/Check.h similarity index 89% rename from wpiutil/src/main/native/include/wpi/uv/Check.h rename to wpinet/src/main/native/include/wpinet/uv/Check.h index 7555452a3c..8f5aa2f57a 100644 --- a/wpiutil/src/main/native/include/wpi/uv/Check.h +++ b/wpinet/src/main/native/include/wpinet/uv/Check.h @@ -2,15 +2,16 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_CHECK_H_ -#define WPIUTIL_WPI_UV_CHECK_H_ +#ifndef WPINET_UV_CHECK_H_ +#define WPINET_UV_CHECK_H_ #include #include -#include "wpi/Signal.h" -#include "wpi/uv/Handle.h" +#include + +#include "wpinet/uv/Handle.h" namespace wpi::uv { @@ -62,4 +63,4 @@ class Check final : public HandleImpl { } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_CHECK_H_ +#endif // WPINET_UV_CHECK_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/Error.h b/wpinet/src/main/native/include/wpinet/uv/Error.h similarity index 89% rename from wpiutil/src/main/native/include/wpi/uv/Error.h rename to wpinet/src/main/native/include/wpinet/uv/Error.h index 1e717a4062..cc2a5d5779 100644 --- a/wpiutil/src/main/native/include/wpi/uv/Error.h +++ b/wpinet/src/main/native/include/wpinet/uv/Error.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_ERROR_H_ -#define WPIUTIL_WPI_UV_ERROR_H_ +#ifndef WPINET_UV_ERROR_H_ +#define WPINET_UV_ERROR_H_ #include @@ -43,4 +43,4 @@ class Error { } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_ERROR_H_ +#endif // WPINET_UV_ERROR_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/FsEvent.h b/wpinet/src/main/native/include/wpinet/uv/FsEvent.h similarity index 92% rename from wpiutil/src/main/native/include/wpi/uv/FsEvent.h rename to wpinet/src/main/native/include/wpinet/uv/FsEvent.h index 0ed2dcbe92..ba8a649595 100644 --- a/wpiutil/src/main/native/include/wpi/uv/FsEvent.h +++ b/wpinet/src/main/native/include/wpinet/uv/FsEvent.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_FSEVENT_H_ -#define WPIUTIL_WPI_UV_FSEVENT_H_ +#ifndef WPINET_UV_FSEVENT_H_ +#define WPINET_UV_FSEVENT_H_ #include @@ -11,8 +11,9 @@ #include #include -#include "wpi/Signal.h" -#include "wpi/uv/Handle.h" +#include + +#include "wpinet/uv/Handle.h" namespace wpi::uv { @@ -76,4 +77,4 @@ class FsEvent final : public HandleImpl { } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_FSEVENT_H_ +#endif // WPINET_UV_FSEVENT_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/GetAddrInfo.h b/wpinet/src/main/native/include/wpinet/uv/GetAddrInfo.h similarity index 95% rename from wpiutil/src/main/native/include/wpi/uv/GetAddrInfo.h rename to wpinet/src/main/native/include/wpinet/uv/GetAddrInfo.h index 18d4f32733..59541104c7 100644 --- a/wpiutil/src/main/native/include/wpi/uv/GetAddrInfo.h +++ b/wpinet/src/main/native/include/wpinet/uv/GetAddrInfo.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_GETADDRINFO_H_ -#define WPIUTIL_WPI_UV_GETADDRINFO_H_ +#ifndef WPINET_UV_GETADDRINFO_H_ +#define WPINET_UV_GETADDRINFO_H_ #include @@ -12,8 +12,9 @@ #include #include -#include "wpi/Signal.h" -#include "wpi/uv/Request.h" +#include + +#include "wpinet/uv/Request.h" namespace wpi::uv { @@ -116,4 +117,4 @@ inline void GetAddrInfo(const std::shared_ptr& loop, } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_GETADDRINFO_H_ +#endif // WPINET_UV_GETADDRINFO_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/GetNameInfo.h b/wpinet/src/main/native/include/wpinet/uv/GetNameInfo.h similarity index 97% rename from wpiutil/src/main/native/include/wpi/uv/GetNameInfo.h rename to wpinet/src/main/native/include/wpinet/uv/GetNameInfo.h index d35dd95bc6..1bd0f4a594 100644 --- a/wpiutil/src/main/native/include/wpi/uv/GetNameInfo.h +++ b/wpinet/src/main/native/include/wpinet/uv/GetNameInfo.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_GETNAMEINFO_H_ -#define WPIUTIL_WPI_UV_GETNAMEINFO_H_ +#ifndef WPINET_UV_GETNAMEINFO_H_ +#define WPINET_UV_GETNAMEINFO_H_ #include @@ -12,8 +12,9 @@ #include #include -#include "wpi/Signal.h" -#include "wpi/uv/Request.h" +#include + +#include "wpinet/uv/Request.h" namespace wpi::uv { @@ -225,4 +226,4 @@ inline void GetNameInfo6(const std::shared_ptr& loop, } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_GETNAMEINFO_H_ +#endif // WPINET_UV_GETNAMEINFO_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/Handle.h b/wpinet/src/main/native/include/wpinet/uv/Handle.h similarity index 97% rename from wpiutil/src/main/native/include/wpi/uv/Handle.h rename to wpinet/src/main/native/include/wpinet/uv/Handle.h index b61cd81a87..903d43cec4 100644 --- a/wpiutil/src/main/native/include/wpi/uv/Handle.h +++ b/wpinet/src/main/native/include/wpinet/uv/Handle.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_HANDLE_H_ -#define WPIUTIL_WPI_UV_HANDLE_H_ +#ifndef WPINET_UV_HANDLE_H_ +#define WPINET_UV_HANDLE_H_ #include @@ -13,10 +13,11 @@ #include #include -#include "wpi/Signal.h" -#include "wpi/uv/Buffer.h" -#include "wpi/uv/Error.h" -#include "wpi/uv/Loop.h" +#include + +#include "wpinet/uv/Buffer.h" +#include "wpinet/uv/Error.h" +#include "wpinet/uv/Loop.h" namespace wpi::uv { @@ -294,4 +295,4 @@ class HandleImpl : public Handle { } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_HANDLE_H_ +#endif // WPINET_UV_HANDLE_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/Idle.h b/wpinet/src/main/native/include/wpinet/uv/Idle.h similarity index 91% rename from wpiutil/src/main/native/include/wpi/uv/Idle.h rename to wpinet/src/main/native/include/wpinet/uv/Idle.h index 869d43d9a0..4ed6d07eb9 100644 --- a/wpiutil/src/main/native/include/wpi/uv/Idle.h +++ b/wpinet/src/main/native/include/wpinet/uv/Idle.h @@ -2,15 +2,16 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_IDLE_H_ -#define WPIUTIL_WPI_UV_IDLE_H_ +#ifndef WPINET_UV_IDLE_H_ +#define WPINET_UV_IDLE_H_ #include #include -#include "wpi/Signal.h" -#include "wpi/uv/Handle.h" +#include + +#include "wpinet/uv/Handle.h" namespace wpi::uv { @@ -71,4 +72,4 @@ class Idle final : public HandleImpl { } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_IDLE_H_ +#endif // WPINET_UV_IDLE_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/Loop.h b/wpinet/src/main/native/include/wpinet/uv/Loop.h similarity index 97% rename from wpiutil/src/main/native/include/wpi/uv/Loop.h rename to wpinet/src/main/native/include/wpinet/uv/Loop.h index 9693053789..129faf5316 100644 --- a/wpiutil/src/main/native/include/wpi/uv/Loop.h +++ b/wpinet/src/main/native/include/wpinet/uv/Loop.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_LOOP_H_ -#define WPIUTIL_WPI_UV_LOOP_H_ +#ifndef WPINET_UV_LOOP_H_ +#define WPINET_UV_LOOP_H_ #include @@ -14,9 +14,10 @@ #include #include -#include "wpi/Signal.h" -#include "wpi/function_ref.h" -#include "wpi/uv/Error.h" +#include +#include + +#include "wpinet/uv/Error.h" namespace wpi::uv { @@ -250,4 +251,4 @@ class Loop final : public std::enable_shared_from_this { } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_LOOP_H_ +#endif // WPINET_UV_LOOP_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/NetworkStream.h b/wpinet/src/main/native/include/wpinet/uv/NetworkStream.h similarity index 96% rename from wpiutil/src/main/native/include/wpi/uv/NetworkStream.h rename to wpinet/src/main/native/include/wpinet/uv/NetworkStream.h index faac9fe2f2..42b0a8ab83 100644 --- a/wpiutil/src/main/native/include/wpi/uv/NetworkStream.h +++ b/wpinet/src/main/native/include/wpinet/uv/NetworkStream.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_NETWORKSTREAM_H_ -#define WPIUTIL_WPI_UV_NETWORKSTREAM_H_ +#ifndef WPINET_UV_NETWORKSTREAM_H_ +#define WPINET_UV_NETWORKSTREAM_H_ #include @@ -11,8 +11,9 @@ #include #include -#include "wpi/Signal.h" -#include "wpi/uv/Stream.h" +#include + +#include "wpinet/uv/Stream.h" namespace wpi::uv { @@ -150,4 +151,4 @@ class NetworkStreamImpl : public NetworkStream { } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_NETWORKSTREAM_H_ +#endif // WPINET_UV_NETWORKSTREAM_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/Pipe.h b/wpinet/src/main/native/include/wpinet/uv/Pipe.h similarity index 97% rename from wpiutil/src/main/native/include/wpi/uv/Pipe.h rename to wpinet/src/main/native/include/wpinet/uv/Pipe.h index e223268f50..d7ab044242 100644 --- a/wpiutil/src/main/native/include/wpi/uv/Pipe.h +++ b/wpinet/src/main/native/include/wpinet/uv/Pipe.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_PIPE_H_ -#define WPIUTIL_WPI_UV_PIPE_H_ +#ifndef WPINET_UV_PIPE_H_ +#define WPINET_UV_PIPE_H_ #include @@ -12,7 +12,7 @@ #include #include -#include "wpi/uv/NetworkStream.h" +#include "wpinet/uv/NetworkStream.h" namespace wpi::uv { @@ -205,4 +205,4 @@ class PipeConnectReq : public ConnectReq { } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_PIPE_H_ +#endif // WPINET_UV_PIPE_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/Poll.h b/wpinet/src/main/native/include/wpinet/uv/Poll.h similarity index 95% rename from wpiutil/src/main/native/include/wpi/uv/Poll.h rename to wpinet/src/main/native/include/wpinet/uv/Poll.h index 6e1e26d626..1e638369bc 100644 --- a/wpiutil/src/main/native/include/wpi/uv/Poll.h +++ b/wpinet/src/main/native/include/wpinet/uv/Poll.h @@ -2,15 +2,16 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_POLL_H_ -#define WPIUTIL_WPI_UV_POLL_H_ +#ifndef WPINET_UV_POLL_H_ +#define WPINET_UV_POLL_H_ #include #include -#include "wpi/Signal.h" -#include "wpi/uv/Handle.h" +#include + +#include "wpinet/uv/Handle.h" namespace wpi::uv { @@ -118,4 +119,4 @@ class Poll final : public HandleImpl { } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_POLL_H_ +#endif // WPINET_UV_POLL_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/Prepare.h b/wpinet/src/main/native/include/wpinet/uv/Prepare.h similarity index 89% rename from wpiutil/src/main/native/include/wpi/uv/Prepare.h rename to wpinet/src/main/native/include/wpinet/uv/Prepare.h index 88ae2d9f20..e19dd30e74 100644 --- a/wpiutil/src/main/native/include/wpi/uv/Prepare.h +++ b/wpinet/src/main/native/include/wpinet/uv/Prepare.h @@ -2,15 +2,16 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_PREPARE_H_ -#define WPIUTIL_WPI_UV_PREPARE_H_ +#ifndef WPINET_UV_PREPARE_H_ +#define WPINET_UV_PREPARE_H_ #include #include -#include "wpi/Signal.h" -#include "wpi/uv/Handle.h" +#include + +#include "wpinet/uv/Handle.h" namespace wpi::uv { @@ -62,4 +63,4 @@ class Prepare final : public HandleImpl { } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_PREPARE_H_ +#endif // WPINET_UV_PREPARE_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/Process.h b/wpinet/src/main/native/include/wpinet/uv/Process.h similarity index 97% rename from wpiutil/src/main/native/include/wpi/uv/Process.h rename to wpinet/src/main/native/include/wpinet/uv/Process.h index fc2315eebd..153ee377fa 100644 --- a/wpiutil/src/main/native/include/wpi/uv/Process.h +++ b/wpinet/src/main/native/include/wpinet/uv/Process.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_PROCESS_H_ -#define WPIUTIL_WPI_UV_PROCESS_H_ +#ifndef WPINET_UV_PROCESS_H_ +#define WPINET_UV_PROCESS_H_ #include @@ -12,10 +12,11 @@ #include #include -#include "wpi/Signal.h" -#include "wpi/SmallVector.h" -#include "wpi/span.h" -#include "wpi/uv/Handle.h" +#include +#include +#include + +#include "wpinet/uv/Handle.h" namespace wpi::uv { @@ -307,4 +308,4 @@ class Process final : public HandleImpl { } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_PROCESS_H_ +#endif // WPINET_UV_PROCESS_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/Request.h b/wpinet/src/main/native/include/wpinet/uv/Request.h similarity index 96% rename from wpiutil/src/main/native/include/wpi/uv/Request.h rename to wpinet/src/main/native/include/wpinet/uv/Request.h index 3f6a19dc22..3fbec6f6d2 100644 --- a/wpiutil/src/main/native/include/wpi/uv/Request.h +++ b/wpinet/src/main/native/include/wpinet/uv/Request.h @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_REQUEST_H_ -#define WPIUTIL_WPI_UV_REQUEST_H_ +#ifndef WPINET_UV_REQUEST_H_ +#define WPINET_UV_REQUEST_H_ #include #include #include -#include "wpi/uv/Error.h" +#include "wpinet/uv/Error.h" namespace wpi::uv { @@ -163,4 +163,4 @@ class RequestImpl : public Request { } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_REQUEST_H_ +#endif // WPINET_UV_REQUEST_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/Signal.h b/wpinet/src/main/native/include/wpinet/uv/Signal.h similarity index 90% rename from wpiutil/src/main/native/include/wpi/uv/Signal.h rename to wpinet/src/main/native/include/wpinet/uv/Signal.h index 9abcad323b..12b6839376 100644 --- a/wpiutil/src/main/native/include/wpi/uv/Signal.h +++ b/wpinet/src/main/native/include/wpinet/uv/Signal.h @@ -2,15 +2,16 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_SIGNAL_H_ -#define WPIUTIL_WPI_UV_SIGNAL_H_ +#ifndef WPINET_UV_SIGNAL_H_ +#define WPINET_UV_SIGNAL_H_ #include #include -#include "wpi/Signal.h" -#include "wpi/uv/Handle.h" +#include + +#include "wpinet/uv/Handle.h" namespace wpi::uv { @@ -76,4 +77,4 @@ class Signal final : public HandleImpl { } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_SIGNAL_H_ +#endif // WPINET_UV_SIGNAL_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/Stream.h b/wpinet/src/main/native/include/wpinet/uv/Stream.h similarity index 97% rename from wpiutil/src/main/native/include/wpi/uv/Stream.h rename to wpinet/src/main/native/include/wpinet/uv/Stream.h index 0ade972d6b..d9dd6d5486 100644 --- a/wpiutil/src/main/native/include/wpi/uv/Stream.h +++ b/wpinet/src/main/native/include/wpinet/uv/Stream.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_STREAM_H_ -#define WPIUTIL_WPI_UV_STREAM_H_ +#ifndef WPINET_UV_STREAM_H_ +#define WPINET_UV_STREAM_H_ #include @@ -13,11 +13,12 @@ #include #include -#include "wpi/Signal.h" -#include "wpi/span.h" -#include "wpi/uv/Buffer.h" -#include "wpi/uv/Handle.h" -#include "wpi/uv/Request.h" +#include +#include + +#include "wpinet/uv/Buffer.h" +#include "wpinet/uv/Handle.h" +#include "wpinet/uv/Request.h" namespace wpi::uv { @@ -299,4 +300,4 @@ class StreamImpl : public Stream { } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_STREAM_H_ +#endif // WPINET_UV_STREAM_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/Tcp.h b/wpinet/src/main/native/include/wpinet/uv/Tcp.h similarity index 98% rename from wpiutil/src/main/native/include/wpi/uv/Tcp.h rename to wpinet/src/main/native/include/wpinet/uv/Tcp.h index c712f0b48f..97cb71cb7e 100644 --- a/wpiutil/src/main/native/include/wpi/uv/Tcp.h +++ b/wpinet/src/main/native/include/wpinet/uv/Tcp.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_TCP_H_ -#define WPIUTIL_WPI_UV_TCP_H_ +#ifndef WPINET_UV_TCP_H_ +#define WPINET_UV_TCP_H_ #include @@ -13,7 +13,7 @@ #include #include -#include "wpi/uv/NetworkStream.h" +#include "wpinet/uv/NetworkStream.h" namespace wpi::uv { @@ -360,4 +360,4 @@ class TcpConnectReq : public ConnectReq { } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_TCP_H_ +#endif // WPINET_UV_TCP_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/Timer.h b/wpinet/src/main/native/include/wpinet/uv/Timer.h similarity index 96% rename from wpiutil/src/main/native/include/wpi/uv/Timer.h rename to wpinet/src/main/native/include/wpinet/uv/Timer.h index 00363a57f9..51b5483ca4 100644 --- a/wpiutil/src/main/native/include/wpi/uv/Timer.h +++ b/wpinet/src/main/native/include/wpinet/uv/Timer.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_TIMER_H_ -#define WPIUTIL_WPI_UV_TIMER_H_ +#ifndef WPINET_UV_TIMER_H_ +#define WPINET_UV_TIMER_H_ #include @@ -12,8 +12,9 @@ #include #include -#include "wpi/Signal.h" -#include "wpi/uv/Handle.h" +#include + +#include "wpinet/uv/Handle.h" namespace wpi::uv { @@ -132,4 +133,4 @@ class Timer final : public HandleImpl { } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_TIMER_H_ +#endif // WPINET_UV_TIMER_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/Tty.h b/wpinet/src/main/native/include/wpinet/uv/Tty.h similarity index 94% rename from wpiutil/src/main/native/include/wpi/uv/Tty.h rename to wpinet/src/main/native/include/wpinet/uv/Tty.h index bb0a6dbe4b..2dd4f97822 100644 --- a/wpiutil/src/main/native/include/wpi/uv/Tty.h +++ b/wpinet/src/main/native/include/wpinet/uv/Tty.h @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_TTY_H_ -#define WPIUTIL_WPI_UV_TTY_H_ +#ifndef WPINET_UV_TTY_H_ +#define WPINET_UV_TTY_H_ #include #include #include -#include "wpi/uv/Stream.h" +#include "wpinet/uv/Stream.h" namespace wpi::uv { @@ -82,4 +82,4 @@ class Tty final : public StreamImpl { } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_TTY_H_ +#endif // WPINET_UV_TTY_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/Udp.h b/wpinet/src/main/native/include/wpinet/uv/Udp.h similarity index 98% rename from wpiutil/src/main/native/include/wpi/uv/Udp.h rename to wpinet/src/main/native/include/wpinet/uv/Udp.h index 71fab13c86..f3ba2ec077 100644 --- a/wpiutil/src/main/native/include/wpi/uv/Udp.h +++ b/wpinet/src/main/native/include/wpinet/uv/Udp.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_UDP_H_ -#define WPIUTIL_WPI_UV_UDP_H_ +#ifndef WPINET_UV_UDP_H_ +#define WPINET_UV_UDP_H_ #include @@ -12,10 +12,11 @@ #include #include -#include "wpi/Signal.h" -#include "wpi/span.h" -#include "wpi/uv/Handle.h" -#include "wpi/uv/Request.h" +#include +#include + +#include "wpinet/uv/Handle.h" +#include "wpinet/uv/Request.h" namespace wpi::uv { @@ -375,4 +376,4 @@ class Udp final : public HandleImpl { } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_UDP_H_ +#endif // WPINET_UV_UDP_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/Work.h b/wpinet/src/main/native/include/wpinet/uv/Work.h similarity index 94% rename from wpiutil/src/main/native/include/wpi/uv/Work.h rename to wpinet/src/main/native/include/wpinet/uv/Work.h index 5a3a5d2ecc..72293d0c35 100644 --- a/wpiutil/src/main/native/include/wpi/uv/Work.h +++ b/wpinet/src/main/native/include/wpinet/uv/Work.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_WORK_H_ -#define WPIUTIL_WPI_UV_WORK_H_ +#ifndef WPINET_UV_WORK_H_ +#define WPINET_UV_WORK_H_ #include @@ -11,8 +11,9 @@ #include #include -#include "wpi/Signal.h" -#include "wpi/uv/Request.h" +#include + +#include "wpinet/uv/Request.h" namespace wpi::uv { @@ -90,4 +91,4 @@ inline void QueueWork(const std::shared_ptr& loop, } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_WORK_H_ +#endif // WPINET_UV_WORK_H_ diff --git a/wpiutil/src/main/native/include/wpi/uv/util.h b/wpinet/src/main/native/include/wpinet/uv/util.h similarity index 97% rename from wpiutil/src/main/native/include/wpi/uv/util.h rename to wpinet/src/main/native/include/wpinet/uv/util.h index 01dec0b41a..03c29784cc 100644 --- a/wpiutil/src/main/native/include/wpi/uv/util.h +++ b/wpinet/src/main/native/include/wpinet/uv/util.h @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#ifndef WPIUTIL_WPI_UV_UTIL_H_ -#define WPIUTIL_WPI_UV_UTIL_H_ +#ifndef WPINET_UV_UTIL_H_ +#define WPINET_UV_UTIL_H_ #include @@ -144,4 +144,4 @@ int NameToAddr(std::string_view ip, in6_addr* addr); } // namespace wpi::uv -#endif // WPIUTIL_WPI_UV_UTIL_H_ +#endif // WPINET_UV_UTIL_H_ diff --git a/wpiutil/src/main/native/linux/AvahiClient.cpp b/wpinet/src/main/native/linux/AvahiClient.cpp similarity index 100% rename from wpiutil/src/main/native/linux/AvahiClient.cpp rename to wpinet/src/main/native/linux/AvahiClient.cpp diff --git a/wpiutil/src/main/native/linux/AvahiClient.h b/wpinet/src/main/native/linux/AvahiClient.h similarity index 100% rename from wpiutil/src/main/native/linux/AvahiClient.h rename to wpinet/src/main/native/linux/AvahiClient.h diff --git a/wpiutil/src/main/native/linux/MulticastServiceAnnouncer.cpp b/wpinet/src/main/native/linux/MulticastServiceAnnouncer.cpp similarity index 98% rename from wpiutil/src/main/native/linux/MulticastServiceAnnouncer.cpp rename to wpinet/src/main/native/linux/MulticastServiceAnnouncer.cpp index 1a7af39436..29e8fcf90d 100644 --- a/wpiutil/src/main/native/linux/MulticastServiceAnnouncer.cpp +++ b/wpinet/src/main/native/linux/MulticastServiceAnnouncer.cpp @@ -2,13 +2,14 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/MulticastServiceAnnouncer.h" +#include "wpinet/MulticastServiceAnnouncer.h" #include +#include +#include + #include "AvahiClient.h" -#include "fmt/format.h" -#include "wpi/mutex.h" using namespace wpi; diff --git a/wpiutil/src/main/native/linux/MulticastServiceResolver.cpp b/wpinet/src/main/native/linux/MulticastServiceResolver.cpp similarity index 97% rename from wpiutil/src/main/native/linux/MulticastServiceResolver.cpp rename to wpinet/src/main/native/linux/MulticastServiceResolver.cpp index 6585443e4b..4331ea46da 100644 --- a/wpiutil/src/main/native/linux/MulticastServiceResolver.cpp +++ b/wpinet/src/main/native/linux/MulticastServiceResolver.cpp @@ -2,12 +2,13 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/MulticastServiceResolver.h" +#include "wpinet/MulticastServiceResolver.h" + +#include +#include +#include #include "AvahiClient.h" -#include "wpi/SmallString.h" -#include "wpi/StringExtras.h" -#include "wpi/mutex.h" using namespace wpi; diff --git a/wpiutil/src/main/native/macOS/MulticastServiceAnnouncer.cpp b/wpinet/src/main/native/macOS/MulticastServiceAnnouncer.cpp similarity index 98% rename from wpiutil/src/main/native/macOS/MulticastServiceAnnouncer.cpp rename to wpinet/src/main/native/macOS/MulticastServiceAnnouncer.cpp index ad2ff48473..a87da88d4c 100644 --- a/wpiutil/src/main/native/macOS/MulticastServiceAnnouncer.cpp +++ b/wpinet/src/main/native/macOS/MulticastServiceAnnouncer.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/MulticastServiceAnnouncer.h" +#include "wpinet/MulticastServiceAnnouncer.h" #include diff --git a/wpiutil/src/main/native/macOS/MulticastServiceResolver.cpp b/wpinet/src/main/native/macOS/MulticastServiceResolver.cpp similarity index 98% rename from wpiutil/src/main/native/macOS/MulticastServiceResolver.cpp rename to wpinet/src/main/native/macOS/MulticastServiceResolver.cpp index 4af8cadf91..135a4a3de1 100644 --- a/wpiutil/src/main/native/macOS/MulticastServiceResolver.cpp +++ b/wpinet/src/main/native/macOS/MulticastServiceResolver.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/MulticastServiceResolver.h" +#include "wpinet/MulticastServiceResolver.h" #include #include @@ -11,9 +11,10 @@ #include #include +#include + #include "ResolverThread.h" #include "dns_sd.h" -#include "wpi/SmallVector.h" using namespace wpi; diff --git a/wpiutil/src/main/native/macOS/ResolverThread.cpp b/wpinet/src/main/native/macOS/ResolverThread.cpp similarity index 99% rename from wpiutil/src/main/native/macOS/ResolverThread.cpp rename to wpinet/src/main/native/macOS/ResolverThread.cpp index b91d6b69fc..07527d7a9a 100644 --- a/wpiutil/src/main/native/macOS/ResolverThread.cpp +++ b/wpinet/src/main/native/macOS/ResolverThread.cpp @@ -4,7 +4,7 @@ #include "ResolverThread.h" -#include "wpi/mutex.h" +#include using namespace wpi; diff --git a/wpiutil/src/main/native/macOS/ResolverThread.h b/wpinet/src/main/native/macOS/ResolverThread.h similarity index 95% rename from wpiutil/src/main/native/macOS/ResolverThread.h rename to wpinet/src/main/native/macOS/ResolverThread.h index 0162de5a67..3c4e3d3a0d 100644 --- a/wpiutil/src/main/native/macOS/ResolverThread.h +++ b/wpinet/src/main/native/macOS/ResolverThread.h @@ -13,9 +13,10 @@ #include #include +#include +#include + #include "dns_sd.h" -#include "wpi/Synchronization.h" -#include "wpi/mutex.h" namespace wpi { class ResolverThread { diff --git a/wpiutil/src/main/native/resources/bootstrap-4.1.min.js.gz b/wpinet/src/main/native/resources/bootstrap-4.1.min.js.gz similarity index 100% rename from wpiutil/src/main/native/resources/bootstrap-4.1.min.js.gz rename to wpinet/src/main/native/resources/bootstrap-4.1.min.js.gz diff --git a/wpiutil/src/main/native/resources/coreui-2.1.min.css.gz b/wpinet/src/main/native/resources/coreui-2.1.min.css.gz similarity index 100% rename from wpiutil/src/main/native/resources/coreui-2.1.min.css.gz rename to wpinet/src/main/native/resources/coreui-2.1.min.css.gz diff --git a/wpiutil/src/main/native/resources/coreui-2.1.min.js.gz b/wpinet/src/main/native/resources/coreui-2.1.min.js.gz similarity index 100% rename from wpiutil/src/main/native/resources/coreui-2.1.min.js.gz rename to wpinet/src/main/native/resources/coreui-2.1.min.js.gz diff --git a/wpiutil/src/main/native/resources/feather-4.8.min.js.gz b/wpinet/src/main/native/resources/feather-4.8.min.js.gz similarity index 100% rename from wpiutil/src/main/native/resources/feather-4.8.min.js.gz rename to wpinet/src/main/native/resources/feather-4.8.min.js.gz diff --git a/wpiutil/src/main/native/resources/jquery-3.3.slim.min.js.gz b/wpinet/src/main/native/resources/jquery-3.3.slim.min.js.gz similarity index 100% rename from wpiutil/src/main/native/resources/jquery-3.3.slim.min.js.gz rename to wpinet/src/main/native/resources/jquery-3.3.slim.min.js.gz diff --git a/wpiutil/src/main/native/resources/popper-1.14.min.js.gz b/wpinet/src/main/native/resources/popper-1.14.min.js.gz similarity index 100% rename from wpiutil/src/main/native/resources/popper-1.14.min.js.gz rename to wpinet/src/main/native/resources/popper-1.14.min.js.gz diff --git a/wpiutil/src/main/native/libuv/include/uv.h b/wpinet/src/main/native/thirdparty/libuv/include/uv.h similarity index 100% rename from wpiutil/src/main/native/libuv/include/uv.h rename to wpinet/src/main/native/thirdparty/libuv/include/uv.h diff --git a/wpiutil/src/main/native/libuv/include/uv/android-ifaddrs.h b/wpinet/src/main/native/thirdparty/libuv/include/uv/android-ifaddrs.h similarity index 100% rename from wpiutil/src/main/native/libuv/include/uv/android-ifaddrs.h rename to wpinet/src/main/native/thirdparty/libuv/include/uv/android-ifaddrs.h diff --git a/wpiutil/src/main/native/libuv/include/uv/bsd.h b/wpinet/src/main/native/thirdparty/libuv/include/uv/bsd.h similarity index 100% rename from wpiutil/src/main/native/libuv/include/uv/bsd.h rename to wpinet/src/main/native/thirdparty/libuv/include/uv/bsd.h diff --git a/wpiutil/src/main/native/libuv/include/uv/darwin.h b/wpinet/src/main/native/thirdparty/libuv/include/uv/darwin.h similarity index 100% rename from wpiutil/src/main/native/libuv/include/uv/darwin.h rename to wpinet/src/main/native/thirdparty/libuv/include/uv/darwin.h diff --git a/wpiutil/src/main/native/libuv/include/uv/errno.h b/wpinet/src/main/native/thirdparty/libuv/include/uv/errno.h similarity index 100% rename from wpiutil/src/main/native/libuv/include/uv/errno.h rename to wpinet/src/main/native/thirdparty/libuv/include/uv/errno.h diff --git a/wpiutil/src/main/native/libuv/include/uv/linux.h b/wpinet/src/main/native/thirdparty/libuv/include/uv/linux.h similarity index 100% rename from wpiutil/src/main/native/libuv/include/uv/linux.h rename to wpinet/src/main/native/thirdparty/libuv/include/uv/linux.h diff --git a/wpiutil/src/main/native/libuv/include/uv/posix.h b/wpinet/src/main/native/thirdparty/libuv/include/uv/posix.h similarity index 100% rename from wpiutil/src/main/native/libuv/include/uv/posix.h rename to wpinet/src/main/native/thirdparty/libuv/include/uv/posix.h diff --git a/wpiutil/src/main/native/libuv/include/uv/threadpool.h b/wpinet/src/main/native/thirdparty/libuv/include/uv/threadpool.h similarity index 100% rename from wpiutil/src/main/native/libuv/include/uv/threadpool.h rename to wpinet/src/main/native/thirdparty/libuv/include/uv/threadpool.h diff --git a/wpiutil/src/main/native/libuv/include/uv/tree.h b/wpinet/src/main/native/thirdparty/libuv/include/uv/tree.h similarity index 100% rename from wpiutil/src/main/native/libuv/include/uv/tree.h rename to wpinet/src/main/native/thirdparty/libuv/include/uv/tree.h diff --git a/wpiutil/src/main/native/libuv/include/uv/unix.h b/wpinet/src/main/native/thirdparty/libuv/include/uv/unix.h similarity index 100% rename from wpiutil/src/main/native/libuv/include/uv/unix.h rename to wpinet/src/main/native/thirdparty/libuv/include/uv/unix.h diff --git a/wpiutil/src/main/native/libuv/include/uv/version.h b/wpinet/src/main/native/thirdparty/libuv/include/uv/version.h similarity index 100% rename from wpiutil/src/main/native/libuv/include/uv/version.h rename to wpinet/src/main/native/thirdparty/libuv/include/uv/version.h diff --git a/wpiutil/src/main/native/libuv/include/uv/win.h b/wpinet/src/main/native/thirdparty/libuv/include/uv/win.h similarity index 100% rename from wpiutil/src/main/native/libuv/include/uv/win.h rename to wpinet/src/main/native/thirdparty/libuv/include/uv/win.h diff --git a/wpiutil/src/main/native/libuv/src/fs-poll.cpp b/wpinet/src/main/native/thirdparty/libuv/src/fs-poll.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/fs-poll.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/fs-poll.cpp diff --git a/wpiutil/src/main/native/libuv/src/heap-inl.h b/wpinet/src/main/native/thirdparty/libuv/src/heap-inl.h similarity index 100% rename from wpiutil/src/main/native/libuv/src/heap-inl.h rename to wpinet/src/main/native/thirdparty/libuv/src/heap-inl.h diff --git a/wpiutil/src/main/native/libuv/src/idna.cpp b/wpinet/src/main/native/thirdparty/libuv/src/idna.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/idna.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/idna.cpp diff --git a/wpiutil/src/main/native/libuv/src/idna.h b/wpinet/src/main/native/thirdparty/libuv/src/idna.h similarity index 100% rename from wpiutil/src/main/native/libuv/src/idna.h rename to wpinet/src/main/native/thirdparty/libuv/src/idna.h diff --git a/wpiutil/src/main/native/libuv/src/inet.cpp b/wpinet/src/main/native/thirdparty/libuv/src/inet.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/inet.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/inet.cpp diff --git a/wpiutil/src/main/native/libuv/src/queue.h b/wpinet/src/main/native/thirdparty/libuv/src/queue.h similarity index 100% rename from wpiutil/src/main/native/libuv/src/queue.h rename to wpinet/src/main/native/thirdparty/libuv/src/queue.h diff --git a/wpiutil/src/main/native/libuv/src/strscpy.cpp b/wpinet/src/main/native/thirdparty/libuv/src/strscpy.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/strscpy.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/strscpy.cpp diff --git a/wpiutil/src/main/native/libuv/src/strscpy.h b/wpinet/src/main/native/thirdparty/libuv/src/strscpy.h similarity index 100% rename from wpiutil/src/main/native/libuv/src/strscpy.h rename to wpinet/src/main/native/thirdparty/libuv/src/strscpy.h diff --git a/wpiutil/src/main/native/libuv/src/threadpool.cpp b/wpinet/src/main/native/thirdparty/libuv/src/threadpool.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/threadpool.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/threadpool.cpp diff --git a/wpiutil/src/main/native/libuv/src/timer.cpp b/wpinet/src/main/native/thirdparty/libuv/src/timer.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/timer.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/timer.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/android-ifaddrs.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/android-ifaddrs.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/android-ifaddrs.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/android-ifaddrs.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/async.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/async.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/async.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/async.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/atomic-ops.h b/wpinet/src/main/native/thirdparty/libuv/src/unix/atomic-ops.h similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/atomic-ops.h rename to wpinet/src/main/native/thirdparty/libuv/src/unix/atomic-ops.h diff --git a/wpiutil/src/main/native/libuv/src/unix/bsd-ifaddrs.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/bsd-ifaddrs.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/bsd-ifaddrs.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/bsd-ifaddrs.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/core.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/core.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/core.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/core.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/cygwin.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/cygwin.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/cygwin.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/cygwin.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/darwin-proctitle.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/darwin-proctitle.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/darwin-proctitle.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/darwin-proctitle.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/darwin.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/darwin.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/darwin.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/darwin.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/dl.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/dl.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/dl.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/dl.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/freebsd.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/freebsd.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/freebsd.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/freebsd.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/fs.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/fs.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/fs.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/fs.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/fsevents.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/fsevents.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/fsevents.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/fsevents.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/getaddrinfo.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/getaddrinfo.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/getaddrinfo.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/getaddrinfo.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/getnameinfo.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/getnameinfo.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/getnameinfo.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/getnameinfo.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/ibmi.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/ibmi.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/ibmi.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/ibmi.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/internal.h b/wpinet/src/main/native/thirdparty/libuv/src/unix/internal.h similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/internal.h rename to wpinet/src/main/native/thirdparty/libuv/src/unix/internal.h diff --git a/wpiutil/src/main/native/libuv/src/unix/kqueue.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/kqueue.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/kqueue.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/kqueue.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/linux-core.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/linux-core.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/linux-core.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/linux-core.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/linux-inotify.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/linux-inotify.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/linux-inotify.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/linux-inotify.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/linux-syscalls.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/linux-syscalls.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/linux-syscalls.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/linux-syscalls.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/linux-syscalls.h b/wpinet/src/main/native/thirdparty/libuv/src/unix/linux-syscalls.h similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/linux-syscalls.h rename to wpinet/src/main/native/thirdparty/libuv/src/unix/linux-syscalls.h diff --git a/wpiutil/src/main/native/libuv/src/unix/loop-watcher.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/loop-watcher.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/loop-watcher.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/loop-watcher.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/loop.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/loop.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/loop.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/loop.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/netbsd.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/netbsd.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/netbsd.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/netbsd.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/no-fsevents.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/no-fsevents.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/no-fsevents.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/no-fsevents.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/no-proctitle.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/no-proctitle.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/no-proctitle.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/no-proctitle.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/openbsd.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/openbsd.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/openbsd.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/openbsd.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/pipe.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/pipe.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/pipe.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/pipe.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/poll.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/poll.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/poll.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/poll.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/posix-hrtime.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/posix-hrtime.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/posix-hrtime.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/posix-hrtime.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/posix-poll.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/posix-poll.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/posix-poll.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/posix-poll.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/process.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/process.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/process.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/process.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/procfs-exepath.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/procfs-exepath.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/procfs-exepath.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/procfs-exepath.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/proctitle.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/proctitle.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/proctitle.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/proctitle.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/pthread-fixes.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/pthread-fixes.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/pthread-fixes.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/pthread-fixes.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/signal.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/signal.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/signal.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/signal.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/spinlock.h b/wpinet/src/main/native/thirdparty/libuv/src/unix/spinlock.h similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/spinlock.h rename to wpinet/src/main/native/thirdparty/libuv/src/unix/spinlock.h diff --git a/wpiutil/src/main/native/libuv/src/unix/stream.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/stream.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/stream.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/stream.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/sysinfo-loadavg.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/sysinfo-loadavg.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/sysinfo-loadavg.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/sysinfo-loadavg.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/tcp.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/tcp.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/tcp.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/tcp.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/thread.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/thread.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/thread.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/thread.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/tty.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/tty.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/tty.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/tty.cpp diff --git a/wpiutil/src/main/native/libuv/src/unix/udp.cpp b/wpinet/src/main/native/thirdparty/libuv/src/unix/udp.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/unix/udp.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/unix/udp.cpp diff --git a/wpiutil/src/main/native/libuv/src/uv-common.cpp b/wpinet/src/main/native/thirdparty/libuv/src/uv-common.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/uv-common.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/uv-common.cpp diff --git a/wpiutil/src/main/native/libuv/src/uv-common.h b/wpinet/src/main/native/thirdparty/libuv/src/uv-common.h similarity index 100% rename from wpiutil/src/main/native/libuv/src/uv-common.h rename to wpinet/src/main/native/thirdparty/libuv/src/uv-common.h diff --git a/wpiutil/src/main/native/libuv/src/uv-data-getter-setters.cpp b/wpinet/src/main/native/thirdparty/libuv/src/uv-data-getter-setters.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/uv-data-getter-setters.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/uv-data-getter-setters.cpp diff --git a/wpiutil/src/main/native/libuv/src/version.cpp b/wpinet/src/main/native/thirdparty/libuv/src/version.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/version.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/version.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/async.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/async.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/async.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/async.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/atomicops-inl.h b/wpinet/src/main/native/thirdparty/libuv/src/win/atomicops-inl.h similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/atomicops-inl.h rename to wpinet/src/main/native/thirdparty/libuv/src/win/atomicops-inl.h diff --git a/wpiutil/src/main/native/libuv/src/win/core.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/core.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/core.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/core.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/detect-wakeup.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/detect-wakeup.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/detect-wakeup.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/detect-wakeup.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/dl.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/dl.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/dl.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/dl.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/error.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/error.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/error.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/error.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/fs-event.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/fs-event.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/fs-event.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/fs-event.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/fs.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/fs.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/fs.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/fs.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/getaddrinfo.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/getaddrinfo.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/getaddrinfo.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/getaddrinfo.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/getnameinfo.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/getnameinfo.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/getnameinfo.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/getnameinfo.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/handle-inl.h b/wpinet/src/main/native/thirdparty/libuv/src/win/handle-inl.h similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/handle-inl.h rename to wpinet/src/main/native/thirdparty/libuv/src/win/handle-inl.h diff --git a/wpiutil/src/main/native/libuv/src/win/handle.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/handle.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/handle.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/handle.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/internal.h b/wpinet/src/main/native/thirdparty/libuv/src/win/internal.h similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/internal.h rename to wpinet/src/main/native/thirdparty/libuv/src/win/internal.h diff --git a/wpiutil/src/main/native/libuv/src/win/loop-watcher.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/loop-watcher.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/loop-watcher.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/loop-watcher.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/pipe.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/pipe.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/pipe.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/pipe.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/poll.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/poll.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/poll.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/poll.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/process-stdio.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/process-stdio.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/process-stdio.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/process-stdio.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/process.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/process.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/process.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/process.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/req-inl.h b/wpinet/src/main/native/thirdparty/libuv/src/win/req-inl.h similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/req-inl.h rename to wpinet/src/main/native/thirdparty/libuv/src/win/req-inl.h diff --git a/wpiutil/src/main/native/libuv/src/win/signal.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/signal.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/signal.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/signal.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/snprintf.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/snprintf.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/snprintf.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/snprintf.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/stream-inl.h b/wpinet/src/main/native/thirdparty/libuv/src/win/stream-inl.h similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/stream-inl.h rename to wpinet/src/main/native/thirdparty/libuv/src/win/stream-inl.h diff --git a/wpiutil/src/main/native/libuv/src/win/stream.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/stream.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/stream.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/stream.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/tcp.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/tcp.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/tcp.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/tcp.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/thread.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/thread.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/thread.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/thread.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/tty.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/tty.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/tty.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/tty.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/udp.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/udp.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/udp.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/udp.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/util.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/util.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/util.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/util.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/winapi.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/winapi.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/winapi.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/winapi.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/winapi.h b/wpinet/src/main/native/thirdparty/libuv/src/win/winapi.h similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/winapi.h rename to wpinet/src/main/native/thirdparty/libuv/src/win/winapi.h diff --git a/wpiutil/src/main/native/libuv/src/win/winsock.cpp b/wpinet/src/main/native/thirdparty/libuv/src/win/winsock.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/winsock.cpp rename to wpinet/src/main/native/thirdparty/libuv/src/win/winsock.cpp diff --git a/wpiutil/src/main/native/libuv/src/win/winsock.h b/wpinet/src/main/native/thirdparty/libuv/src/win/winsock.h similarity index 100% rename from wpiutil/src/main/native/libuv/src/win/winsock.h rename to wpinet/src/main/native/thirdparty/libuv/src/win/winsock.h diff --git a/wpiutil/src/main/native/windows/DynamicDns.cpp b/wpinet/src/main/native/windows/DynamicDns.cpp similarity index 100% rename from wpiutil/src/main/native/windows/DynamicDns.cpp rename to wpinet/src/main/native/windows/DynamicDns.cpp diff --git a/wpiutil/src/main/native/windows/DynamicDns.h b/wpinet/src/main/native/windows/DynamicDns.h similarity index 100% rename from wpiutil/src/main/native/windows/DynamicDns.h rename to wpinet/src/main/native/windows/DynamicDns.h diff --git a/wpiutil/src/main/native/windows/MulticastServiceAnnouncer.cpp b/wpinet/src/main/native/windows/MulticastServiceAnnouncer.cpp similarity index 97% rename from wpiutil/src/main/native/windows/MulticastServiceAnnouncer.cpp rename to wpinet/src/main/native/windows/MulticastServiceAnnouncer.cpp index 2327b8b828..5290b0f0d7 100644 --- a/wpiutil/src/main/native/windows/MulticastServiceAnnouncer.cpp +++ b/wpinet/src/main/native/windows/MulticastServiceAnnouncer.cpp @@ -6,17 +6,18 @@ #define UNICODE #endif -#include "wpi/MulticastServiceAnnouncer.h" +#include "wpinet/MulticastServiceAnnouncer.h" #include #include +#include +#include +#include +#include + #include "DynamicDns.h" -#include "wpi/ConvertUTF.h" -#include "wpi/SmallString.h" -#include "wpi/SmallVector.h" -#include "wpi/StringExtras.h" -#include "wpi/hostname.h" +#include "wpinet/hostname.h" using namespace wpi; diff --git a/wpiutil/src/main/native/windows/MulticastServiceResolver.cpp b/wpinet/src/main/native/windows/MulticastServiceResolver.cpp similarity index 97% rename from wpiutil/src/main/native/windows/MulticastServiceResolver.cpp rename to wpinet/src/main/native/windows/MulticastServiceResolver.cpp index 115b43fd6e..8bc7dbbeb5 100644 --- a/wpiutil/src/main/native/windows/MulticastServiceResolver.cpp +++ b/wpinet/src/main/native/windows/MulticastServiceResolver.cpp @@ -6,15 +6,16 @@ #define UNICODE #endif -#include "wpi/MulticastServiceResolver.h" +#include "wpinet/MulticastServiceResolver.h" #include +#include +#include +#include +#include + #include "DynamicDns.h" -#include "wpi/ConvertUTF.h" -#include "wpi/SmallString.h" -#include "wpi/SmallVector.h" -#include "wpi/StringExtras.h" #pragma comment(lib, "dnsapi") diff --git a/wpiutil/src/netconsoleServer/native/cpp/main.cpp b/wpinet/src/netconsoleServer/native/cpp/main.cpp similarity index 95% rename from wpiutil/src/netconsoleServer/native/cpp/main.cpp rename to wpinet/src/netconsoleServer/native/cpp/main.cpp index c43a670338..c30e8e5e72 100644 --- a/wpiutil/src/netconsoleServer/native/cpp/main.cpp +++ b/wpinet/src/netconsoleServer/native/cpp/main.cpp @@ -10,20 +10,21 @@ #include -#include "fmt/format.h" -#include "wpi/MathExtras.h" -#include "wpi/SmallVector.h" -#include "wpi/StringExtras.h" -#include "wpi/raw_uv_ostream.h" -#include "wpi/timestamp.h" -#include "wpi/uv/Loop.h" -#include "wpi/uv/Pipe.h" -#include "wpi/uv/Process.h" -#include "wpi/uv/Signal.h" -#include "wpi/uv/Tcp.h" -#include "wpi/uv/Tty.h" -#include "wpi/uv/Udp.h" -#include "wpi/uv/util.h" +#include +#include +#include +#include +#include + +#include "wpinet/raw_uv_ostream.h" +#include "wpinet/uv/Loop.h" +#include "wpinet/uv/Pipe.h" +#include "wpinet/uv/Process.h" +#include "wpinet/uv/Signal.h" +#include "wpinet/uv/Tcp.h" +#include "wpinet/uv/Tty.h" +#include "wpinet/uv/Udp.h" +#include "wpinet/uv/util.h" namespace uv = wpi::uv; diff --git a/wpiutil/src/netconsoleTee/native/cpp/main.cpp b/wpinet/src/netconsoleTee/native/cpp/main.cpp similarity index 95% rename from wpiutil/src/netconsoleTee/native/cpp/main.cpp rename to wpinet/src/netconsoleTee/native/cpp/main.cpp index 8abb458a03..371f27026b 100644 --- a/wpiutil/src/netconsoleTee/native/cpp/main.cpp +++ b/wpinet/src/netconsoleTee/native/cpp/main.cpp @@ -4,17 +4,18 @@ #include -#include "fmt/format.h" -#include "wpi/MathExtras.h" -#include "wpi/SmallVector.h" -#include "wpi/StringExtras.h" -#include "wpi/raw_uv_ostream.h" -#include "wpi/timestamp.h" -#include "wpi/uv/Loop.h" -#include "wpi/uv/Tcp.h" -#include "wpi/uv/Tty.h" -#include "wpi/uv/Udp.h" -#include "wpi/uv/util.h" +#include +#include +#include +#include +#include + +#include "wpinet/raw_uv_ostream.h" +#include "wpinet/uv/Loop.h" +#include "wpinet/uv/Tcp.h" +#include "wpinet/uv/Tty.h" +#include "wpinet/uv/Udp.h" +#include "wpinet/uv/util.h" namespace uv = wpi::uv; diff --git a/wpinet/src/test/java/edu/wpi/first/net/WPINetJNITest.java b/wpinet/src/test/java/edu/wpi/first/net/WPINetJNITest.java new file mode 100644 index 0000000000..1199e7c03b --- /dev/null +++ b/wpinet/src/test/java/edu/wpi/first/net/WPINetJNITest.java @@ -0,0 +1,7 @@ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. + +package edu.wpi.first.net; + +public class WPINetJNITest {} diff --git a/wpiutil/src/test/native/cpp/HttpParserTest.cpp b/wpinet/src/test/native/cpp/HttpParserTest.cpp similarity index 98% rename from wpiutil/src/test/native/cpp/HttpParserTest.cpp rename to wpinet/src/test/native/cpp/HttpParserTest.cpp index 281abd07ce..a9d927ad41 100644 --- a/wpiutil/src/test/native/cpp/HttpParserTest.cpp +++ b/wpinet/src/test/native/cpp/HttpParserTest.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/HttpParser.h" // NOLINT(build/include_order) +#include "wpinet/HttpParser.h" // NOLINT(build/include_order) #include "gtest/gtest.h" diff --git a/wpiutil/src/test/native/cpp/HttpUtilTest.cpp b/wpinet/src/test/native/cpp/HttpUtilTest.cpp similarity index 98% rename from wpiutil/src/test/native/cpp/HttpUtilTest.cpp rename to wpinet/src/test/native/cpp/HttpUtilTest.cpp index 524086a2ef..4417b7c1de 100644 --- a/wpiutil/src/test/native/cpp/HttpUtilTest.cpp +++ b/wpinet/src/test/native/cpp/HttpUtilTest.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/HttpUtil.h" // NOLINT(build/include_order) +#include "wpinet/HttpUtil.h" // NOLINT(build/include_order) #include "gtest/gtest.h" diff --git a/wpiutil/src/test/native/cpp/HttpWebSocketServerConnectionTest.cpp b/wpinet/src/test/native/cpp/HttpWebSocketServerConnectionTest.cpp similarity index 90% rename from wpiutil/src/test/native/cpp/HttpWebSocketServerConnectionTest.cpp rename to wpinet/src/test/native/cpp/HttpWebSocketServerConnectionTest.cpp index 18a21be670..3eabab8dc0 100644 --- a/wpiutil/src/test/native/cpp/HttpWebSocketServerConnectionTest.cpp +++ b/wpinet/src/test/native/cpp/HttpWebSocketServerConnectionTest.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/HttpWebSocketServerConnection.h" // NOLINT(build/include_order) +#include "wpinet/HttpWebSocketServerConnection.h" // NOLINT(build/include_order) #include diff --git a/wpiutil/src/test/native/cpp/WebSocketClientTest.cpp b/wpinet/src/test/native/cpp/WebSocketClientTest.cpp similarity index 97% rename from wpiutil/src/test/native/cpp/WebSocketClientTest.cpp rename to wpinet/src/test/native/cpp/WebSocketClientTest.cpp index 9d85e6676a..a603d9c05a 100644 --- a/wpiutil/src/test/native/cpp/WebSocketClientTest.cpp +++ b/wpinet/src/test/native/cpp/WebSocketClientTest.cpp @@ -2,15 +2,16 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/WebSocket.h" // NOLINT(build/include_order) +#include "wpinet/WebSocket.h" // NOLINT(build/include_order) + +#include +#include +#include +#include #include "WebSocketTest.h" -#include "wpi/Base64.h" -#include "wpi/HttpParser.h" -#include "wpi/SmallString.h" -#include "wpi/StringExtras.h" -#include "wpi/raw_uv_ostream.h" -#include "wpi/sha1.h" +#include "wpinet/HttpParser.h" +#include "wpinet/raw_uv_ostream.h" namespace wpi { diff --git a/wpiutil/src/test/native/cpp/WebSocketIntegrationTest.cpp b/wpinet/src/test/native/cpp/WebSocketIntegrationTest.cpp similarity index 96% rename from wpiutil/src/test/native/cpp/WebSocketIntegrationTest.cpp rename to wpinet/src/test/native/cpp/WebSocketIntegrationTest.cpp index 3de75d995a..5f6c8a54c9 100644 --- a/wpiutil/src/test/native/cpp/WebSocketIntegrationTest.cpp +++ b/wpinet/src/test/native/cpp/WebSocketIntegrationTest.cpp @@ -2,11 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/WebSocketServer.h" // NOLINT(build/include_order) +#include "wpinet/WebSocketServer.h" // NOLINT(build/include_order) + +#include #include "WebSocketTest.h" -#include "wpi/HttpParser.h" -#include "wpi/SmallString.h" +#include "wpinet/HttpParser.h" namespace wpi { diff --git a/wpiutil/src/test/native/cpp/WebSocketServerTest.cpp b/wpinet/src/test/native/cpp/WebSocketServerTest.cpp similarity index 99% rename from wpiutil/src/test/native/cpp/WebSocketServerTest.cpp rename to wpinet/src/test/native/cpp/WebSocketServerTest.cpp index 83561bf1ab..18dd50bef6 100644 --- a/wpiutil/src/test/native/cpp/WebSocketServerTest.cpp +++ b/wpinet/src/test/native/cpp/WebSocketServerTest.cpp @@ -2,14 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/WebSocket.h" // NOLINT(build/include_order) +#include "wpinet/WebSocket.h" // NOLINT(build/include_order) + +#include +#include +#include #include "WebSocketTest.h" -#include "wpi/Base64.h" -#include "wpi/HttpParser.h" -#include "wpi/SmallString.h" -#include "wpi/raw_uv_ostream.h" -#include "wpi/sha1.h" +#include "wpinet/HttpParser.h" +#include "wpinet/raw_uv_ostream.h" namespace wpi { diff --git a/wpiutil/src/test/native/cpp/WebSocketTest.cpp b/wpinet/src/test/native/cpp/WebSocketTest.cpp similarity index 98% rename from wpiutil/src/test/native/cpp/WebSocketTest.cpp rename to wpinet/src/test/native/cpp/WebSocketTest.cpp index b5d5e4e929..08518951db 100644 --- a/wpiutil/src/test/native/cpp/WebSocketTest.cpp +++ b/wpinet/src/test/native/cpp/WebSocketTest.cpp @@ -2,12 +2,13 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/WebSocket.h" // NOLINT(build/include_order) +#include "wpinet/WebSocket.h" // NOLINT(build/include_order) #include "WebSocketTest.h" -#include "wpi/HttpParser.h" -#include "wpi/StringExtras.h" +#include + +#include "wpinet/HttpParser.h" namespace wpi { diff --git a/wpiutil/src/test/native/cpp/WebSocketTest.h b/wpinet/src/test/native/cpp/WebSocketTest.h similarity index 94% rename from wpiutil/src/test/native/cpp/WebSocketTest.h rename to wpinet/src/test/native/cpp/WebSocketTest.h index fda4473d69..0e42c67c44 100644 --- a/wpiutil/src/test/native/cpp/WebSocketTest.h +++ b/wpinet/src/test/native/cpp/WebSocketTest.h @@ -8,11 +8,12 @@ #include #include +#include + #include "gtest/gtest.h" -#include "wpi/span.h" -#include "wpi/uv/Loop.h" -#include "wpi/uv/Pipe.h" -#include "wpi/uv/Timer.h" +#include "wpinet/uv/Loop.h" +#include "wpinet/uv/Pipe.h" +#include "wpinet/uv/Timer.h" namespace wpi { diff --git a/wpiutil/src/test/native/cpp/WorkerThreadTest.cpp b/wpinet/src/test/native/cpp/WorkerThreadTest.cpp similarity index 94% rename from wpiutil/src/test/native/cpp/WorkerThreadTest.cpp rename to wpinet/src/test/native/cpp/WorkerThreadTest.cpp index 9bc9a17dae..6b594be8a7 100644 --- a/wpiutil/src/test/native/cpp/WorkerThreadTest.cpp +++ b/wpinet/src/test/native/cpp/WorkerThreadTest.cpp @@ -2,13 +2,13 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/WorkerThread.h" // NOLINT(build/include_order) +#include "wpinet/WorkerThread.h" // NOLINT(build/include_order) #include "gtest/gtest.h" // NOLINT(build/include_order) #include -#include "wpi/uv/Loop.h" +#include "wpinet/uv/Loop.h" namespace wpi { diff --git a/wpiutil/src/test/native/cpp/hostname.cpp b/wpinet/src/test/native/cpp/hostname.cpp similarity index 86% rename from wpiutil/src/test/native/cpp/hostname.cpp rename to wpinet/src/test/native/cpp/hostname.cpp index 29cceb1cef..51a29a23ae 100644 --- a/wpiutil/src/test/native/cpp/hostname.cpp +++ b/wpinet/src/test/native/cpp/hostname.cpp @@ -2,11 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/hostname.h" +#include "wpinet/hostname.h" + +#include +#include #include "gtest/gtest.h" -#include "wpi/SmallString.h" -#include "wpi/SmallVector.h" namespace wpi { TEST(HostNameTest, HostNameNotEmpty) { diff --git a/wpinet/src/test/native/cpp/main.cpp b/wpinet/src/test/native/cpp/main.cpp new file mode 100644 index 0000000000..09072ee347 --- /dev/null +++ b/wpinet/src/test/native/cpp/main.cpp @@ -0,0 +1,11 @@ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. + +#include "gtest/gtest.h" + +int main(int argc, char** argv) { + ::testing::InitGoogleTest(&argc, argv); + int ret = RUN_ALL_TESTS(); + return ret; +} diff --git a/wpiutil/src/test/native/cpp/raw_uv_stream_test.cpp b/wpinet/src/test/native/cpp/raw_uv_stream_test.cpp similarity index 95% rename from wpiutil/src/test/native/cpp/raw_uv_stream_test.cpp rename to wpinet/src/test/native/cpp/raw_uv_stream_test.cpp index 985fb8bcc9..541da5a5d0 100644 --- a/wpiutil/src/test/native/cpp/raw_uv_stream_test.cpp +++ b/wpinet/src/test/native/cpp/raw_uv_stream_test.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/raw_uv_ostream.h" // NOLINT(build/include_order) +#include "wpinet/raw_uv_ostream.h" // NOLINT(build/include_order) #include "gtest/gtest.h" diff --git a/wpiutil/src/test/native/cpp/uv/UvAsyncFunctionTest.cpp b/wpinet/src/test/native/cpp/uv/UvAsyncFunctionTest.cpp similarity index 97% rename from wpiutil/src/test/native/cpp/uv/UvAsyncFunctionTest.cpp rename to wpinet/src/test/native/cpp/uv/UvAsyncFunctionTest.cpp index 8407935ec1..19c1faf2e4 100644 --- a/wpiutil/src/test/native/cpp/uv/UvAsyncFunctionTest.cpp +++ b/wpinet/src/test/native/cpp/uv/UvAsyncFunctionTest.cpp @@ -2,14 +2,14 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/AsyncFunction.h" // NOLINT(build/include_order) +#include "wpinet/uv/AsyncFunction.h" // NOLINT(build/include_order) #include "gtest/gtest.h" // NOLINT(build/include_order) #include -#include "wpi/uv/Loop.h" -#include "wpi/uv/Prepare.h" +#include "wpinet/uv/Loop.h" +#include "wpinet/uv/Prepare.h" namespace wpi::uv { diff --git a/wpiutil/src/test/native/cpp/uv/UvAsyncTest.cpp b/wpinet/src/test/native/cpp/uv/UvAsyncTest.cpp similarity index 96% rename from wpiutil/src/test/native/cpp/uv/UvAsyncTest.cpp rename to wpinet/src/test/native/cpp/uv/UvAsyncTest.cpp index 5561f1e547..5dd0f7689c 100644 --- a/wpiutil/src/test/native/cpp/uv/UvAsyncTest.cpp +++ b/wpinet/src/test/native/cpp/uv/UvAsyncTest.cpp @@ -23,16 +23,17 @@ * IN THE SOFTWARE. */ -#include "wpi/uv/Async.h" // NOLINT(build/include_order) +#include "wpinet/uv/Async.h" // NOLINT(build/include_order) #include "gtest/gtest.h" // NOLINT(build/include_order) #include #include -#include "wpi/mutex.h" -#include "wpi/uv/Loop.h" -#include "wpi/uv/Prepare.h" +#include + +#include "wpinet/uv/Loop.h" +#include "wpinet/uv/Prepare.h" namespace wpi::uv { diff --git a/wpiutil/src/test/native/cpp/uv/UvBufferTest.cpp b/wpinet/src/test/native/cpp/uv/UvBufferTest.cpp similarity index 95% rename from wpiutil/src/test/native/cpp/uv/UvBufferTest.cpp rename to wpinet/src/test/native/cpp/uv/UvBufferTest.cpp index e262181051..da6a63cacf 100644 --- a/wpiutil/src/test/native/cpp/uv/UvBufferTest.cpp +++ b/wpinet/src/test/native/cpp/uv/UvBufferTest.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/Buffer.h" // NOLINT(build/include_order) +#include "wpinet/uv/Buffer.h" // NOLINT(build/include_order) #include "gtest/gtest.h" // NOLINT(build/include_order) diff --git a/wpiutil/src/test/native/cpp/uv/UvGetAddrInfoTest.cpp b/wpinet/src/test/native/cpp/uv/UvGetAddrInfoTest.cpp similarity index 96% rename from wpiutil/src/test/native/cpp/uv/UvGetAddrInfoTest.cpp rename to wpinet/src/test/native/cpp/uv/UvGetAddrInfoTest.cpp index b397e24b6d..5ad33b23d8 100644 --- a/wpiutil/src/test/native/cpp/uv/UvGetAddrInfoTest.cpp +++ b/wpinet/src/test/native/cpp/uv/UvGetAddrInfoTest.cpp @@ -23,11 +23,11 @@ * IN THE SOFTWARE. */ -#include "wpi/uv/GetAddrInfo.h" // NOLINT(build/include_order) +#include "wpinet/uv/GetAddrInfo.h" // NOLINT(build/include_order) #include "gtest/gtest.h" // NOLINT(build/include_order) -#include "wpi/uv/Loop.h" +#include "wpinet/uv/Loop.h" #define CONCURRENT_COUNT 10 diff --git a/wpiutil/src/test/native/cpp/uv/UvGetNameInfoTest.cpp b/wpinet/src/test/native/cpp/uv/UvGetNameInfoTest.cpp similarity index 95% rename from wpiutil/src/test/native/cpp/uv/UvGetNameInfoTest.cpp rename to wpinet/src/test/native/cpp/uv/UvGetNameInfoTest.cpp index db1eefef6a..707f03730a 100644 --- a/wpiutil/src/test/native/cpp/uv/UvGetNameInfoTest.cpp +++ b/wpinet/src/test/native/cpp/uv/UvGetNameInfoTest.cpp @@ -23,11 +23,11 @@ * IN THE SOFTWARE. */ -#include "wpi/uv/GetNameInfo.h" // NOLINT(build/include_order) +#include "wpinet/uv/GetNameInfo.h" // NOLINT(build/include_order) #include "gtest/gtest.h" // NOLINT(build/include_order) -#include "wpi/uv/Loop.h" +#include "wpinet/uv/Loop.h" namespace wpi::uv { diff --git a/wpiutil/src/test/native/cpp/uv/UvLoopWalkTest.cpp b/wpinet/src/test/native/cpp/uv/UvLoopWalkTest.cpp similarity index 96% rename from wpiutil/src/test/native/cpp/uv/UvLoopWalkTest.cpp rename to wpinet/src/test/native/cpp/uv/UvLoopWalkTest.cpp index 38a33426e0..eee0f99514 100644 --- a/wpiutil/src/test/native/cpp/uv/UvLoopWalkTest.cpp +++ b/wpinet/src/test/native/cpp/uv/UvLoopWalkTest.cpp @@ -23,11 +23,11 @@ * IN THE SOFTWARE. */ -#include "wpi/uv/Loop.h" // NOLINT(build/include_order) +#include "wpinet/uv/Loop.h" // NOLINT(build/include_order) #include "gtest/gtest.h" // NOLINT(build/include_order) -#include "wpi/uv/Timer.h" +#include "wpinet/uv/Timer.h" namespace wpi::uv { diff --git a/wpiutil/src/test/native/cpp/uv/UvTimerTest.cpp b/wpinet/src/test/native/cpp/uv/UvTimerTest.cpp similarity index 96% rename from wpiutil/src/test/native/cpp/uv/UvTimerTest.cpp rename to wpinet/src/test/native/cpp/uv/UvTimerTest.cpp index 1a6258fd62..7377ab151d 100644 --- a/wpiutil/src/test/native/cpp/uv/UvTimerTest.cpp +++ b/wpinet/src/test/native/cpp/uv/UvTimerTest.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/uv/Timer.h" // NOLINT(build/include_order) +#include "wpinet/uv/Timer.h" // NOLINT(build/include_order) #include "gtest/gtest.h" diff --git a/wpinet/wpinet-config.cmake.in b/wpinet/wpinet-config.cmake.in new file mode 100644 index 0000000000..e61a677ed8 --- /dev/null +++ b/wpinet/wpinet-config.cmake.in @@ -0,0 +1,7 @@ +include(CMakeFindDependencyMacro) +@FILENAME_DEP_REPLACE@ +@LIBUV_VCPKG_REPLACE@ +@WPIUTIL_DEP_REPLACE@ + +@FILENAME_DEP_REPLACE@ +include(${SELF_DIR}/wpinet.cmake) diff --git a/wpiutil/.styleguide b/wpiutil/.styleguide index f0ae0655c3..3c728f4549 100644 --- a/wpiutil/.styleguide +++ b/wpiutil/.styleguide @@ -11,7 +11,6 @@ cppSrcFileInclude { } generatedFileExclude { - src/main/native/cpp/http_parser\.cpp$ src/main/native/cpp/llvm/ src/main/native/include/llvm/ src/main/native/include/wpi/AlignOf\.h$ @@ -54,7 +53,6 @@ generatedFileExclude { src/main/native/include/wpi/Twine\.h$ src/main/native/include/wpi/VersionTuple\.h$ src/main/native/include/wpi/WindowsError\.h$ - src/main/native/include/wpi/http_parser\.h$ src/main/native/include/wpi/iterator\.h$ src/main/native/include/wpi/iterator_range\.h$ src/main/native/include/wpi/raw_os_ostream\.h$ @@ -70,28 +68,18 @@ generatedFileExclude { src/main/native/cpp/json src/main/native/include/wpi/json src/test/native/cpp/json/ - src/main/native/include/uv\.h$ - src/main/native/include/uv/ - src/main/native/libuv/ src/main/native/fmtlib/ src/main/native/resources/ src/test/native/cpp/llvm/ src/main/native/windows/StackWalker - src/main/native/linux/AvahiClient } licenseUpdateExclude { src/main/native/cpp/Base64\.cpp$ src/main/native/cpp/sha1\.cpp$ - src/main/native/cpp/TCPAcceptor\.cpp$ - src/main/native/cpp/TCPConnector\.cpp$ - src/main/native/cpp/TCPStream\.cpp$ src/main/native/include/wpi/ConcurrentQueue\.h$ src/main/native/include/wpi/Path\.h$ src/main/native/include/wpi/sha1\.h$ - src/main/native/include/wpi/TCPAcceptor\.h$ - src/main/native/include/wpi/TCPConnector\.h$ - src/main/native/include/wpi/TCPStream\.h$ } repoRootNameOverride { diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt index 49990bad9b..5609fd0951 100644 --- a/wpiutil/CMakeLists.txt +++ b/wpiutil/CMakeLists.txt @@ -96,48 +96,6 @@ file(GLOB_RECURSE wpiutil_windows_src src/main/native/windows/*.cpp) file(GLOB fmtlib_native_src src/main/native/fmtlib/src/*.cpp) -file(GLOB uv_native_src src/main/native/libuv/src/*.cpp) - -file(GLOB uv_windows_src src/main/native/libuv/src/win/*.cpp) - -set(uv_unix_src - src/main/native/libuv/src/unix/async.cpp - src/main/native/libuv/src/unix/core.cpp - src/main/native/libuv/src/unix/dl.cpp - src/main/native/libuv/src/unix/fs.cpp - src/main/native/libuv/src/unix/getaddrinfo.cpp - src/main/native/libuv/src/unix/getnameinfo.cpp - src/main/native/libuv/src/unix/loop-watcher.cpp - src/main/native/libuv/src/unix/loop.cpp - src/main/native/libuv/src/unix/pipe.cpp - src/main/native/libuv/src/unix/poll.cpp - src/main/native/libuv/src/unix/process.cpp - src/main/native/libuv/src/unix/signal.cpp - src/main/native/libuv/src/unix/stream.cpp - src/main/native/libuv/src/unix/tcp.cpp - src/main/native/libuv/src/unix/thread.cpp - src/main/native/libuv/src/unix/tty.cpp - src/main/native/libuv/src/unix/udp.cpp -) - -set(uv_darwin_src - src/main/native/libuv/src/unix/bsd-ifaddrs.cpp - src/main/native/libuv/src/unix/darwin.cpp - src/main/native/libuv/src/unix/darwin-proctitle.cpp - src/main/native/libuv/src/unix/fsevents.cpp - src/main/native/libuv/src/unix/kqueue.cpp - src/main/native/libuv/src/unix/proctitle.cpp -) - -set(uv_linux_src - src/main/native/libuv/src/unix/linux-core.cpp - src/main/native/libuv/src/unix/linux-inotify.cpp - src/main/native/libuv/src/unix/linux-syscalls.cpp - src/main/native/libuv/src/unix/procfs-exepath.cpp - src/main/native/libuv/src/unix/proctitle.cpp - src/main/native/libuv/src/unix/sysinfo-loadavg.cpp -) - add_library(wpiutil ${wpiutil_native_src} ${fmtlib_native_src} ${wpiutil_resources_src}) set_target_properties(wpiutil PROPERTIES DEBUG_POSTFIX "d") @@ -167,33 +125,6 @@ else() target_link_libraries(wpiutil fmt::fmt) endif() -if (NOT USE_VCPKG_LIBUV) - target_sources(wpiutil PRIVATE ${uv_native_src}) - install(DIRECTORY src/main/native/libuv/include/ DESTINATION "${include_dest}/wpiutil") - target_include_directories(wpiutil PRIVATE - src/main/native/libuv/src) - target_include_directories(wpiutil PUBLIC - $ - $) - if(NOT MSVC) - target_sources(wpiutil PRIVATE ${uv_unix_src}) - if (APPLE) - target_sources(wpiutil PRIVATE ${uv_darwin_src}) - else() - target_sources(wpiutil PRIVATE ${uv_linux_src}) - endif() - target_compile_definitions(wpiutil PRIVATE -D_GNU_SOURCE) - else() - target_sources(wpiutil PRIVATE ${uv_windows_src}) - if(BUILD_SHARED_LIBS) - target_compile_definitions(wpiutil PRIVATE -DBUILDING_UV_SHARED) - endif() - endif() -else() - find_package(unofficial-libuv CONFIG REQUIRED) - target_link_libraries(wpiutil unofficial::libuv::libuv) -endif() - if (MSVC) target_sources(wpiutil PRIVATE ${wpiutil_windows_src}) else () @@ -237,27 +168,8 @@ foreach(example ${wpiutil_examples}) endif() endforeach() -if (UNIX AND NOT APPLE) - set (LIBUTIL -lutil) -else() - set (LIBUTIL) -endif() - -file(GLOB netconsoleServer_src src/netconsoleServer/native/cpp/*.cpp) -add_executable(netconsoleServer ${netconsoleServer_src}) -wpilib_target_warnings(netconsoleServer) -target_link_libraries(netconsoleServer wpiutil ${LIBUTIL}) - -file(GLOB netconsoleTee_src src/netconsoleTee/native/cpp/*.cpp) -add_executable(netconsoleTee ${netconsoleTee_src}) -wpilib_target_warnings(netconsoleTee) -target_link_libraries(netconsoleTee wpiutil) - -set_property(TARGET netconsoleServer PROPERTY FOLDER "examples") -set_property(TARGET netconsoleTee PROPERTY FOLDER "examples") - if (WITH_TESTS) wpilib_add_test(wpiutil src/test/native/cpp) target_include_directories(wpiutil_test PRIVATE src/test/native/include) - target_link_libraries(wpiutil_test wpiutil ${LIBUTIL} gmock_main) + target_link_libraries(wpiutil_test wpiutil gmock_main) endif() diff --git a/wpiutil/build.gradle b/wpiutil/build.gradle index deef77965b..4f94597fde 100644 --- a/wpiutil/build.gradle +++ b/wpiutil/build.gradle @@ -15,15 +15,6 @@ ext { dependsOn generateTask } it.sources { - libuvCpp(CppSourceSet) { - source { - srcDirs 'src/main/native/libuv/src' - include '*.cpp' - } - exportedHeaders { - srcDirs 'src/main/native/include', 'src/main/native/libuv/include', 'src/main/native/libuv/src' - } - } fmtlibCpp(CppSourceSet) { source { srcDirs 'src/main/native/fmtlib/src' @@ -46,34 +37,6 @@ ext { if (!it.targetPlatform.operatingSystem.isWindows()) { it.cppCompiler.define '_GNU_SOURCE' it.sources { - libuvUnixCpp(CppSourceSet) { - source { - srcDirs 'src/main/native/libuv/src/unix' - includes = [ - 'async.cpp', - 'core.cpp', - 'dl.cpp', - 'fs.cpp', - 'getaddrinfo.cpp', - 'getnameinfo.cpp', - 'loop-watcher.cpp', - 'loop.cpp', - 'pipe.cpp', - 'poll.cpp', - 'process.cpp', - 'signal.cpp', - 'stream.cpp', - 'tcp.cpp', - 'thread.cpp', - 'timer.cpp', - 'tty.cpp', - 'udp.cpp', - ] - } - exportedHeaders { - srcDirs 'src/main/native/include', 'src/main/native/libuv/include', 'src/main/native/libuv/src' - } - } wpiutilUnixCpp(CppSourceSet) { source { srcDirs 'src/main/native/unix' @@ -87,19 +50,7 @@ ext { } } if (it.targetPlatform.operatingSystem.isWindows()) { - if (it in SharedLibraryBinarySpec) { - it.cppCompiler.define 'BUILDING_UV_SHARED' - } it.sources { - libuvWindowsCpp(CppSourceSet) { - source { - srcDirs 'src/main/native/libuv/src/win' - include '*.cpp' - } - exportedHeaders { - srcDirs 'src/main/native/include', 'src/main/native/libuv/include', 'src/main/native/libuv/src' - } - } wpiutilWindowsCpp(CppSourceSet) { source { srcDirs 'src/main/native/windows' @@ -113,22 +64,6 @@ ext { } } else if (it.targetPlatform.operatingSystem.isMacOsX()) { it.sources { - libuvMacCpp(CppSourceSet) { - source { - srcDirs 'src/main/native/libuv/src/unix' - includes = [ - 'bsd-ifaddrs.cpp', - 'darwin.cpp', - 'darwin-proctitle.cpp', - 'fsevents.cpp', - 'kqueue.cpp', - 'proctitle.cpp' - ] - } - exportedHeaders { - srcDirs 'src/main/native/include', 'src/main/native/libuv/include', 'src/main/native/libuv/src' - } - } wpiutilmacOSCpp(CppSourceSet) { source { srcDirs 'src/main/native/macOS' @@ -142,22 +77,6 @@ ext { } } else { it.sources { - libuvLinuxCpp(CppSourceSet) { - source { - srcDirs 'src/main/native/libuv/src/unix' - includes = [ - 'linux-core.cpp', - 'linux-inotify.cpp', - 'linux-syscalls.cpp', - 'procfs-exepath.cpp', - 'proctitle.cpp', - 'sysinfo-loadavg.cpp', - ] - } - exportedHeaders { - srcDirs 'src/main/native/include', 'src/main/native/libuv/include', 'src/main/native/libuv/src' - } - } wpiutilLinuxCpp(CppSourceSet) { source { srcDirs 'src/main/native/linux' @@ -217,9 +136,6 @@ nativeUtils.exportsConfigs { } cppHeadersZip { - from('src/main/native/libuv/include') { - into '/' - } from('src/main/native/fmtlib/include') { into '/' } @@ -230,7 +146,7 @@ model { all { it.sources.each { it.exportedHeaders { - srcDirs 'src/main/native/include', 'src/main/native/libuv/include', 'src/main/native/libuv/src', 'src/main/native/fmtlib/include' + srcDirs 'src/main/native/include', 'src/main/native/fmtlib/include' } } } @@ -255,41 +171,6 @@ model { } } } - netconsoleServer(NativeExecutableSpec) { - targetBuildTypes 'release' - sources { - cpp { - source { - srcDirs = [ - 'src/netconsoleServer/native/cpp' - ] - includes = ['**/*.cpp'] - } - } - } - binaries.all { binary -> - lib project: ':wpiutil', library: 'wpiutil', linkage: 'static' - if (binary.targetPlatform.operatingSystem.isLinux()) { - linker.args "-lutil" - } - } - } - netconsoleTee(NativeExecutableSpec) { - targetBuildTypes 'release' - sources { - cpp { - source { - srcDirs = [ - 'src/netconsoleTee/native/cpp' - ] - includes = ['**/*.cpp'] - } - } - } - binaries.all { binary -> - lib project: ':wpiutil', library: 'wpiutil', linkage: 'static' - } - } } } diff --git a/wpiutil/src/main/java/edu/wpi/first/util/WPIUtilJNI.java b/wpiutil/src/main/java/edu/wpi/first/util/WPIUtilJNI.java index b511b170b4..d2a76fe4da 100644 --- a/wpiutil/src/main/java/edu/wpi/first/util/WPIUtilJNI.java +++ b/wpiutil/src/main/java/edu/wpi/first/util/WPIUtilJNI.java @@ -64,10 +64,6 @@ public class WPIUtilJNI { public static native long getSystemTime(); - public static native void addPortForwarder(int port, String remoteHost, int remotePort); - - public static native void removePortForwarder(int port); - public static native int createEvent(boolean manualReset, boolean initialState); public static native void destroyEvent(int eventHandle); @@ -126,29 +122,4 @@ public class WPIUtilJNI { */ public static native int[] waitForObjectsTimeout(int[] handles, double timeout) throws InterruptedException; - - public static native int createMulticastServiceAnnouncer( - String serviceName, String serviceType, int port, String[] keys, String[] values); - - public static native void freeMulticastServiceAnnouncer(int handle); - - public static native void startMulticastServiceAnnouncer(int handle); - - public static native void stopMulticastServiceAnnouncer(int handle); - - public static native boolean getMulticastServiceAnnouncerHasImplementation(int handle); - - public static native int createMulticastServiceResolver(String serviceType); - - public static native void freeMulticastServiceResolver(int handle); - - public static native void startMulticastServiceResolver(int handle); - - public static native void stopMulticastServiceResolver(int handle); - - public static native boolean getMulticastServiceResolverHasImplementation(int handle); - - public static native int getMulticastServiceResolverEventHandle(int handle); - - public static native ServiceData[] getMulticastServiceResolverData(int handle); } diff --git a/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp b/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp index e876d9cf90..34ca873ed1 100644 --- a/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp +++ b/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp @@ -4,14 +4,8 @@ #include -#include "../MulticastHandleManager.h" #include "edu_wpi_first_util_WPIUtilJNI.h" -#include "wpi/DenseMap.h" -#include "wpi/MulticastServiceAnnouncer.h" -#include "wpi/MulticastServiceResolver.h" -#include "wpi/PortForwarder.h" #include "wpi/Synchronization.h" -#include "wpi/UidVector.h" #include "wpi/jni_util.h" #include "wpi/timestamp.h" @@ -21,8 +15,6 @@ static bool mockTimeEnabled = false; static uint64_t mockNow = 0; static JException interruptedEx; -static JClass serviceDataCls; -static JGlobal serviceDataEmptyArray; extern "C" { @@ -37,17 +29,6 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) { return JNI_ERR; } - serviceDataCls = JClass{env, "edu/wpi/first/util/ServiceData"}; - if (!serviceDataCls) { - return JNI_ERR; - } - - serviceDataEmptyArray = JGlobal{ - env, env->NewObjectArray(0, serviceDataCls, nullptr)}; - if (serviceDataEmptyArray == nullptr) { - return JNI_ERR; - } - return JNI_VERSION_1_6; } @@ -57,8 +38,6 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM* vm, void* reserved) { return; } - serviceDataEmptyArray.free(env); - serviceDataCls.free(env); interruptedEx.free(env); } @@ -128,32 +107,6 @@ Java_edu_wpi_first_util_WPIUtilJNI_getSystemTime return wpi::GetSystemTime(); } -/* - * Class: edu_wpi_first_util_WPIUtilJNI - * Method: addPortForwarder - * Signature: (ILjava/lang/String;I)V - */ -JNIEXPORT void JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_addPortForwarder - (JNIEnv* env, jclass, jint port, jstring remoteHost, jint remotePort) -{ - wpi::PortForwarder::GetInstance().Add(static_cast(port), - JStringRef{env, remoteHost}.str(), - static_cast(remotePort)); -} - -/* - * Class: edu_wpi_first_util_WPIUtilJNI - * Method: removePortForwarder - * Signature: (I)V - */ -JNIEXPORT void JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_removePortForwarder - (JNIEnv* env, jclass, jint port) -{ - wpi::PortForwarder::GetInstance().Remove(port); -} - /* * Class: edu_wpi_first_util_WPIUtilJNI * Method: createEvent @@ -319,257 +272,4 @@ Java_edu_wpi_first_util_WPIUtilJNI_waitForObjectsTimeout return MakeJIntArray(env, signaled); } -/* - * Class: edu_wpi_first_util_WPIUtilJNI - * Method: createMulticastServiceAnnouncer - * Signature: (Ljava/lang/String;Ljava/lang/String;I[Ljava/lang/Object;[Ljava/lang/Object;)I - */ -JNIEXPORT jint JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_createMulticastServiceAnnouncer - (JNIEnv* env, jclass, jstring serviceName, jstring serviceType, jint port, - jobjectArray keys, jobjectArray values) -{ - auto& manager = wpi::GetMulticastManager(); - std::scoped_lock lock{manager.mutex}; - - JStringRef serviceNameRef{env, serviceName}; - JStringRef serviceTypeRef{env, serviceType}; - - size_t keysLen = env->GetArrayLength(keys); - wpi::SmallVector, 8> txtVec; - txtVec.reserve(keysLen); - for (size_t i = 0; i < keysLen; i++) { - JLocal key{ - env, static_cast(env->GetObjectArrayElement(keys, i))}; - JLocal value{ - env, static_cast(env->GetObjectArrayElement(values, i))}; - - txtVec.emplace_back(std::pair{ - JStringRef{env, key}.str(), JStringRef{env, value}.str()}); - } - - auto announcer = std::make_unique( - serviceNameRef.str(), serviceTypeRef.str(), port, txtVec); - - size_t index = manager.handleIds.emplace_back(1); - - manager.announcers[index] = std::move(announcer); - - return static_cast(index); -} - -/* - * Class: edu_wpi_first_util_WPIUtilJNI - * Method: freeMulticastServiceAnnouncer - * Signature: (I)V - */ -JNIEXPORT void JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_freeMulticastServiceAnnouncer - (JNIEnv* env, jclass, jint handle) -{ - auto& manager = wpi::GetMulticastManager(); - std::scoped_lock lock{manager.mutex}; - manager.announcers[handle] = nullptr; - manager.handleIds.erase(handle); -} - -/* - * Class: edu_wpi_first_util_WPIUtilJNI - * Method: startMulticastServiceAnnouncer - * Signature: (I)V - */ -JNIEXPORT void JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_startMulticastServiceAnnouncer - (JNIEnv* env, jclass, jint handle) -{ - auto& manager = wpi::GetMulticastManager(); - std::scoped_lock lock{manager.mutex}; - auto& announcer = manager.announcers[handle]; - announcer->Start(); -} - -/* - * Class: edu_wpi_first_util_WPIUtilJNI - * Method: stopMulticastServiceAnnouncer - * Signature: (I)V - */ -JNIEXPORT void JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_stopMulticastServiceAnnouncer - (JNIEnv* env, jclass, jint handle) -{ - auto& manager = wpi::GetMulticastManager(); - std::scoped_lock lock{manager.mutex}; - auto& announcer = manager.announcers[handle]; - announcer->Stop(); -} - -/* - * Class: edu_wpi_first_util_WPIUtilJNI - * Method: getMulticastServiceAnnouncerHasImplementation - * Signature: (I)Z - */ -JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_getMulticastServiceAnnouncerHasImplementation - (JNIEnv* env, jclass, jint handle) -{ - auto& manager = wpi::GetMulticastManager(); - std::scoped_lock lock{manager.mutex}; - auto& announcer = manager.announcers[handle]; - return announcer->HasImplementation(); -} - -/* - * Class: edu_wpi_first_util_WPIUtilJNI - * Method: createMulticastServiceResolver - * Signature: (Ljava/lang/String;)I - */ -JNIEXPORT jint JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_createMulticastServiceResolver - (JNIEnv* env, jclass, jstring serviceType) -{ - auto& manager = wpi::GetMulticastManager(); - std::scoped_lock lock{manager.mutex}; - JStringRef serviceTypeRef{env, serviceType}; - - auto resolver = - std::make_unique(serviceTypeRef.str()); - - size_t index = manager.handleIds.emplace_back(2); - - manager.resolvers[index] = std::move(resolver); - - return static_cast(index); -} - -/* - * Class: edu_wpi_first_util_WPIUtilJNI - * Method: freeMulticastServiceResolver - * Signature: (I)V - */ -JNIEXPORT void JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_freeMulticastServiceResolver - (JNIEnv* env, jclass, jint handle) -{ - auto& manager = wpi::GetMulticastManager(); - std::scoped_lock lock{manager.mutex}; - manager.resolvers[handle] = nullptr; - manager.handleIds.erase(handle); -} - -/* - * Class: edu_wpi_first_util_WPIUtilJNI - * Method: startMulticastServiceResolver - * Signature: (I)V - */ -JNIEXPORT void JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_startMulticastServiceResolver - (JNIEnv* env, jclass, jint handle) -{ - auto& manager = wpi::GetMulticastManager(); - std::scoped_lock lock{manager.mutex}; - auto& resolver = manager.resolvers[handle]; - resolver->Start(); -} - -/* - * Class: edu_wpi_first_util_WPIUtilJNI - * Method: stopMulticastServiceResolver - * Signature: (I)V - */ -JNIEXPORT void JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_stopMulticastServiceResolver - (JNIEnv* env, jclass, jint handle) -{ - auto& manager = wpi::GetMulticastManager(); - std::scoped_lock lock{manager.mutex}; - auto& resolver = manager.resolvers[handle]; - resolver->Stop(); -} - -/* - * Class: edu_wpi_first_util_WPIUtilJNI - * Method: getMulticastServiceResolverHasImplementation - * Signature: (I)Z - */ -JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_getMulticastServiceResolverHasImplementation - (JNIEnv* env, jclass, jint handle) -{ - auto& manager = wpi::GetMulticastManager(); - std::scoped_lock lock{manager.mutex}; - auto& resolver = manager.resolvers[handle]; - return resolver->HasImplementation(); -} - -/* - * Class: edu_wpi_first_util_WPIUtilJNI - * Method: getMulticastServiceResolverEventHandle - * Signature: (I)I - */ -JNIEXPORT jint JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_getMulticastServiceResolverEventHandle - (JNIEnv* env, jclass, jint handle) -{ - auto& manager = wpi::GetMulticastManager(); - std::scoped_lock lock{manager.mutex}; - auto& resolver = manager.resolvers[handle]; - return resolver->GetEventHandle(); -} - -/* - * Class: edu_wpi_first_util_WPIUtilJNI - * Method: getMulticastServiceResolverData - * Signature: (I)[Ljava/lang/Object; - */ -JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_getMulticastServiceResolverData - (JNIEnv* env, jclass, jint handle) -{ - static jmethodID constructor = - env->GetMethodID(serviceDataCls, "", - "(JILjava/lang/String;Ljava/lang/String;[Ljava/lang/" - "String;[Ljava/lang/String;)V"); - auto& manager = wpi::GetMulticastManager(); - std::vector allData; - { - std::scoped_lock lock{manager.mutex}; - auto& resolver = manager.resolvers[handle]; - allData = resolver->GetData(); - } - if (allData.empty()) { - return serviceDataEmptyArray; - } - - JLocal returnData{ - env, env->NewObjectArray(allData.size(), serviceDataCls, nullptr)}; - - for (auto&& data : allData) { - JLocal serviceName{env, MakeJString(env, data.serviceName)}; - JLocal hostName{env, MakeJString(env, data.hostName)}; - - wpi::SmallVector keysRef; - wpi::SmallVector valuesRef; - - size_t index = 0; - for (auto&& txt : data.txt) { - keysRef.emplace_back(txt.first); - valuesRef.emplace_back(txt.second); - } - - JLocal keys{env, MakeJStringArray(env, keysRef)}; - JLocal values{env, MakeJStringArray(env, valuesRef)}; - - JLocal dataItem{ - env, env->NewObject(serviceDataCls, constructor, - static_cast(data.ipv4Address), - static_cast(data.port), serviceName.obj(), - hostName.obj(), keys.obj(), values.obj())}; - - env->SetObjectArrayElement(returnData, index, dataItem); - index++; - } - - return returnData; -} - } // extern "C" diff --git a/wpiutil/wpiutil-config.cmake.in b/wpiutil/wpiutil-config.cmake.in index d814f0a176..821b926ba7 100644 --- a/wpiutil/wpiutil-config.cmake.in +++ b/wpiutil/wpiutil-config.cmake.in @@ -2,8 +2,7 @@ include(CMakeFindDependencyMacro) @FILENAME_DEP_REPLACE@ set(THREADS_PREFER_PTHREAD_FLAG ON) find_dependency(Threads) -@LIBUV_VCPKG_REPLACE@ -@EIGEN_VCPKG_REPLACE@ +@FMTLIB_VCPKG_REPLACE@ @FILENAME_DEP_REPLACE@ include(${SELF_DIR}/wpiutil.cmake)