Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ksysguard: remove redundant /etc/mtab watch

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-02-20 00:00:48 +02:00
parent 59960da7d3
commit 0e2c00c3a1
3 changed files with 0 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ksysguard/ksysguardd/CMakeLists.txt
View file

@ -12,10 +12,6 @@ add_definitions( -DKSYSGUARDDRCFILE="\\"${KDE4_SYSCONF_INSTALL_DIR}/ksysguarddrc
macro_optional_find_package(Sensors)
macro_bool_to_01(SENSORS_FOUND HAVE_LMSENSORS)
check_include_files(sys/inotify.h SYS_INOTIFY_H_FOUND)
macro_bool_to_01(SYS_INOTIFY_H_FOUND HAVE_SYS_INOTIFY_H)
configure_file(config-ksysguardd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysguardd.h)
if(${CMAKE_SYSTEM_NAME} MATCHES "(Linux|GNU)")

1
ksysguard/ksysguardd/config-ksysguardd.h.cmake
View file

@ -1,3 +1,2 @@
#cmakedefine HAVE_LMSENSORS 1
#cmakedefine HAVE_XRES 1
#cmakedefine HAVE_SYS_INOTIFY_H 1

32
ksysguard/ksysguardd/ksysguardd.c
View file

@ -45,10 +45,6 @@
#include "ksysguardd.h"
#ifdef HAVE_SYS_INOTIFY_H
#include <sys/inotify.h>
#endif
#define CMDBUFSIZE 128
#define MAX_CLIENTS 100
@ -534,16 +530,6 @@ char* escapeString( char* string ) {
return result;
}
#ifdef HAVE_SYS_INOTIFY_H
static void setupInotify(int *mtabfd) {
(*mtabfd) = inotify_init ();
if ((*mtabfd) >= 0) {
int wd = inotify_add_watch ((*mtabfd), "/etc/mtab", IN_MODIFY | IN_CREATE | IN_DELETE);
if(wd < 0) (*mtabfd) = -1; /* error setting up inotify watch */
}
}
#endif
int main( int argc, char* argv[] )
{
fd_set fds;
@ -570,24 +556,12 @@ int main( int argc, char* argv[] )
ServerSocket = 0;
}
#ifdef HAVE_SYS_INOTIFY_H
/* Monitor mtab for changes */
int mtabfd = 0;
setupInotify(&mtabfd);
#endif
struct timeval now;
struct timeval last;
gettimeofday( &last, NULL );
while ( !QuitApp ) {
int highestFD = setupSelect( &fds );
#ifdef HAVE_SYS_INOTIFY_H
if(mtabfd >= 0)
FD_SET( mtabfd, &fds);
if(mtabfd > highestFD) highestFD = mtabfd;
#endif
/* wait for communication or timeouts */
int ret = select( highestFD + 1, &fds, NULL, NULL, NULL );
if(ret >= 0) {
@ -597,12 +571,6 @@ int main( int argc, char* argv[] )
checkModules();
last = now;
}
#ifdef HAVE_SYS_INOTIFY_H
if(mtabfd >= 0 && FD_ISSET(mtabfd, &fds)) {
close(mtabfd);
setupInotify(&mtabfd);
}
#endif
handleSocketTraffic( ServerSocket, &fds );
}
}