diff options
| -rw-r--r-- | java/CMakeLists.txt | 45 | ||||
| -rw-r--r-- | java/jvpp-stats/io/fd/jvpp/stats/JVppClientStatsImpl.java | 50 | ||||
| -rw-r--r-- | java/jvpp-stats/io/fd/jvpp/stats/dto/InterfaceStatistics.java | 111 | ||||
| -rw-r--r-- | java/jvpp-stats/io/fd/jvpp/stats/test/JvppStatsApiTest.java | 43 | ||||
| -rw-r--r-- | java/jvpp-stats/io/fd/jvpp/stats/test/Readme.txt | 5 | ||||
| -rw-r--r-- | java/jvpp-stats/jvpp_stats.c | 127 | ||||
| -rw-r--r-- | java/jvpp-stats/jvpp_stats.h | 36 |
7 files changed, 0 insertions, 417 deletions
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt index e0dc673..cc59910 100644 --- a/java/CMakeLists.txt +++ b/java/CMakeLists.txt @@ -185,51 +185,6 @@ FILE(GLOB_RECURSE files RELATIVE # message("COREFILES: ${corefiles}") java_api_binding(core core ${files}) -############# Stats package ################## -set(PACKAGE_DIR_JVPP_STATS io/fd/jvpp) -unset(files) -FILE(GLOB files RELATIVE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/jvpp-stats/${PACKAGE_DIR_JVPP_STATS}/*.java - ${CMAKE_CURRENT_SOURCE_DIR}/jvpp-stats/${PACKAGE_DIR_JVPP_STATS}/*/*.java - ${CMAKE_CURRENT_SOURCE_DIR}/jvpp-stats/${PACKAGE_DIR_JVPP_STATS}/*/*/*.java - ) - -add_custom_target(jvpp-stats-classes ALL) -add_dependencies(jvpp-stats-classes jvpp-registry) -add_custom_command(TARGET jvpp-stats-classes - PRE_BUILD - COMMAND mkdir -p jvpp-stats/target - COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/jvpp-stats - COMMAND ${Java_JAVAC_EXECUTABLE} - ARGS -source 1.8 -target 1.8 -cp ${CMAKE_CURRENT_BINARY_DIR}/jvpp-registry-${JAPI_LIB_VERSION}.jar - -d ${CMAKE_CURRENT_SOURCE_DIR}/jvpp-stats/target -h jvpp-stats ${files} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - -add_library(jvpp_stats SHARED jvpp-stats/jvpp_stats.c) -target_link_libraries(jvpp_stats ${JVPP_LIBS} vppapiclient vppinfra) -include_directories(jvpp-stats) -add_dependencies(jvpp_stats jvpp_common jvpp_registry jvpp-stats-classes) - -add_custom_target(jvpp-stats ALL) -add_dependencies(jvpp-stats jvpp_stats jvpp-stats-classes) -add_custom_command(TARGET jvpp-stats - PRE_BUILD - COMMAND cp ${CMAKE_BINARY_DIR}/build-root/lib/libjvpp_stats.so jvpp-stats/target - COMMAND ${Java_JAR_EXECUTABLE} ARGS cf - ${CMAKE_CURRENT_BINARY_DIR}/jvpp-stats-${JAPI_LIB_VERSION}.jar - -C jvpp-stats/target . - COMMAND rm ARGS -rf jvpp-stats/target - jvpp-stats/io_fd_jvpp_*.h - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMENT "JAR_GEN stats" - ) -install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/jvpp-stats-${JAPI_LIB_VERSION}.jar - DESTINATION share/java -) - ############ Plugin Packages ####################### unset(files) unset(pluginfiles) diff --git a/java/jvpp-stats/io/fd/jvpp/stats/JVppClientStatsImpl.java b/java/jvpp-stats/io/fd/jvpp/stats/JVppClientStatsImpl.java deleted file mode 100644 index 821373a..0000000 --- a/java/jvpp-stats/io/fd/jvpp/stats/JVppClientStatsImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2019 PANTHEON.tech. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.fd.jvpp.stats; - -import static io.fd.jvpp.NativeLibraryLoader.loadLibrary; -import static java.lang.String.format; - -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardCopyOption; -import java.nio.file.attribute.PosixFilePermission; -import java.nio.file.attribute.PosixFilePermissions; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; - -import io.fd.jvpp.stats.dto.InterfaceStatistics; - -public class JVppClientStatsImpl { - - private static final Logger LOG = Logger.getLogger(JVppClientStatsImpl.class.getName()); - - static { - final String libName = "libjvpp_stats.so"; - try { - loadLibrary(libName, JVppClientStatsImpl.class); - } catch (IOException e) { - LOG.log(Level.SEVERE, format("Can't find vpp jni library: %s", libName), e); - throw new ExceptionInInitializerError(e); - } - } - - public static native InterfaceStatistics[] interfaceStatisticsDump(); -} diff --git a/java/jvpp-stats/io/fd/jvpp/stats/dto/InterfaceStatistics.java b/java/jvpp-stats/io/fd/jvpp/stats/dto/InterfaceStatistics.java deleted file mode 100644 index 49486a1..0000000 --- a/java/jvpp-stats/io/fd/jvpp/stats/dto/InterfaceStatistics.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright (c) 2019 PANTHEON.tech. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.fd.jvpp.stats.dto; - -public class InterfaceStatistics { - - private int swIfIndex; - private int outErrors; - private int outMulticastPkts; - private int outUnicastPkts; - private int outBroadcastPkts; - private int outBytes; - private int inErrors; - private int inMulticastPkts; - private int inUnicastPkts; - private int inBroadcastPkts; - private int inBytes; - - public InterfaceStatistics(final int swIfIndex, final int outErrors, final int outMulticastPkts, - final int outUnicastPkts, - final int outBroadcastPkts, final int outBytes, final int inErrors, - final int inMulticastPkts, final int inUnicastPkts, - final int inBroadcastPkts, final int inBytes) { - this.swIfIndex = swIfIndex; - this.outErrors = outErrors; - this.outMulticastPkts = outMulticastPkts; - this.outUnicastPkts = outUnicastPkts; - this.outBroadcastPkts = outBroadcastPkts; - this.outBytes = outBytes; - this.inErrors = inErrors; - this.inMulticastPkts = inMulticastPkts; - this.inUnicastPkts = inUnicastPkts; - this.inBroadcastPkts = inBroadcastPkts; - this.inBytes = inBytes; - } - - public int getSwIfIndex() { - return swIfIndex; - } - - public int getOutErrors() { - return outErrors; - } - - public int getOutMulticastPkts() { - return outMulticastPkts; - } - - public int getOutUnicastPkts() { - return outUnicastPkts; - } - - public int getOutBroadcastPkts() { - return outBroadcastPkts; - } - - public int getOutBytes() { - return outBytes; - } - - public int getInErrors() { - return inErrors; - } - - public int getInMulticastPkts() { - return inMulticastPkts; - } - - public int getInUnicastPkts() { - return inUnicastPkts; - } - - public int getInBroadcastPkts() { - return inBroadcastPkts; - } - - public int getInBytes() { - return inBytes; - } - - @java.lang.Override - public java.lang.String toString() { - return "InterfaceStatistics{" + - "swIfIndex=" + swIfIndex + - ", outErrors=" + outErrors + - ", outMulticastPkts=" + outMulticastPkts + - ", outUnicastPkts=" + outUnicastPkts + - ", outBroadcastPkts=" + outBroadcastPkts + - ", outBytes=" + outBytes + - ", inErrors=" + inErrors + - ", inMulticastPkts=" + inMulticastPkts + - ", inUnicastPkts=" + inUnicastPkts + - ", inBroadcastPkts=" + inBroadcastPkts + - ", inBytes=" + inBytes + - '}'; - } -} diff --git a/java/jvpp-stats/io/fd/jvpp/stats/test/JvppStatsApiTest.java b/java/jvpp-stats/io/fd/jvpp/stats/test/JvppStatsApiTest.java deleted file mode 100644 index 5077509..0000000 --- a/java/jvpp-stats/io/fd/jvpp/stats/test/JvppStatsApiTest.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2019 PANTHEON.tech. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.fd.jvpp.stats.test; - -import io.fd.jvpp.stats.JVppClientStatsImpl; -import io.fd.jvpp.stats.dto.InterfaceStatistics; - -class JvppStatsApiTest { - - public static void main(String[] args) { - - JVppClientStatsImpl myImpl = new JVppClientStatsImpl(); - InterfaceStatistics[] statistics = myImpl.interfaceStatisticsDump(); - - if (statistics == null) { - System.out.println("in java - dump was null"); - return; - } - - if (statistics.length == 0) { - System.out.println("in java - dump was empty"); - return; - } - - for (int i = 0; i < statistics.length; i++) { - System.out.println(statistics[i].toString()); - } - } -} diff --git a/java/jvpp-stats/io/fd/jvpp/stats/test/Readme.txt b/java/jvpp-stats/io/fd/jvpp/stats/test/Readme.txt deleted file mode 100644 index cda9ed2..0000000 --- a/java/jvpp-stats/io/fd/jvpp/stats/test/Readme.txt +++ /dev/null @@ -1,5 +0,0 @@ -This package contains basic tests for jvpp. To run the tests: - -- Make sure VPP is running -- From JVPP's java/ folder execute: - - sudo java -cp jvpp-registry-19.04.jar:jvpp-stats-19.04.jar io.fd.jvpp.stats.test.JvppStatsApiTest diff --git a/java/jvpp-stats/jvpp_stats.c b/java/jvpp-stats/jvpp_stats.c deleted file mode 100644 index 404fe0a..0000000 --- a/java/jvpp-stats/jvpp_stats.c +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright (c) 2019 PANTHEON.tech. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "io_fd_jvpp_stats_JVppClientStatsImpl.h" -#include "jvpp_stats.h" -#include <vpp-api/client/stat_client.h> -#include <vppinfra/vec.h> -#include <vppinfra/format.h> - - -void set_field(int_stats_t* stats, int index, const char* field_name, int packets, int bytes) { - if (strcmp(field_name, "/if/rx-error") == 0) { - stats[index].rx_errors = packets; - } else if (strcmp(field_name, "/if/tx-error") == 0) { - stats[index].tx_errors = packets; - } else if (strcmp(field_name, "/if/tx") == 0) { - stats[index].tx_bytes = bytes; - } else if (strcmp(field_name, "/if/tx-multicast") == 0) { - stats[index].tx_multicast_pkts= packets; - } else if (strcmp(field_name, "/if/tx-unicast") == 0) { - stats[index].tx_unicast_pkts= packets; - } else if (strcmp(field_name, "/if/tx-broadcast") == 0) { - stats[index].tx_broadcast_pkts= packets; - } else if (strcmp(field_name, "/if/rx") == 0) { - stats[index].rx_bytes = bytes; - } else if (strcmp(field_name, "/if/rx-multicast") == 0) { - stats[index].rx_multicast_pkts= packets; - } else if (strcmp(field_name, "/if/rx-unicast") == 0) { - stats[index].rx_unicast_pkts= packets; - } else if (strcmp(field_name, "/if/rx-broadcast") == 0) { - stats[index].rx_broadcast_pkts= packets; - } -} -stat_segment_data_t* get_statistics_dump() { - u8 **patterns = 0; - u32 *dir; - u8 * stat_segment_name = (u8 *) STAT_SEGMENT_SOCKET_FILE; - vec_add1(patterns, (u8*)"/if/rx"); - vec_add1(patterns, (u8*)"/if/tx"); - int rv = stat_segment_connect((char*)stat_segment_name); - if (rv < 0) { - fprintf(stderr, "Couldn't connect to %s. Check if socket exists/permissions.(ret stat: %d)\n", - stat_segment_name, rv); - return NULL; - } - dir = stat_segment_ls(patterns); - return stat_segment_dump(dir); -} - -JNIEXPORT jobjectArray JNICALL Java_io_fd_jvpp_stats_JVppClientStatsImpl_interfaceStatisticsDump(JNIEnv *env, - jclass jclazz) { - - stat_segment_data_t *res; - int i, j, k, interface_count; - - res = get_statistics_dump(); - if (res == NULL) { - fprintf (stderr, "Interface Statistics dump failed.\n"); - return NULL; - } - - if (vec_len (res) > 0) { - if ((res[0].simple_counter_vec != 0) && (vec_len (res[0].simple_counter_vec) > 0)) { - interface_count = vec_len (res[0].simple_counter_vec[0]); - } else if ((res[0].combined_counter_vec != 0) && (vec_len (res[0].combined_counter_vec) > 0)) { - interface_count = vec_len (res[0].combined_counter_vec[0]); - } - } - int_stats_t ifc_stats[interface_count]; - memset(ifc_stats, 0, interface_count*sizeof(int_stats_t)); - - for (i = 0; i < vec_len (res); i++) - { - switch (res[i].type) - { - case STAT_DIR_TYPE_COUNTER_VECTOR_SIMPLE: - if (res[i].simple_counter_vec == 0) - continue; - for (k = 0; k < vec_len (res[i].simple_counter_vec); k++) - for (j = 0; j < vec_len (res[i].simple_counter_vec[k]); j++) { - set_field(ifc_stats, j, res[i].name, res[i].simple_counter_vec[k][j], 0); - } - break; - - case STAT_DIR_TYPE_COUNTER_VECTOR_COMBINED: - if (res[i].combined_counter_vec == 0) - continue; - for (k = 0; k < vec_len (res[i].combined_counter_vec); k++) - for (j = 0; j < vec_len (res[i].combined_counter_vec[k]); j++) { - set_field(ifc_stats, j, res[i].name, res[i].combined_counter_vec[k][j].packets, - res[i].combined_counter_vec[k][j].bytes); - } - break; - - default: - ; - } - } - stat_segment_data_free (res); - - jobjectArray retArray; - jclass ifcStatsClass = (*env)->FindClass(env, "io/fd/jvpp/stats/dto/InterfaceStatistics"); - retArray= (jobjectArray)(*env)->NewObjectArray(env, interface_count,ifcStatsClass, NULL); - jmethodID constructor = (*env)->GetMethodID(env, ifcStatsClass, "<init>", "(IIIIIIIIIII)V"); - - for (int i = 0; i < interface_count; i++) { - jobject newClientObj = (*env)->NewObject(env, ifcStatsClass, constructor, i, - ifc_stats[i].tx_errors, ifc_stats[i].tx_multicast_pkts, ifc_stats[i].tx_unicast_pkts, - ifc_stats[i].tx_broadcast_pkts, ifc_stats[i].tx_bytes, ifc_stats[i].rx_errors, ifc_stats[i].rx_multicast_pkts, - ifc_stats[i].rx_unicast_pkts, ifc_stats[i].rx_broadcast_pkts, ifc_stats[i].rx_bytes); - (*env)->SetObjectArrayElement(env,retArray,i,newClientObj); - } - return retArray; -} diff --git a/java/jvpp-stats/jvpp_stats.h b/java/jvpp-stats/jvpp_stats.h deleted file mode 100644 index 7014101..0000000 --- a/java/jvpp-stats/jvpp_stats.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2019 PANTHEON.tech. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef PROJECT_JVPP_STATS_H -#define PROJECT_JVPP_STATS_H - -#endif //PROJECT_JVPP_STATS_H - - -typedef struct interface_statistics{ - int rx_errors; - int rx_bytes; - int rx_unicast_pkts; - int rx_broadcast_pkts; - int rx_multicast_pkts; - int tx_errors; - int tx_bytes; - int tx_unicast_pkts; - int tx_broadcast_pkts; - int tx_multicast_pkts; -} int_stats_t; - -int_stats_t interface_statistics __attribute__((aligned (64))); |