webrtc/rtc_tools/network_tester/jni.cc
Byoungchan Lee c931f70896 network_tester: Remove usage of rtc::Thread::socketserver() and cleanup
Instead of creating a TaskQueue from packet_sender, create a rtc::Thread
in test_controller so that test_controller instantiates a SocketServer,
eliminating the use of rtc::Thread::socketserver().
Also did various cleanups, such as adding threading annotations, and
ensuring that all network operations are done in dedicated threads.

Bug: webrtc:13145
Test: Unittest, and manually verified using Android clients and Linux servers
Change-Id: I05ebe5e29bd80f14a193c9ee8b0bf63a1b6b94d7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/263321
Commit-Queue: Daniel.l Lee <daniel.l@hpcnt.com>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37411}
2022-07-03 08:44:52 +00:00

68 lines
2.1 KiB
C++

/*
* Copyright 2017 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include <jni.h>
#undef JNIEXPORT
#define JNIEXPORT __attribute__((visibility("default")))
#include <string>
#include "rtc_base/logging.h"
#include "rtc_base/thread.h"
#include "rtc_tools/network_tester/test_controller.h"
extern "C" JNIEXPORT jlong JNICALL
Java_com_google_media_networktester_NetworkTester_CreateTestController(
JNIEnv* jni,
jclass) {
rtc::ThreadManager::Instance()->WrapCurrentThread();
return reinterpret_cast<intptr_t>(new webrtc::TestController(
0, 0, "/mnt/sdcard/network_tester_client_config.dat",
"/mnt/sdcard/network_tester_client_packet_log.dat"));
}
extern "C" JNIEXPORT void JNICALL
Java_com_google_media_networktester_NetworkTester_TestControllerConnect(
JNIEnv* jni,
jclass,
jlong native_pointer) {
reinterpret_cast<webrtc::TestController*>(native_pointer)
->SendConnectTo("85.195.237.107", 9090);
}
extern "C" JNIEXPORT bool JNICALL
Java_com_google_media_networktester_NetworkTester_TestControllerIsDone(
JNIEnv* jni,
jclass,
jlong native_pointer) {
return reinterpret_cast<webrtc::TestController*>(native_pointer)
->IsTestDone();
}
extern "C" JNIEXPORT void JNICALL
Java_com_google_media_networktester_NetworkTester_TestControllerRun(
JNIEnv* jni,
jclass,
jlong native_pointer) {
// 100 ms arbitrary chosen, but it works well.
rtc::Thread::Current()->ProcessMessages(/*cms=*/100);
}
extern "C" JNIEXPORT void JNICALL
Java_com_google_media_networktester_NetworkTester_DestroyTestController(
JNIEnv* jni,
jclass,
jlong native_pointer) {
webrtc::TestController* test_controller =
reinterpret_cast<webrtc::TestController*>(native_pointer);
if (test_controller) {
delete test_controller;
}
rtc::ThreadManager::Instance()->UnwrapCurrentThread();
}