From: Mateusz Moscicki Date: Tue, 25 Feb 2020 14:07:17 +0000 (+0100) Subject: Remove session agent X-Git-Tag: submit/tizen/20200310.123145~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F87%2F226287%2F7;p=platform%2Fcore%2Fsystem%2Fdumpsys.git Remove session agent Change-Id: I26a6394635130eabad8aaedd5b0ecd9fa11ff6a2 --- diff --git a/packaging/dumpsys.spec b/packaging/dumpsys.spec index eb38823..79f32a6 100644 --- a/packaging/dumpsys.spec +++ b/packaging/dumpsys.spec @@ -74,9 +74,6 @@ rm -rf %{buildroot} mkdir -p %{buildroot}/%{_unitdir}/basic.target.wants/ ln -s ../dumpsys-service.service %{buildroot}/%{_unitdir}/basic.target.wants/dumpsys-service.service -mkdir -p %{buildroot}/%{_unitdir_user}/delayed.target.wants/ -ln -s ../dumpsys-session-agent.service %{buildroot}/%{_unitdir_user}/delayed.target.wants/dumpsys-session-agent.service - %files %license LICENSE %manifest %{name}.manifest @@ -85,14 +82,10 @@ ln -s ../dumpsys-session-agent.service %{buildroot}/%{_unitdir_user}/delayed.tar %{_bindir}/dumpsys %{_libdir}/libdumpsys.so.* %{_bindir}/dumpsys-service -%{_bindir}/dumpsys-session-agent -%{_libdir}/libdumpsys-agent.so.* %defattr(0655,root,root) %{_unitdir}/basic.target.wants/dumpsys-service.service %{_unitdir}/dumpsys-service.service -%{_unitdir_user}/delayed.target.wants/dumpsys-session-agent.service -%{_unitdir_user}/dumpsys-session-agent.service %{_libdir}/tmpfiles.d/dumpsys-run.conf %{_sysconfdir}/dbus-1/system.d/dumpsys-service.conf %{_sysconfdir}/dbus-1/system.d/dumpsys-agent.conf @@ -101,7 +94,6 @@ ln -s ../dumpsys-session-agent.service %{buildroot}/%{_unitdir_user}/delayed.tar %manifest %{name}.manifest %{_includedir}/libdumpsys.h %{_libdir}/libdumpsys.so -%{_libdir}/libdumpsys-agent.so %{_libdir}/pkgconfig/dumpsys.pc %files -n libdumpsys-system @@ -132,6 +124,5 @@ ln -s ../dumpsys-session-agent.service %{buildroot}/%{_unitdir_user}/delayed.tar %{_libdir}/dumpsys_system_tests/utils/test-app %{_libdir}/dumpsys_system_tests/run.sh %{_libdir}/dumpsys_system_tests/dumpsys_system/dumpsys_system.sh -%{_libdir}/dumpsys_system_tests/dumpsys_session/dumpsys_session.sh %{_libdir}/dumpsys_system_tests/dumpsys_notfound/dumpsys_notfound.sh %endif diff --git a/src/agent/CMakeLists.txt b/src/agent/CMakeLists.txt index 54aa7a0..a510127 100644 --- a/src/agent/CMakeLists.txt +++ b/src/agent/CMakeLists.txt @@ -4,7 +4,6 @@ PROJECT(DUMPSYS_AGENT C) INCLUDE(GNUInstallDirs) INCLUDE(FindPkgConfig) -SET(AGENT_BIN "dumpsys-session-agent") SET(AGENT_LIB "libdumpsys-agent") find_package(PkgConfig REQUIRED) @@ -25,20 +24,11 @@ ENDFOREACH(flag) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -Wextra -Werror -fPIE -Wno-unused-function -Wno-unused-const-variable") -ADD_LIBRARY(${AGENT_LIB} SHARED libdumpsys-agent.c) +ADD_LIBRARY(${AGENT_LIB} STATIC libdumpsys-agent.c) TARGET_LINK_LIBRARIES(${AGENT_LIB} PUBLIC ${libagent_pkgs_LIBRARIES}) SET_TARGET_PROPERTIES(${AGENT_LIB} PROPERTIES SOVERSION 1 OUTPUT_NAME dumpsys-agent) -LINK_DIRECTORIES(${CMAKE_BINARY_DIR}) -ADD_EXECUTABLE(${AGENT_BIN} dumpsys-agent.c) -TARGET_LINK_LIBRARIES(${AGENT_BIN} PUBLIC ${AGENT_LIB}) - -INSTALL (TARGETS ${AGENT_BIN} DESTINATION ${CMAKE_INSTALL_BINDIR} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE) -INSTALL (TARGETS ${AGENT_LIB} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) INSTALL (FILES dumpsys-agent.conf DESTINATION /etc/dbus-1/system.d/ - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE) -INSTALL (FILES dumpsys-session-agent.service DESTINATION /usr/lib/systemd/user/ - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE) + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE) diff --git a/src/agent/dumpsys-agent.c b/src/agent/dumpsys-agent.c deleted file mode 100644 index 07b27d9..0000000 --- a/src/agent/dumpsys-agent.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2019-2020 Samsung Electronics Co., Ltd. All rights reserved. - * - * 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 -#include -#include -#include "libdumpsys-agent.h" - -int main() -{ - int result = EXIT_SUCCESS; - GMainLoop *loop = g_main_loop_new(NULL, false); - - assert(loop); - - if (!dumpsys_agent_run(loop, G_BUS_TYPE_SESSION)) { - result = EXIT_FAILURE; - goto out; - } - - g_main_loop_run(loop); -out: - dumpsys_agent_stop(); - g_main_loop_unref(loop); - - return result; -} diff --git a/src/agent/dumpsys-session-agent.service b/src/agent/dumpsys-session-agent.service deleted file mode 100644 index 4dff996..0000000 --- a/src/agent/dumpsys-session-agent.service +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Dumpsys agent -After=dbus.socket - -[Service] -ExecStart=/usr/bin/dumpsys-session-agent diff --git a/src/client-api/dumpsys-user.c b/src/client-api/dumpsys-user.c index 5fbf5e4..488f85f 100644 --- a/src/client-api/dumpsys-user.c +++ b/src/client-api/dumpsys-user.c @@ -273,11 +273,6 @@ static bool register_object(GDBusConnection *conn) return true; } -static GBusType get_bus_type() -{ - return (getuid() == 0) ? G_BUS_TYPE_SYSTEM : G_BUS_TYPE_SESSION; -} - static bool dbus_init() { introspection_data = g_dbus_node_info_new_for_xml(introspection_xml, NULL); @@ -288,8 +283,7 @@ static bool dbus_init() GError *error = NULL; - GBusType default_bus_type = get_bus_type(); - connection = g_bus_get_sync(default_bus_type, NULL, &error); + connection = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error); if (!connection || error != NULL) { LOGE("connect to the bus error: %s", error ? error->message : "(none)"); diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt index 6d443c1..78c4e2f 100644 --- a/src/service/CMakeLists.txt +++ b/src/service/CMakeLists.txt @@ -28,7 +28,7 @@ LINK_DIRECTORIES(${CMAKE_BINARY_DIR}) LINK_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/agent) ADD_EXECUTABLE(dumpsys-service ${DUMPSYS_SERVICE}) ADD_DEPENDENCIES(dumpsys-service libdumpsys-agent) -TARGET_LINK_LIBRARIES(dumpsys-service PUBLIC ${dumpsys_service_pkgs_LIBRARIES} -ldumpsys-agent) +TARGET_LINK_LIBRARIES(dumpsys-service PUBLIC ${dumpsys_service_pkgs_LIBRARIES} libdumpsys-agent) INSTALL (TARGETS dumpsys-service DESTINATION ${CMAKE_INSTALL_BINDIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE) diff --git a/tests/system/CMakeLists.txt b/tests/system/CMakeLists.txt index 868a82f..4e5a7d6 100644 --- a/tests/system/CMakeLists.txt +++ b/tests/system/CMakeLists.txt @@ -17,7 +17,6 @@ macro(CONFIGURE_TEST test_name) endmacro() configure_test("dumpsys_system") -configure_test("dumpsys_session") configure_test("dumpsys_notfound") configure_file("run.sh.template" "run.sh" @ONLY) diff --git a/tests/system/dumpsys_session/dumpsys_session.sh.template b/tests/system/dumpsys_session/dumpsys_session.sh.template deleted file mode 100644 index 3612a6f..0000000 --- a/tests/system/dumpsys_session/dumpsys_session.sh.template +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# dumpsys session bus test - -if [ -z "${DUMPSYS_SYSTEM_TESTS}" ]; then - DUMPSYS_SYSTEM_TESTS="@DUMPSYS_SYSTEM_TESTS_PATH@" -fi - -. ${DUMPSYS_SYSTEM_TESTS}/utils/dumpsys-utils.sh - -APP_NAME=apka -MESSAGE="some message" -ARG1="-some arg 1" -ARG2="--some arg 2" -OUTPUT_FILE=/tmp/dumpsys_output -APP_PID=0 - -cleanup() -{ - if [[ ${APP_PID} != 0 ]]; then - kill ${APP_PID} - fi - - rm -f "${OUTPUT_FILE:?}" -} - -trap cleanup 0 - -su -c "${DUMPSYS_SYSTEM_TESTS}/utils/test-app \"${APP_NAME}\" \"${MESSAGE}\"" -l owner > ${OUTPUT_FILE} & -APP_PID=${!} -sleep 1 -RESULT=`dumpsys ${APP_NAME} -- "${ARG1}" "${ARG2}"` - -check "${MESSAGE}" - -RESULT=`cat ${OUTPUT_FILE}` - -check "${ARG1}" -check "${ARG2}" - -exit_ok