Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-18 02:55:12 +00:00
Code Issues Releases Activity
50a4aa25ab
conky/cmake/ConkyPlatformChecks.cmake

492 lines
16 KiB
CMake
Raw Normal View History

Add missing copyright notices.
2010-01-01 23:49:41 +00:00
#
# Conky, a system monitor, based on torsmo
#
# Please see COPYING for details
#
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
# Copyright (c) 2005-2018 Brenden Matthews, et. al. (see AUTHORS)
Add missing copyright notices.
2010-01-01 23:49:41 +00:00
# All rights reserved.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
More work on CMake stuff, add missing files. Also updated gitignore.
2009-12-05 21:04:31 +00:00
More CMake build work, added Lua support.
2009-12-06 02:45:26 +00:00
include(FindPkgConfig)
More CMake work.
2009-12-08 04:46:49 +00:00
include(CheckFunctionExists)
Fixes typo in ConkyPlatformChecks Fixes #162 by changing CheckInlcudeFile to CheckIncludeFiles so that CMake can correctly include the module. Change calls to check_include_file to check_include_files.
2015-11-16 17:57:43 +00:00
include(CheckIncludeFiles)
Fix linking error: clock_gettime not found I decided to reimplement AC_SEARCH_LIB from autotools in the process, as I consider it a very nifty feature.
2011-09-30 21:01:24 +00:00
include(CheckSymbolExists)
More CMake build work, added Lua support.
2009-12-06 02:45:26 +00:00
More CMake work.
2009-12-08 04:46:49 +00:00
# Check for some headers
More work on CMake stuff, add missing files. Also updated gitignore.
2009-12-05 21:04:31 +00:00
check_include_files(sys/statfs.h HAVE_SYS_STATFS_H)
check_include_files(sys/param.h HAVE_SYS_PARAM_H)
More CMake build work, added Lua support.
2009-12-06 02:45:26 +00:00
check_include_files(sys/inotify.h HAVE_SYS_INOTIFY_H)
Minor build fixes.
2009-12-08 05:16:11 +00:00
check_include_files(dirent.h HAVE_DIRENT_H)
More work on CMake stuff, add missing files. Also updated gitignore.
2009-12-05 21:04:31 +00:00
More CMake work.
2009-12-08 04:46:49 +00:00
# Check for some functions
check_function_exists(strndup HAVE_STRNDUP)
Emulate O_CLOEXEC on systems that don't support it
2011-10-01 20:18:25 +00:00
check_symbol_exists(pipe2 "unistd.h" HAVE_PIPE2)
check_symbol_exists(O_CLOEXEC "fcntl.h" HAVE_O_CLOEXEC)
Basic macOS support (#480) * Initial patches for Darwin support * cmake files ready for building on Sierra. Dont know about other OSX versions * Added darwin.h which will contain darwin specific headers * Patches for enablin asprintf support (needs _POSIX_C_SOURCE >= __DARWIN_C_FULL so remove -D_POSIX_C_SOURCE=200809L). What is more, -D_LARGEFILE64_SOURCE is used by default so not needed on macOS * Stubs for get_entropy_avail and get_entropy_poolsize * More progress to getting to build * More patches * Now builds, remains fixing linking errors. Also implemented some functions * Now links * Now conky runs without sigabrt()'ing... An exception in semaphore.hh caused it to crash immediately upon initialisation * README changes * This was based on an old attempt I did with porting conky where I hadn't cloned the repo and thus it showed 3166 commits behind * Patched a bit the semaphore.hh and now conky runs at 0.7% CPU usage and not in 100% or 200% as it did before! Yeah * This update fixes swap-related miscalculations, though: On macOS there can be used MANY swapfiles ( NOT swap partitions,,, the installation disk is the partition for storing swap memory data ) Thus conky code must be updated for Darwin to support multi-swapfile usage stats. For now, we default to showing stats for swapfile0 * Fixed a bit the comments so they make sense * Realised that the sysctl code can give us stats for the whole swap storage so removed the swapmode( int swapfd, unsigned long * retvail, unsigned long * retfree ) * I think the code is in good condition now * semaphore.hh: Implemented ~semaphore() and added throwing exception when sem initialisation fails just like in sem() for linux… darwin.cc: partially implemented update_cpu_usage() and update_total_processes() * Implements update_total_processes() ( Now it finds the correct number of tasks ) the changes in cmake file don’t change the functionality… It is only comments. In upcoming updates lua support may be enabled and the comments are related to lua support. * get_cpu_count() now conforms to newer sysctl code as suggested by Apple ( we use hw.logicalcpumax instead of hw.ncpus ) --> The new implementation of get_cpu_count() finds the the max value of logical cores the mac could use on a boot. update_total_processes() was patched to allow initialising only ONCE when conky runs the machHost and processorSet ( this could probably be implemented in a better way I guess though... ) * patch * experimental support for get_top_info() and update_cpu_usage() :) * going to patch stuff * adds getting rss memory in get_top_info() * fixes * Couple things made more beautiful but too many things to fix ... * Remove unneeded code from darwin_soundcard.h and keep only needed to compile ( This way we are compatible to GPLv3, i think ) Include GPLv3 header in darwin.cc, darwin.h and darwin_soundcard.h Add more beautiful and explanatory comments to ease the work of other contributors… ( Mostly on things that don’t work! ) * Merged the macOS update_cpu_usage() implementation with the linux implementation but still it doesn't work as expected, plus, there are more memory related problems that will be fixed in newer release! NOTE: It will be really good to see how functions are implemented on linux.cc for more complete implementation * Now using a more linux-influenced implementation and dropping the old... ( only keeps mach stuff ) Needs some more work though to print accurate percentage! :) * Add conky installer (.pkg) project * Now gets thread count aswell! For now, we get this from update_total_processes... Also, removed the installer project because I need to learn more the software * Properly get thread count! - Patched core.cc to enable getting threads count on macOS! - Cleanup in darwin.cc * sort out some things in the code: - running_threads_count is not the same as thread_count on macOS! There is actually a difference! Correct a bit the code! * Enable the if_mounted command and start implementing the check_mount function in darwin.cc * Tighten things up * This patch makes conky build easily and without patching on any supported macOS version! The new flag introduced is a temporary solution for allowing conky to compile on other OS without tweaking the cmake files. If you want to compile it with i18l support you will have to run the command: brew link gettext after you install gettext * Update README to provide more complete info on building on macOS * Fix * patch check_mounted + SIP status This commit: - patches check_mounted function to match the implementation found in FreeBSD.cc! Now conky expects typing something like this: conky -t '${if_mounted /Volumes/MacOS} ${endif}' Please note that the correct way is "/Volumes/MacOS", not "/Volumes/MacOS/" ! You shouldnt put the backslash at the end... It will not work! - Adds a new command called sip_status which you can use to make conky show System Integrity Protection related information such as if filesystem protection is enabled, if user approved kexts protection is enabled and more... you can type conky -t '$sip_status' to see what it does... ( I will most likely update some things later regarding sip_status and check_mounted ) * Further implement sip_status sip_status now has different functionality! If you give no arguments it shows whether SIP is enabled or disabled ( generally ) If you give argument ( takes only ONE ) you can specify which specific thing of SIP you want to show status for... You need to pass 0, 1, ..., 9 to $sip_status as argument to print status for apple-internal, untrusted-kexts, and more... Below you can see the list: ARG: RESULT: nothing --> print enabled / disabled 0 --> allow_apple_internal 1 --> allow_untrusted_kexts 2 --> allow_task_for_pid 3 --> allow_unrestricted_fs 4 --> allow_kernel_debugger 5 --> allow_unrestricted_dtrace 6 --> allow_unrestricted_nvram 7 --> allow_device_configuration 8 --> allow_any_recovery_os 9 --> allow_user_approved_kexts * sip_status progress & if_up enabled This commit adds the 'a' argument for $sip_status which checks if the SIP configuration is ok or it is likely to break in the future. Also, enabled the $if_up command, but there are some problems with it... * sip_status patches - Updated code based on newest version of csrstat utility (v.1.8) The 1.8 version fixes a problem in finding status of ALLOW_DEVICE_CONFIGURATION flag. - Fixed a bug where we mistakenly printed 'disabled' even when SIP was enabled. * Disable ncurses checks in a way that will allow compiling for other OSes! ( it was a really quick patch before ) * More changes in cmake file to make code prettier and more exact * More cmake files cuteness * work for supporting versions prior Sierra This patch brings more compatibility with versions prior to Sierra. The project as is nearly links on a 10.9.5 OSX installation. - on versions prior Sierra clock_gettime() is not implemented thus we need to provide our own implementation for conky to work. ( Currently we have minimal support, more studying needs to be done ) NOTE: In order to compile on versions as old as Mavericks you will need newer compilers because command line tools for 10.9.5 dont support some C++11 features... For this I donwloaded the commandline tools for Xcode 8.1 ( or 8 dont remember well ) and installed only the CommandLine Tools section with Pacifist! ( The OSX installer sees the OS as too old, so you need pacifist! ) * Oops * $if_mounted ready This patch removes the unneded print_mounted() function! Also cleanup code. * $if_up works I think $if_up command works therefore remove the APPLE specific code in core.cc ( there wasnt anything different anyway ) and use the FreeBSD code. Minor conky output changes in darwin.cc * fix compatibility with Mavericks and before... This update allows conky to be compiled on Mavericks and before by checking at compilation time what our build target is. If it is Mavericks or lower, then cant use the csr_get_active_config func because it is not available. On higher versions than Mavericks it works as before... NOTE: For compiling on Mavericks or lower you will have to write 10.9 in CMAKE_OSX_DEPLOYMENT_TARGET when you run ccmake * Added link for youtube video showing conky running on macOS * Improvements Minor improvements related to style Removed unneeded free() calls * Simplify Xcode configuration process! :) * Removed update_cpu_usage() implementation It was quite buggy so I removed it... * Cleanup the source code 1. Bogus TODO comments have been deleted! 2. Started using DEBUG_MODE based printf 3. Explain some things better/cleanup * Last small cleanup The TODO in get_from_load_info() was unneeded. Removed! Also, DEBUG_MODE is enabled for now... * update authors file * Improve README Make it more clean and easier to understand. * Update README.md small tweak * Work for conforming with "Development" rules 1. Add to variables.xml documentation about the $sip_status variable. 2. Add sip_status variable to conkyrc.vim and nanorc to allow highlighting 3. the friends in darwin.cc is ambiguous,,, some are more than friends. * First patch set that implements get_top_info() :) * Calculate cpu usage of all processes more efficiently. (Now results match Activity Monitor's results a lot!!!) More info about the get_top_info() implementation will come once I finish it! (soon) * Cleanup patch! o Move a couple things to better places o Rename get_sample() to get_cpu_sample() to allow to be used by different functions such as get_cpu_usage() ( this is a scene from the future... ) o Improve the way we get cpu usage for each process by passing the already created proc_taskinfo struct to the appropriate function instead of creating another one inside it! * Correctly enable $running_processes variable In our implementation update_top() doesn't calculate the count of running processes! We assign this functionality to the update_running_processes() function. * Removed unneeded flag This is not needed because we do not use update_top() for getting the number of running processes! * Update README.md * Update README.md This adds support for TravisCL. Though this will compile the project only on Linux it is a good sign to know if our port still can compile on Linux or we have broken things. It seems like it can't but I suspect the problem existed before my patches. I will investigate. * First patch towards implementing #15 This patch a reworked get_top_info(). We now use the function get_top_info_for_kinfo_proc() to set the contents of each |process| struct. Also, we calculate the total cpu usage and total process usage concurrently using GCD. Aside from these we bring the function helper_get_proc_list() which makes the code simpler and cleaner. * First fix for the algorithm that calculates % CPU usage of a process The previous patch made the algorithm buggy. It required more reentrant-safe functions. Make calc_cpu_total_r() which is a more reentrant-safe reimplementation of the calc_cpu_total() function. This is not the last commit, more are coming in the future. * Previous commit wasn't pushed... * Problems committing * Make the code cleaner but break the algorithm again #15 The algorithm doesn't work... It is a work in progress! But this time we have merged the cpu_info and cpusample into one struct called cpusample ( I copied some variables from the linux implementation but they will probably be removed ) * Rework the code a bit / CPU usage % algorithm still doesn't work Now get_from_load_info() is renamed to helper_update_threads_processes() and is called by both update_threads() and update_total_processes() This makes the code nicer and removes the enum with the flags * cleanup remove unneeded functions, remove unneeded variables * bugfix * bugfix * remove the whole get_top_info() code! I will rework a lot this code so we can get rid of it. * Work for #15 Now we use the ultimate solution for calculating % usage of CPU of a process! Check the #15 Issue for information about this patch! * Quick memory leak fix & some patches for the get_top_info algorithm * quick patch for semaphore class * Update the comments * For consistency * temp * Revert "Merge branch 'master' into update_cpu_usage" This reverts commit 7267a515c40d54b85107e51016703e6c10f3183e, reversing changes made to 2190ff0b51463c12c61b3357cf846b8e705ebeb4. * Revert "Revert "Merge branch 'master' into update_cpu_usage"" This reverts commit 692bd27a3adb2fe7027d65932467a140e42cc7bc. * Partially implement the overall % CPU usage * bug fix: I meant procs and threads! * make the code better part1 * cleanup * Stabilise the values of get_cpu_sample(). Affects get_top_info() and update_cpu_usage() ( fixes #13 and #15 ) For some reason the code that used host_statistics() function didn't produced bad values quite often. Replaced the function with host_processor_info() and changed the algorithm and now the values are correct! This affects the get_top_info() and update_cpu_usage() functions which wouldn't work correctly until now. * Finish the optimised version of get_top_info() Fixes #15 * Quick fix for #16 Probably I will come up with a different location for get_cpu_count() because I want to conform to linux implementation. Also, the memory leak I am mentioning in get_cpu_count() may not actually exist, as I suspected in the back of my head. * Strictness * Cleanup ConkyPlatformChecks.cmake Cleanup the quick patch code for Lua. * Add warning to README If you are using old version of cmake, update it. It will probably have problems when trying to locate lua. * More cleanup * Fix identation This simplifies the diff. Also, note that by merging the new code for checking for NCURSES we acheive better compatibility and easy build process * Remove mixer related patches and files With the newest patches from upstream, cmake checks if the header soundcard.h exists on the system. If it doesn't exist (in the case of macOS for example) all mixer-related variables are disabled. * Changes for using as submodule for ConkyX * Fixes * Implement get_freq This implements #11 Though it doesn't support getting the **current** cpu frequency. I haven't found a way to do it on macOS but i guess it can be done using a kernel extension. I may come back to this again in the future * First work for correcting mem stats #6 Incorporate the update_pages_stolen() function and all of its dependencies. I will see if I can patch the code in order to avoid license problems * Work for #6 Now we follow the way apple's top works and not Activity Monitor. For this reason we find different values. But correct based on top. * cleanup for #6 * bug fix 1 * cleanup * hmm sorry * More cleanup - Move the libtop_tsamp_t object to darwin.cc. - Remove unneeded member variables. * A bit documentation * Implement secondary memory stats #6 Implement memwithbuffers, memeasyfree and memfree (which isn't secondary) * Quit update_meminfo if libtop_tsamp_update_vm_stats() failed * Update README.md Revert to original conky readme Move all macOS related information to the Wiki: https://github.com/Conky-for-macOS/conky-for-macOS/wiki * Alot junk slipped in too! * Merge net_stats branch For now, I have only tested up / down bytes count on en0, and it works. This is for #14 * Corrections - Fix License headers in darwin* files - Remove ConkyX entry from .gitignore which slipped into from the "forConkyX" branch which was used for another project ... ConkyX. - Cleanup top.h (I will request the changes in a pull request finally) * Fix identation and cleanup * identation-fixes part1 * Try to fix problem compiling on linux Improve checks for headers in ConkyPlatformChecks.cmake to amend the problem; I mistakenly thought that statfs64 wasn't available in sys/statfs.h in macOS thus I tried to add platform specific code. Though, I add the checks in the wrong place and also messed up linux-specific code by replacing checks_include sys/statfs with check_symbol_exists statfs64 * attemp to completely fix linux problem!
2018-05-07 11:27:32 +00:00
if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
check_symbol_exists(statfs64 "sys/mount.h" HAVE_STATFS64)
Basic macOS support (#480) * Initial patches for Darwin support * cmake files ready for building on Sierra. Dont know about other OSX versions * Added darwin.h which will contain darwin specific headers * Patches for enablin asprintf support (needs _POSIX_C_SOURCE >= __DARWIN_C_FULL so remove -D_POSIX_C_SOURCE=200809L). What is more, -D_LARGEFILE64_SOURCE is used by default so not needed on macOS * Stubs for get_entropy_avail and get_entropy_poolsize * More progress to getting to build * More patches * Now builds, remains fixing linking errors. Also implemented some functions * Now links * Now conky runs without sigabrt()'ing... An exception in semaphore.hh caused it to crash immediately upon initialisation * README changes * This was based on an old attempt I did with porting conky where I hadn't cloned the repo and thus it showed 3166 commits behind * Patched a bit the semaphore.hh and now conky runs at 0.7% CPU usage and not in 100% or 200% as it did before! Yeah * This update fixes swap-related miscalculations, though: On macOS there can be used MANY swapfiles ( NOT swap partitions,,, the installation disk is the partition for storing swap memory data ) Thus conky code must be updated for Darwin to support multi-swapfile usage stats. For now, we default to showing stats for swapfile0 * Fixed a bit the comments so they make sense * Realised that the sysctl code can give us stats for the whole swap storage so removed the swapmode( int swapfd, unsigned long * retvail, unsigned long * retfree ) * I think the code is in good condition now * semaphore.hh: Implemented ~semaphore() and added throwing exception when sem initialisation fails just like in sem() for linux… darwin.cc: partially implemented update_cpu_usage() and update_total_processes() * Implements update_total_processes() ( Now it finds the correct number of tasks ) the changes in cmake file don’t change the functionality… It is only comments. In upcoming updates lua support may be enabled and the comments are related to lua support. * get_cpu_count() now conforms to newer sysctl code as suggested by Apple ( we use hw.logicalcpumax instead of hw.ncpus ) --> The new implementation of get_cpu_count() finds the the max value of logical cores the mac could use on a boot. update_total_processes() was patched to allow initialising only ONCE when conky runs the machHost and processorSet ( this could probably be implemented in a better way I guess though... ) * patch * experimental support for get_top_info() and update_cpu_usage() :) * going to patch stuff * adds getting rss memory in get_top_info() * fixes * Couple things made more beautiful but too many things to fix ... * Remove unneeded code from darwin_soundcard.h and keep only needed to compile ( This way we are compatible to GPLv3, i think ) Include GPLv3 header in darwin.cc, darwin.h and darwin_soundcard.h Add more beautiful and explanatory comments to ease the work of other contributors… ( Mostly on things that don’t work! ) * Merged the macOS update_cpu_usage() implementation with the linux implementation but still it doesn't work as expected, plus, there are more memory related problems that will be fixed in newer release! NOTE: It will be really good to see how functions are implemented on linux.cc for more complete implementation * Now using a more linux-influenced implementation and dropping the old... ( only keeps mach stuff ) Needs some more work though to print accurate percentage! :) * Add conky installer (.pkg) project * Now gets thread count aswell! For now, we get this from update_total_processes... Also, removed the installer project because I need to learn more the software * Properly get thread count! - Patched core.cc to enable getting threads count on macOS! - Cleanup in darwin.cc * sort out some things in the code: - running_threads_count is not the same as thread_count on macOS! There is actually a difference! Correct a bit the code! * Enable the if_mounted command and start implementing the check_mount function in darwin.cc * Tighten things up * This patch makes conky build easily and without patching on any supported macOS version! The new flag introduced is a temporary solution for allowing conky to compile on other OS without tweaking the cmake files. If you want to compile it with i18l support you will have to run the command: brew link gettext after you install gettext * Update README to provide more complete info on building on macOS * Fix * patch check_mounted + SIP status This commit: - patches check_mounted function to match the implementation found in FreeBSD.cc! Now conky expects typing something like this: conky -t '${if_mounted /Volumes/MacOS} ${endif}' Please note that the correct way is "/Volumes/MacOS", not "/Volumes/MacOS/" ! You shouldnt put the backslash at the end... It will not work! - Adds a new command called sip_status which you can use to make conky show System Integrity Protection related information such as if filesystem protection is enabled, if user approved kexts protection is enabled and more... you can type conky -t '$sip_status' to see what it does... ( I will most likely update some things later regarding sip_status and check_mounted ) * Further implement sip_status sip_status now has different functionality! If you give no arguments it shows whether SIP is enabled or disabled ( generally ) If you give argument ( takes only ONE ) you can specify which specific thing of SIP you want to show status for... You need to pass 0, 1, ..., 9 to $sip_status as argument to print status for apple-internal, untrusted-kexts, and more... Below you can see the list: ARG: RESULT: nothing --> print enabled / disabled 0 --> allow_apple_internal 1 --> allow_untrusted_kexts 2 --> allow_task_for_pid 3 --> allow_unrestricted_fs 4 --> allow_kernel_debugger 5 --> allow_unrestricted_dtrace 6 --> allow_unrestricted_nvram 7 --> allow_device_configuration 8 --> allow_any_recovery_os 9 --> allow_user_approved_kexts * sip_status progress & if_up enabled This commit adds the 'a' argument for $sip_status which checks if the SIP configuration is ok or it is likely to break in the future. Also, enabled the $if_up command, but there are some problems with it... * sip_status patches - Updated code based on newest version of csrstat utility (v.1.8) The 1.8 version fixes a problem in finding status of ALLOW_DEVICE_CONFIGURATION flag. - Fixed a bug where we mistakenly printed 'disabled' even when SIP was enabled. * Disable ncurses checks in a way that will allow compiling for other OSes! ( it was a really quick patch before ) * More changes in cmake file to make code prettier and more exact * More cmake files cuteness * work for supporting versions prior Sierra This patch brings more compatibility with versions prior to Sierra. The project as is nearly links on a 10.9.5 OSX installation. - on versions prior Sierra clock_gettime() is not implemented thus we need to provide our own implementation for conky to work. ( Currently we have minimal support, more studying needs to be done ) NOTE: In order to compile on versions as old as Mavericks you will need newer compilers because command line tools for 10.9.5 dont support some C++11 features... For this I donwloaded the commandline tools for Xcode 8.1 ( or 8 dont remember well ) and installed only the CommandLine Tools section with Pacifist! ( The OSX installer sees the OS as too old, so you need pacifist! ) * Oops * $if_mounted ready This patch removes the unneded print_mounted() function! Also cleanup code. * $if_up works I think $if_up command works therefore remove the APPLE specific code in core.cc ( there wasnt anything different anyway ) and use the FreeBSD code. Minor conky output changes in darwin.cc * fix compatibility with Mavericks and before... This update allows conky to be compiled on Mavericks and before by checking at compilation time what our build target is. If it is Mavericks or lower, then cant use the csr_get_active_config func because it is not available. On higher versions than Mavericks it works as before... NOTE: For compiling on Mavericks or lower you will have to write 10.9 in CMAKE_OSX_DEPLOYMENT_TARGET when you run ccmake * Added link for youtube video showing conky running on macOS * Improvements Minor improvements related to style Removed unneeded free() calls * Simplify Xcode configuration process! :) * Removed update_cpu_usage() implementation It was quite buggy so I removed it... * Cleanup the source code 1. Bogus TODO comments have been deleted! 2. Started using DEBUG_MODE based printf 3. Explain some things better/cleanup * Last small cleanup The TODO in get_from_load_info() was unneeded. Removed! Also, DEBUG_MODE is enabled for now... * update authors file * Improve README Make it more clean and easier to understand. * Update README.md small tweak * Work for conforming with "Development" rules 1. Add to variables.xml documentation about the $sip_status variable. 2. Add sip_status variable to conkyrc.vim and nanorc to allow highlighting 3. the friends in darwin.cc is ambiguous,,, some are more than friends. * First patch set that implements get_top_info() :) * Calculate cpu usage of all processes more efficiently. (Now results match Activity Monitor's results a lot!!!) More info about the get_top_info() implementation will come once I finish it! (soon) * Cleanup patch! o Move a couple things to better places o Rename get_sample() to get_cpu_sample() to allow to be used by different functions such as get_cpu_usage() ( this is a scene from the future... ) o Improve the way we get cpu usage for each process by passing the already created proc_taskinfo struct to the appropriate function instead of creating another one inside it! * Correctly enable $running_processes variable In our implementation update_top() doesn't calculate the count of running processes! We assign this functionality to the update_running_processes() function. * Removed unneeded flag This is not needed because we do not use update_top() for getting the number of running processes! * Update README.md * Update README.md This adds support for TravisCL. Though this will compile the project only on Linux it is a good sign to know if our port still can compile on Linux or we have broken things. It seems like it can't but I suspect the problem existed before my patches. I will investigate. * First patch towards implementing #15 This patch a reworked get_top_info(). We now use the function get_top_info_for_kinfo_proc() to set the contents of each |process| struct. Also, we calculate the total cpu usage and total process usage concurrently using GCD. Aside from these we bring the function helper_get_proc_list() which makes the code simpler and cleaner. * First fix for the algorithm that calculates % CPU usage of a process The previous patch made the algorithm buggy. It required more reentrant-safe functions. Make calc_cpu_total_r() which is a more reentrant-safe reimplementation of the calc_cpu_total() function. This is not the last commit, more are coming in the future. * Previous commit wasn't pushed... * Problems committing * Make the code cleaner but break the algorithm again #15 The algorithm doesn't work... It is a work in progress! But this time we have merged the cpu_info and cpusample into one struct called cpusample ( I copied some variables from the linux implementation but they will probably be removed ) * Rework the code a bit / CPU usage % algorithm still doesn't work Now get_from_load_info() is renamed to helper_update_threads_processes() and is called by both update_threads() and update_total_processes() This makes the code nicer and removes the enum with the flags * cleanup remove unneeded functions, remove unneeded variables * bugfix * bugfix * remove the whole get_top_info() code! I will rework a lot this code so we can get rid of it. * Work for #15 Now we use the ultimate solution for calculating % usage of CPU of a process! Check the #15 Issue for information about this patch! * Quick memory leak fix & some patches for the get_top_info algorithm * quick patch for semaphore class * Update the comments * For consistency * temp * Revert "Merge branch 'master' into update_cpu_usage" This reverts commit 7267a515c40d54b85107e51016703e6c10f3183e, reversing changes made to 2190ff0b51463c12c61b3357cf846b8e705ebeb4. * Revert "Revert "Merge branch 'master' into update_cpu_usage"" This reverts commit 692bd27a3adb2fe7027d65932467a140e42cc7bc. * Partially implement the overall % CPU usage * bug fix: I meant procs and threads! * make the code better part1 * cleanup * Stabilise the values of get_cpu_sample(). Affects get_top_info() and update_cpu_usage() ( fixes #13 and #15 ) For some reason the code that used host_statistics() function didn't produced bad values quite often. Replaced the function with host_processor_info() and changed the algorithm and now the values are correct! This affects the get_top_info() and update_cpu_usage() functions which wouldn't work correctly until now. * Finish the optimised version of get_top_info() Fixes #15 * Quick fix for #16 Probably I will come up with a different location for get_cpu_count() because I want to conform to linux implementation. Also, the memory leak I am mentioning in get_cpu_count() may not actually exist, as I suspected in the back of my head. * Strictness * Cleanup ConkyPlatformChecks.cmake Cleanup the quick patch code for Lua. * Add warning to README If you are using old version of cmake, update it. It will probably have problems when trying to locate lua. * More cleanup * Fix identation This simplifies the diff. Also, note that by merging the new code for checking for NCURSES we acheive better compatibility and easy build process * Remove mixer related patches and files With the newest patches from upstream, cmake checks if the header soundcard.h exists on the system. If it doesn't exist (in the case of macOS for example) all mixer-related variables are disabled. * Changes for using as submodule for ConkyX * Fixes * Implement get_freq This implements #11 Though it doesn't support getting the **current** cpu frequency. I haven't found a way to do it on macOS but i guess it can be done using a kernel extension. I may come back to this again in the future * First work for correcting mem stats #6 Incorporate the update_pages_stolen() function and all of its dependencies. I will see if I can patch the code in order to avoid license problems * Work for #6 Now we follow the way apple's top works and not Activity Monitor. For this reason we find different values. But correct based on top. * cleanup for #6 * bug fix 1 * cleanup * hmm sorry * More cleanup - Move the libtop_tsamp_t object to darwin.cc. - Remove unneeded member variables. * A bit documentation * Implement secondary memory stats #6 Implement memwithbuffers, memeasyfree and memfree (which isn't secondary) * Quit update_meminfo if libtop_tsamp_update_vm_stats() failed * Update README.md Revert to original conky readme Move all macOS related information to the Wiki: https://github.com/Conky-for-macOS/conky-for-macOS/wiki * Alot junk slipped in too! * Merge net_stats branch For now, I have only tested up / down bytes count on en0, and it works. This is for #14 * Corrections - Fix License headers in darwin* files - Remove ConkyX entry from .gitignore which slipped into from the "forConkyX" branch which was used for another project ... ConkyX. - Cleanup top.h (I will request the changes in a pull request finally) * Fix identation and cleanup * identation-fixes part1 * Try to fix problem compiling on linux Improve checks for headers in ConkyPlatformChecks.cmake to amend the problem; I mistakenly thought that statfs64 wasn't available in sys/statfs.h in macOS thus I tried to add platform specific code. Though, I add the checks in the wrong place and also messed up linux-specific code by replacing checks_include sys/statfs with check_symbol_exists statfs64 * attemp to completely fix linux problem!
2018-05-07 11:27:32 +00:00
else(CMAKE_SYSTEM_NAME MATCHES "Darwin")
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
check_symbol_exists(statfs64 "sys/statfs.h" HAVE_STATFS64)
Basic macOS support (#480) * Initial patches for Darwin support * cmake files ready for building on Sierra. Dont know about other OSX versions * Added darwin.h which will contain darwin specific headers * Patches for enablin asprintf support (needs _POSIX_C_SOURCE >= __DARWIN_C_FULL so remove -D_POSIX_C_SOURCE=200809L). What is more, -D_LARGEFILE64_SOURCE is used by default so not needed on macOS * Stubs for get_entropy_avail and get_entropy_poolsize * More progress to getting to build * More patches * Now builds, remains fixing linking errors. Also implemented some functions * Now links * Now conky runs without sigabrt()'ing... An exception in semaphore.hh caused it to crash immediately upon initialisation * README changes * This was based on an old attempt I did with porting conky where I hadn't cloned the repo and thus it showed 3166 commits behind * Patched a bit the semaphore.hh and now conky runs at 0.7% CPU usage and not in 100% or 200% as it did before! Yeah * This update fixes swap-related miscalculations, though: On macOS there can be used MANY swapfiles ( NOT swap partitions,,, the installation disk is the partition for storing swap memory data ) Thus conky code must be updated for Darwin to support multi-swapfile usage stats. For now, we default to showing stats for swapfile0 * Fixed a bit the comments so they make sense * Realised that the sysctl code can give us stats for the whole swap storage so removed the swapmode( int swapfd, unsigned long * retvail, unsigned long * retfree ) * I think the code is in good condition now * semaphore.hh: Implemented ~semaphore() and added throwing exception when sem initialisation fails just like in sem() for linux… darwin.cc: partially implemented update_cpu_usage() and update_total_processes() * Implements update_total_processes() ( Now it finds the correct number of tasks ) the changes in cmake file don’t change the functionality… It is only comments. In upcoming updates lua support may be enabled and the comments are related to lua support. * get_cpu_count() now conforms to newer sysctl code as suggested by Apple ( we use hw.logicalcpumax instead of hw.ncpus ) --> The new implementation of get_cpu_count() finds the the max value of logical cores the mac could use on a boot. update_total_processes() was patched to allow initialising only ONCE when conky runs the machHost and processorSet ( this could probably be implemented in a better way I guess though... ) * patch * experimental support for get_top_info() and update_cpu_usage() :) * going to patch stuff * adds getting rss memory in get_top_info() * fixes * Couple things made more beautiful but too many things to fix ... * Remove unneeded code from darwin_soundcard.h and keep only needed to compile ( This way we are compatible to GPLv3, i think ) Include GPLv3 header in darwin.cc, darwin.h and darwin_soundcard.h Add more beautiful and explanatory comments to ease the work of other contributors… ( Mostly on things that don’t work! ) * Merged the macOS update_cpu_usage() implementation with the linux implementation but still it doesn't work as expected, plus, there are more memory related problems that will be fixed in newer release! NOTE: It will be really good to see how functions are implemented on linux.cc for more complete implementation * Now using a more linux-influenced implementation and dropping the old... ( only keeps mach stuff ) Needs some more work though to print accurate percentage! :) * Add conky installer (.pkg) project * Now gets thread count aswell! For now, we get this from update_total_processes... Also, removed the installer project because I need to learn more the software * Properly get thread count! - Patched core.cc to enable getting threads count on macOS! - Cleanup in darwin.cc * sort out some things in the code: - running_threads_count is not the same as thread_count on macOS! There is actually a difference! Correct a bit the code! * Enable the if_mounted command and start implementing the check_mount function in darwin.cc * Tighten things up * This patch makes conky build easily and without patching on any supported macOS version! The new flag introduced is a temporary solution for allowing conky to compile on other OS without tweaking the cmake files. If you want to compile it with i18l support you will have to run the command: brew link gettext after you install gettext * Update README to provide more complete info on building on macOS * Fix * patch check_mounted + SIP status This commit: - patches check_mounted function to match the implementation found in FreeBSD.cc! Now conky expects typing something like this: conky -t '${if_mounted /Volumes/MacOS} ${endif}' Please note that the correct way is "/Volumes/MacOS", not "/Volumes/MacOS/" ! You shouldnt put the backslash at the end... It will not work! - Adds a new command called sip_status which you can use to make conky show System Integrity Protection related information such as if filesystem protection is enabled, if user approved kexts protection is enabled and more... you can type conky -t '$sip_status' to see what it does... ( I will most likely update some things later regarding sip_status and check_mounted ) * Further implement sip_status sip_status now has different functionality! If you give no arguments it shows whether SIP is enabled or disabled ( generally ) If you give argument ( takes only ONE ) you can specify which specific thing of SIP you want to show status for... You need to pass 0, 1, ..., 9 to $sip_status as argument to print status for apple-internal, untrusted-kexts, and more... Below you can see the list: ARG: RESULT: nothing --> print enabled / disabled 0 --> allow_apple_internal 1 --> allow_untrusted_kexts 2 --> allow_task_for_pid 3 --> allow_unrestricted_fs 4 --> allow_kernel_debugger 5 --> allow_unrestricted_dtrace 6 --> allow_unrestricted_nvram 7 --> allow_device_configuration 8 --> allow_any_recovery_os 9 --> allow_user_approved_kexts * sip_status progress & if_up enabled This commit adds the 'a' argument for $sip_status which checks if the SIP configuration is ok or it is likely to break in the future. Also, enabled the $if_up command, but there are some problems with it... * sip_status patches - Updated code based on newest version of csrstat utility (v.1.8) The 1.8 version fixes a problem in finding status of ALLOW_DEVICE_CONFIGURATION flag. - Fixed a bug where we mistakenly printed 'disabled' even when SIP was enabled. * Disable ncurses checks in a way that will allow compiling for other OSes! ( it was a really quick patch before ) * More changes in cmake file to make code prettier and more exact * More cmake files cuteness * work for supporting versions prior Sierra This patch brings more compatibility with versions prior to Sierra. The project as is nearly links on a 10.9.5 OSX installation. - on versions prior Sierra clock_gettime() is not implemented thus we need to provide our own implementation for conky to work. ( Currently we have minimal support, more studying needs to be done ) NOTE: In order to compile on versions as old as Mavericks you will need newer compilers because command line tools for 10.9.5 dont support some C++11 features... For this I donwloaded the commandline tools for Xcode 8.1 ( or 8 dont remember well ) and installed only the CommandLine Tools section with Pacifist! ( The OSX installer sees the OS as too old, so you need pacifist! ) * Oops * $if_mounted ready This patch removes the unneded print_mounted() function! Also cleanup code. * $if_up works I think $if_up command works therefore remove the APPLE specific code in core.cc ( there wasnt anything different anyway ) and use the FreeBSD code. Minor conky output changes in darwin.cc * fix compatibility with Mavericks and before... This update allows conky to be compiled on Mavericks and before by checking at compilation time what our build target is. If it is Mavericks or lower, then cant use the csr_get_active_config func because it is not available. On higher versions than Mavericks it works as before... NOTE: For compiling on Mavericks or lower you will have to write 10.9 in CMAKE_OSX_DEPLOYMENT_TARGET when you run ccmake * Added link for youtube video showing conky running on macOS * Improvements Minor improvements related to style Removed unneeded free() calls * Simplify Xcode configuration process! :) * Removed update_cpu_usage() implementation It was quite buggy so I removed it... * Cleanup the source code 1. Bogus TODO comments have been deleted! 2. Started using DEBUG_MODE based printf 3. Explain some things better/cleanup * Last small cleanup The TODO in get_from_load_info() was unneeded. Removed! Also, DEBUG_MODE is enabled for now... * update authors file * Improve README Make it more clean and easier to understand. * Update README.md small tweak * Work for conforming with "Development" rules 1. Add to variables.xml documentation about the $sip_status variable. 2. Add sip_status variable to conkyrc.vim and nanorc to allow highlighting 3. the friends in darwin.cc is ambiguous,,, some are more than friends. * First patch set that implements get_top_info() :) * Calculate cpu usage of all processes more efficiently. (Now results match Activity Monitor's results a lot!!!) More info about the get_top_info() implementation will come once I finish it! (soon) * Cleanup patch! o Move a couple things to better places o Rename get_sample() to get_cpu_sample() to allow to be used by different functions such as get_cpu_usage() ( this is a scene from the future... ) o Improve the way we get cpu usage for each process by passing the already created proc_taskinfo struct to the appropriate function instead of creating another one inside it! * Correctly enable $running_processes variable In our implementation update_top() doesn't calculate the count of running processes! We assign this functionality to the update_running_processes() function. * Removed unneeded flag This is not needed because we do not use update_top() for getting the number of running processes! * Update README.md * Update README.md This adds support for TravisCL. Though this will compile the project only on Linux it is a good sign to know if our port still can compile on Linux or we have broken things. It seems like it can't but I suspect the problem existed before my patches. I will investigate. * First patch towards implementing #15 This patch a reworked get_top_info(). We now use the function get_top_info_for_kinfo_proc() to set the contents of each |process| struct. Also, we calculate the total cpu usage and total process usage concurrently using GCD. Aside from these we bring the function helper_get_proc_list() which makes the code simpler and cleaner. * First fix for the algorithm that calculates % CPU usage of a process The previous patch made the algorithm buggy. It required more reentrant-safe functions. Make calc_cpu_total_r() which is a more reentrant-safe reimplementation of the calc_cpu_total() function. This is not the last commit, more are coming in the future. * Previous commit wasn't pushed... * Problems committing * Make the code cleaner but break the algorithm again #15 The algorithm doesn't work... It is a work in progress! But this time we have merged the cpu_info and cpusample into one struct called cpusample ( I copied some variables from the linux implementation but they will probably be removed ) * Rework the code a bit / CPU usage % algorithm still doesn't work Now get_from_load_info() is renamed to helper_update_threads_processes() and is called by both update_threads() and update_total_processes() This makes the code nicer and removes the enum with the flags * cleanup remove unneeded functions, remove unneeded variables * bugfix * bugfix * remove the whole get_top_info() code! I will rework a lot this code so we can get rid of it. * Work for #15 Now we use the ultimate solution for calculating % usage of CPU of a process! Check the #15 Issue for information about this patch! * Quick memory leak fix & some patches for the get_top_info algorithm * quick patch for semaphore class * Update the comments * For consistency * temp * Revert "Merge branch 'master' into update_cpu_usage" This reverts commit 7267a515c40d54b85107e51016703e6c10f3183e, reversing changes made to 2190ff0b51463c12c61b3357cf846b8e705ebeb4. * Revert "Revert "Merge branch 'master' into update_cpu_usage"" This reverts commit 692bd27a3adb2fe7027d65932467a140e42cc7bc. * Partially implement the overall % CPU usage * bug fix: I meant procs and threads! * make the code better part1 * cleanup * Stabilise the values of get_cpu_sample(). Affects get_top_info() and update_cpu_usage() ( fixes #13 and #15 ) For some reason the code that used host_statistics() function didn't produced bad values quite often. Replaced the function with host_processor_info() and changed the algorithm and now the values are correct! This affects the get_top_info() and update_cpu_usage() functions which wouldn't work correctly until now. * Finish the optimised version of get_top_info() Fixes #15 * Quick fix for #16 Probably I will come up with a different location for get_cpu_count() because I want to conform to linux implementation. Also, the memory leak I am mentioning in get_cpu_count() may not actually exist, as I suspected in the back of my head. * Strictness * Cleanup ConkyPlatformChecks.cmake Cleanup the quick patch code for Lua. * Add warning to README If you are using old version of cmake, update it. It will probably have problems when trying to locate lua. * More cleanup * Fix identation This simplifies the diff. Also, note that by merging the new code for checking for NCURSES we acheive better compatibility and easy build process * Remove mixer related patches and files With the newest patches from upstream, cmake checks if the header soundcard.h exists on the system. If it doesn't exist (in the case of macOS for example) all mixer-related variables are disabled. * Changes for using as submodule for ConkyX * Fixes * Implement get_freq This implements #11 Though it doesn't support getting the **current** cpu frequency. I haven't found a way to do it on macOS but i guess it can be done using a kernel extension. I may come back to this again in the future * First work for correcting mem stats #6 Incorporate the update_pages_stolen() function and all of its dependencies. I will see if I can patch the code in order to avoid license problems * Work for #6 Now we follow the way apple's top works and not Activity Monitor. For this reason we find different values. But correct based on top. * cleanup for #6 * bug fix 1 * cleanup * hmm sorry * More cleanup - Move the libtop_tsamp_t object to darwin.cc. - Remove unneeded member variables. * A bit documentation * Implement secondary memory stats #6 Implement memwithbuffers, memeasyfree and memfree (which isn't secondary) * Quit update_meminfo if libtop_tsamp_update_vm_stats() failed * Update README.md Revert to original conky readme Move all macOS related information to the Wiki: https://github.com/Conky-for-macOS/conky-for-macOS/wiki * Alot junk slipped in too! * Merge net_stats branch For now, I have only tested up / down bytes count on en0, and it works. This is for #14 * Corrections - Fix License headers in darwin* files - Remove ConkyX entry from .gitignore which slipped into from the "forConkyX" branch which was used for another project ... ConkyX. - Cleanup top.h (I will request the changes in a pull request finally) * Fix identation and cleanup * identation-fixes part1 * Try to fix problem compiling on linux Improve checks for headers in ConkyPlatformChecks.cmake to amend the problem; I mistakenly thought that statfs64 wasn't available in sys/statfs.h in macOS thus I tried to add platform specific code. Though, I add the checks in the wrong place and also messed up linux-specific code by replacing checks_include sys/statfs with check_symbol_exists statfs64 * attemp to completely fix linux problem!
2018-05-07 11:27:32 +00:00
endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
Emulate O_CLOEXEC on systems that don't support it
2011-10-01 20:18:25 +00:00
Fix linking error: clock_gettime not found I decided to reimplement AC_SEARCH_LIB from autotools in the process, as I consider it a very nifty feature.
2011-09-30 21:01:24 +00:00
AC_SEARCH_LIBS(clock_gettime "time.h" CLOCK_GETTIME_LIB "rt")
Detect clock_gettime properly my implementation of AC_SEARCH_LIBS macro was incorrect. This should hopefully fix it.
2012-07-20 16:09:35 +00:00
if(NOT DEFINED CLOCK_GETTIME_LIB)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
message(FATAL_ERROR "clock_gettime not found.")
endif(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
Basic macOS support (#480) * Initial patches for Darwin support * cmake files ready for building on Sierra. Dont know about other OSX versions * Added darwin.h which will contain darwin specific headers * Patches for enablin asprintf support (needs _POSIX_C_SOURCE >= __DARWIN_C_FULL so remove -D_POSIX_C_SOURCE=200809L). What is more, -D_LARGEFILE64_SOURCE is used by default so not needed on macOS * Stubs for get_entropy_avail and get_entropy_poolsize * More progress to getting to build * More patches * Now builds, remains fixing linking errors. Also implemented some functions * Now links * Now conky runs without sigabrt()'ing... An exception in semaphore.hh caused it to crash immediately upon initialisation * README changes * This was based on an old attempt I did with porting conky where I hadn't cloned the repo and thus it showed 3166 commits behind * Patched a bit the semaphore.hh and now conky runs at 0.7% CPU usage and not in 100% or 200% as it did before! Yeah * This update fixes swap-related miscalculations, though: On macOS there can be used MANY swapfiles ( NOT swap partitions,,, the installation disk is the partition for storing swap memory data ) Thus conky code must be updated for Darwin to support multi-swapfile usage stats. For now, we default to showing stats for swapfile0 * Fixed a bit the comments so they make sense * Realised that the sysctl code can give us stats for the whole swap storage so removed the swapmode( int swapfd, unsigned long * retvail, unsigned long * retfree ) * I think the code is in good condition now * semaphore.hh: Implemented ~semaphore() and added throwing exception when sem initialisation fails just like in sem() for linux… darwin.cc: partially implemented update_cpu_usage() and update_total_processes() * Implements update_total_processes() ( Now it finds the correct number of tasks ) the changes in cmake file don’t change the functionality… It is only comments. In upcoming updates lua support may be enabled and the comments are related to lua support. * get_cpu_count() now conforms to newer sysctl code as suggested by Apple ( we use hw.logicalcpumax instead of hw.ncpus ) --> The new implementation of get_cpu_count() finds the the max value of logical cores the mac could use on a boot. update_total_processes() was patched to allow initialising only ONCE when conky runs the machHost and processorSet ( this could probably be implemented in a better way I guess though... ) * patch * experimental support for get_top_info() and update_cpu_usage() :) * going to patch stuff * adds getting rss memory in get_top_info() * fixes * Couple things made more beautiful but too many things to fix ... * Remove unneeded code from darwin_soundcard.h and keep only needed to compile ( This way we are compatible to GPLv3, i think ) Include GPLv3 header in darwin.cc, darwin.h and darwin_soundcard.h Add more beautiful and explanatory comments to ease the work of other contributors… ( Mostly on things that don’t work! ) * Merged the macOS update_cpu_usage() implementation with the linux implementation but still it doesn't work as expected, plus, there are more memory related problems that will be fixed in newer release! NOTE: It will be really good to see how functions are implemented on linux.cc for more complete implementation * Now using a more linux-influenced implementation and dropping the old... ( only keeps mach stuff ) Needs some more work though to print accurate percentage! :) * Add conky installer (.pkg) project * Now gets thread count aswell! For now, we get this from update_total_processes... Also, removed the installer project because I need to learn more the software * Properly get thread count! - Patched core.cc to enable getting threads count on macOS! - Cleanup in darwin.cc * sort out some things in the code: - running_threads_count is not the same as thread_count on macOS! There is actually a difference! Correct a bit the code! * Enable the if_mounted command and start implementing the check_mount function in darwin.cc * Tighten things up * This patch makes conky build easily and without patching on any supported macOS version! The new flag introduced is a temporary solution for allowing conky to compile on other OS without tweaking the cmake files. If you want to compile it with i18l support you will have to run the command: brew link gettext after you install gettext * Update README to provide more complete info on building on macOS * Fix * patch check_mounted + SIP status This commit: - patches check_mounted function to match the implementation found in FreeBSD.cc! Now conky expects typing something like this: conky -t '${if_mounted /Volumes/MacOS} ${endif}' Please note that the correct way is "/Volumes/MacOS", not "/Volumes/MacOS/" ! You shouldnt put the backslash at the end... It will not work! - Adds a new command called sip_status which you can use to make conky show System Integrity Protection related information such as if filesystem protection is enabled, if user approved kexts protection is enabled and more... you can type conky -t '$sip_status' to see what it does... ( I will most likely update some things later regarding sip_status and check_mounted ) * Further implement sip_status sip_status now has different functionality! If you give no arguments it shows whether SIP is enabled or disabled ( generally ) If you give argument ( takes only ONE ) you can specify which specific thing of SIP you want to show status for... You need to pass 0, 1, ..., 9 to $sip_status as argument to print status for apple-internal, untrusted-kexts, and more... Below you can see the list: ARG: RESULT: nothing --> print enabled / disabled 0 --> allow_apple_internal 1 --> allow_untrusted_kexts 2 --> allow_task_for_pid 3 --> allow_unrestricted_fs 4 --> allow_kernel_debugger 5 --> allow_unrestricted_dtrace 6 --> allow_unrestricted_nvram 7 --> allow_device_configuration 8 --> allow_any_recovery_os 9 --> allow_user_approved_kexts * sip_status progress & if_up enabled This commit adds the 'a' argument for $sip_status which checks if the SIP configuration is ok or it is likely to break in the future. Also, enabled the $if_up command, but there are some problems with it... * sip_status patches - Updated code based on newest version of csrstat utility (v.1.8) The 1.8 version fixes a problem in finding status of ALLOW_DEVICE_CONFIGURATION flag. - Fixed a bug where we mistakenly printed 'disabled' even when SIP was enabled. * Disable ncurses checks in a way that will allow compiling for other OSes! ( it was a really quick patch before ) * More changes in cmake file to make code prettier and more exact * More cmake files cuteness * work for supporting versions prior Sierra This patch brings more compatibility with versions prior to Sierra. The project as is nearly links on a 10.9.5 OSX installation. - on versions prior Sierra clock_gettime() is not implemented thus we need to provide our own implementation for conky to work. ( Currently we have minimal support, more studying needs to be done ) NOTE: In order to compile on versions as old as Mavericks you will need newer compilers because command line tools for 10.9.5 dont support some C++11 features... For this I donwloaded the commandline tools for Xcode 8.1 ( or 8 dont remember well ) and installed only the CommandLine Tools section with Pacifist! ( The OSX installer sees the OS as too old, so you need pacifist! ) * Oops * $if_mounted ready This patch removes the unneded print_mounted() function! Also cleanup code. * $if_up works I think $if_up command works therefore remove the APPLE specific code in core.cc ( there wasnt anything different anyway ) and use the FreeBSD code. Minor conky output changes in darwin.cc * fix compatibility with Mavericks and before... This update allows conky to be compiled on Mavericks and before by checking at compilation time what our build target is. If it is Mavericks or lower, then cant use the csr_get_active_config func because it is not available. On higher versions than Mavericks it works as before... NOTE: For compiling on Mavericks or lower you will have to write 10.9 in CMAKE_OSX_DEPLOYMENT_TARGET when you run ccmake * Added link for youtube video showing conky running on macOS * Improvements Minor improvements related to style Removed unneeded free() calls * Simplify Xcode configuration process! :) * Removed update_cpu_usage() implementation It was quite buggy so I removed it... * Cleanup the source code 1. Bogus TODO comments have been deleted! 2. Started using DEBUG_MODE based printf 3. Explain some things better/cleanup * Last small cleanup The TODO in get_from_load_info() was unneeded. Removed! Also, DEBUG_MODE is enabled for now... * update authors file * Improve README Make it more clean and easier to understand. * Update README.md small tweak * Work for conforming with "Development" rules 1. Add to variables.xml documentation about the $sip_status variable. 2. Add sip_status variable to conkyrc.vim and nanorc to allow highlighting 3. the friends in darwin.cc is ambiguous,,, some are more than friends. * First patch set that implements get_top_info() :) * Calculate cpu usage of all processes more efficiently. (Now results match Activity Monitor's results a lot!!!) More info about the get_top_info() implementation will come once I finish it! (soon) * Cleanup patch! o Move a couple things to better places o Rename get_sample() to get_cpu_sample() to allow to be used by different functions such as get_cpu_usage() ( this is a scene from the future... ) o Improve the way we get cpu usage for each process by passing the already created proc_taskinfo struct to the appropriate function instead of creating another one inside it! * Correctly enable $running_processes variable In our implementation update_top() doesn't calculate the count of running processes! We assign this functionality to the update_running_processes() function. * Removed unneeded flag This is not needed because we do not use update_top() for getting the number of running processes! * Update README.md * Update README.md This adds support for TravisCL. Though this will compile the project only on Linux it is a good sign to know if our port still can compile on Linux or we have broken things. It seems like it can't but I suspect the problem existed before my patches. I will investigate. * First patch towards implementing #15 This patch a reworked get_top_info(). We now use the function get_top_info_for_kinfo_proc() to set the contents of each |process| struct. Also, we calculate the total cpu usage and total process usage concurrently using GCD. Aside from these we bring the function helper_get_proc_list() which makes the code simpler and cleaner. * First fix for the algorithm that calculates % CPU usage of a process The previous patch made the algorithm buggy. It required more reentrant-safe functions. Make calc_cpu_total_r() which is a more reentrant-safe reimplementation of the calc_cpu_total() function. This is not the last commit, more are coming in the future. * Previous commit wasn't pushed... * Problems committing * Make the code cleaner but break the algorithm again #15 The algorithm doesn't work... It is a work in progress! But this time we have merged the cpu_info and cpusample into one struct called cpusample ( I copied some variables from the linux implementation but they will probably be removed ) * Rework the code a bit / CPU usage % algorithm still doesn't work Now get_from_load_info() is renamed to helper_update_threads_processes() and is called by both update_threads() and update_total_processes() This makes the code nicer and removes the enum with the flags * cleanup remove unneeded functions, remove unneeded variables * bugfix * bugfix * remove the whole get_top_info() code! I will rework a lot this code so we can get rid of it. * Work for #15 Now we use the ultimate solution for calculating % usage of CPU of a process! Check the #15 Issue for information about this patch! * Quick memory leak fix & some patches for the get_top_info algorithm * quick patch for semaphore class * Update the comments * For consistency * temp * Revert "Merge branch 'master' into update_cpu_usage" This reverts commit 7267a515c40d54b85107e51016703e6c10f3183e, reversing changes made to 2190ff0b51463c12c61b3357cf846b8e705ebeb4. * Revert "Revert "Merge branch 'master' into update_cpu_usage"" This reverts commit 692bd27a3adb2fe7027d65932467a140e42cc7bc. * Partially implement the overall % CPU usage * bug fix: I meant procs and threads! * make the code better part1 * cleanup * Stabilise the values of get_cpu_sample(). Affects get_top_info() and update_cpu_usage() ( fixes #13 and #15 ) For some reason the code that used host_statistics() function didn't produced bad values quite often. Replaced the function with host_processor_info() and changed the algorithm and now the values are correct! This affects the get_top_info() and update_cpu_usage() functions which wouldn't work correctly until now. * Finish the optimised version of get_top_info() Fixes #15 * Quick fix for #16 Probably I will come up with a different location for get_cpu_count() because I want to conform to linux implementation. Also, the memory leak I am mentioning in get_cpu_count() may not actually exist, as I suspected in the back of my head. * Strictness * Cleanup ConkyPlatformChecks.cmake Cleanup the quick patch code for Lua. * Add warning to README If you are using old version of cmake, update it. It will probably have problems when trying to locate lua. * More cleanup * Fix identation This simplifies the diff. Also, note that by merging the new code for checking for NCURSES we acheive better compatibility and easy build process * Remove mixer related patches and files With the newest patches from upstream, cmake checks if the header soundcard.h exists on the system. If it doesn't exist (in the case of macOS for example) all mixer-related variables are disabled. * Changes for using as submodule for ConkyX * Fixes * Implement get_freq This implements #11 Though it doesn't support getting the **current** cpu frequency. I haven't found a way to do it on macOS but i guess it can be done using a kernel extension. I may come back to this again in the future * First work for correcting mem stats #6 Incorporate the update_pages_stolen() function and all of its dependencies. I will see if I can patch the code in order to avoid license problems * Work for #6 Now we follow the way apple's top works and not Activity Monitor. For this reason we find different values. But correct based on top. * cleanup for #6 * bug fix 1 * cleanup * hmm sorry * More cleanup - Move the libtop_tsamp_t object to darwin.cc. - Remove unneeded member variables. * A bit documentation * Implement secondary memory stats #6 Implement memwithbuffers, memeasyfree and memfree (which isn't secondary) * Quit update_meminfo if libtop_tsamp_update_vm_stats() failed * Update README.md Revert to original conky readme Move all macOS related information to the Wiki: https://github.com/Conky-for-macOS/conky-for-macOS/wiki * Alot junk slipped in too! * Merge net_stats branch For now, I have only tested up / down bytes count on en0, and it works. This is for #14 * Corrections - Fix License headers in darwin* files - Remove ConkyX entry from .gitignore which slipped into from the "forConkyX" branch which was used for another project ... ConkyX. - Cleanup top.h (I will request the changes in a pull request finally) * Fix identation and cleanup * identation-fixes part1 * Try to fix problem compiling on linux Improve checks for headers in ConkyPlatformChecks.cmake to amend the problem; I mistakenly thought that statfs64 wasn't available in sys/statfs.h in macOS thus I tried to add platform specific code. Though, I add the checks in the wrong place and also messed up linux-specific code by replacing checks_include sys/statfs with check_symbol_exists statfs64 * attemp to completely fix linux problem!
2018-05-07 11:27:32 +00:00
else(NOT DEFINED CLOCK_GETTIME_LIB)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
set(HAVE_CLOCK_GETTIME 1)
Detect clock_gettime properly my implementation of AC_SEARCH_LIBS macro was incorrect. This should hopefully fix it.
2012-07-20 16:09:35 +00:00
endif(NOT DEFINED CLOCK_GETTIME_LIB)
Fix linking error: clock_gettime not found I decided to reimplement AC_SEARCH_LIB from autotools in the process, as I consider it a very nifty feature.
2011-09-30 21:01:24 +00:00
set(conky_libs ${conky_libs} ${CLOCK_GETTIME_LIB})
Portmon and audacious CMake support.
2009-12-06 19:43:12 +00:00
# standard path to search for includes
set(INCLUDE_SEARCH_PATH /usr/include /usr/local/include)
Improve platform stuff.
2009-12-07 17:35:43 +00:00
# Set system vars
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
set(OS_LINUX true)
Improve platform stuff.
2009-12-07 17:35:43 +00:00
endif(CMAKE_SYSTEM_NAME MATCHES "Linux")
if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
set(OS_FREEBSD true)
set(conky_libs ${conky_libs} -lkvm -ldevstat -lbsd)
Improve platform stuff.
2009-12-07 17:35:43 +00:00
endif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
Preliminary import from 2.8.1 git release * don't use kvm_* calls, just sysctl (so no suid perm necessary) * sysctls calls in general aren't thread safe, collapse callbacks using same sysctls (specifically total/running procs and proc list ones). Some sysctls need two calls (first to get size of obj returned, second to get object self); if different threads use this schema on same sysctl, weird values are returned (first/second calls sequence should be serialized). In general it makes not much sense too having more threads that use the same sysctl; just get info once and populate all data. * add DragonFly specific extended uname string ($version in conky.conf) with git version and signature Todo: - top process list logic is old style, use top.cc funcs. - find a solution for cpu freq Signed-off-by: Pavel Labath <pavelo@centrum.sk>
2012-06-28 16:56:01 +00:00
if(CMAKE_SYSTEM_NAME MATCHES "DragonFly")
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
set(OS_DRAGONFLY true)
set(conky_libs ${conky_libs} -ldevstat)
Preliminary import from 2.8.1 git release * don't use kvm_* calls, just sysctl (so no suid perm necessary) * sysctls calls in general aren't thread safe, collapse callbacks using same sysctls (specifically total/running procs and proc list ones). Some sysctls need two calls (first to get size of obj returned, second to get object self); if different threads use this schema on same sysctl, weird values are returned (first/second calls sequence should be serialized). In general it makes not much sense too having more threads that use the same sysctl; just get info once and populate all data. * add DragonFly specific extended uname string ($version in conky.conf) with git version and signature Todo: - top process list logic is old style, use top.cc funcs. - find a solution for cpu freq Signed-off-by: Pavel Labath <pavelo@centrum.sk>
2012-06-28 16:56:01 +00:00
endif(CMAKE_SYSTEM_NAME MATCHES "DragonFly")
Improve platform stuff.
2009-12-07 17:35:43 +00:00
if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
set(OS_OPENBSD true)
Improve platform stuff.
2009-12-07 17:35:43 +00:00
endif(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
Solaris support (#445) * Basic Solaris support * Fixed indentation & minor improvements * support for diskio
2018-01-19 14:00:42 +00:00
if(CMAKE_SYSTEM_NAME MATCHES "SunOS")
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
set(OS_SOLARIS true)
set(conky_libs ${conky_libs} -lkstat)
Solaris support (#445) * Basic Solaris support * Fixed indentation & minor improvements * support for diskio
2018-01-19 14:00:42 +00:00
endif(CMAKE_SYSTEM_NAME MATCHES "SunOS")
Improve platform stuff.
2009-12-07 17:35:43 +00:00
if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
set(OS_NETBSD true)
Improve platform stuff.
2009-12-07 17:35:43 +00:00
endif(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
Haiku port phase 1 (#433) * cmake: Add Haiku as a supported platform * move mixer.cc to platform-specific as Haiku doesn't use OSS * Add haiku.h with some stubs * Use haiku.h * Add some Haiku stubs * Some Haiku network workarounds It does not define SUN_LEN, provide a default. It doesn't name the union in struct ifreq, use ifr_addr directly. It seems Linux also declares it so it should work without change. We can always define it for other platforms lacking it (add a cmake test ?). Haiku does not have IFF_RUNNING, IFF_LINK seems close in semantics, so use it. * Haiku: Minimal implementation of update_meminfo & get_top_info * Haiku: implement update_cpu_usage
2018-01-19 16:36:40 +00:00
if(CMAKE_SYSTEM_NAME MATCHES "Haiku")
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
set(OS_HAIKU true)
set(conky_libs ${conky_libs} -lnetwork -lintl)
Haiku port phase 1 (#433) * cmake: Add Haiku as a supported platform * move mixer.cc to platform-specific as Haiku doesn't use OSS * Add haiku.h with some stubs * Use haiku.h * Add some Haiku stubs * Some Haiku network workarounds It does not define SUN_LEN, provide a default. It doesn't name the union in struct ifreq, use ifr_addr directly. It seems Linux also declares it so it should work without change. We can always define it for other platforms lacking it (add a cmake test ?). Haiku does not have IFF_RUNNING, IFF_LINK seems close in semantics, so use it. * Haiku: Minimal implementation of update_meminfo & get_top_info * Haiku: implement update_cpu_usage
2018-01-19 16:36:40 +00:00
endif(CMAKE_SYSTEM_NAME MATCHES "Haiku")
Basic macOS support (#480) * Initial patches for Darwin support * cmake files ready for building on Sierra. Dont know about other OSX versions * Added darwin.h which will contain darwin specific headers * Patches for enablin asprintf support (needs _POSIX_C_SOURCE >= __DARWIN_C_FULL so remove -D_POSIX_C_SOURCE=200809L). What is more, -D_LARGEFILE64_SOURCE is used by default so not needed on macOS * Stubs for get_entropy_avail and get_entropy_poolsize * More progress to getting to build * More patches * Now builds, remains fixing linking errors. Also implemented some functions * Now links * Now conky runs without sigabrt()'ing... An exception in semaphore.hh caused it to crash immediately upon initialisation * README changes * This was based on an old attempt I did with porting conky where I hadn't cloned the repo and thus it showed 3166 commits behind * Patched a bit the semaphore.hh and now conky runs at 0.7% CPU usage and not in 100% or 200% as it did before! Yeah * This update fixes swap-related miscalculations, though: On macOS there can be used MANY swapfiles ( NOT swap partitions,,, the installation disk is the partition for storing swap memory data ) Thus conky code must be updated for Darwin to support multi-swapfile usage stats. For now, we default to showing stats for swapfile0 * Fixed a bit the comments so they make sense * Realised that the sysctl code can give us stats for the whole swap storage so removed the swapmode( int swapfd, unsigned long * retvail, unsigned long * retfree ) * I think the code is in good condition now * semaphore.hh: Implemented ~semaphore() and added throwing exception when sem initialisation fails just like in sem() for linux… darwin.cc: partially implemented update_cpu_usage() and update_total_processes() * Implements update_total_processes() ( Now it finds the correct number of tasks ) the changes in cmake file don’t change the functionality… It is only comments. In upcoming updates lua support may be enabled and the comments are related to lua support. * get_cpu_count() now conforms to newer sysctl code as suggested by Apple ( we use hw.logicalcpumax instead of hw.ncpus ) --> The new implementation of get_cpu_count() finds the the max value of logical cores the mac could use on a boot. update_total_processes() was patched to allow initialising only ONCE when conky runs the machHost and processorSet ( this could probably be implemented in a better way I guess though... ) * patch * experimental support for get_top_info() and update_cpu_usage() :) * going to patch stuff * adds getting rss memory in get_top_info() * fixes * Couple things made more beautiful but too many things to fix ... * Remove unneeded code from darwin_soundcard.h and keep only needed to compile ( This way we are compatible to GPLv3, i think ) Include GPLv3 header in darwin.cc, darwin.h and darwin_soundcard.h Add more beautiful and explanatory comments to ease the work of other contributors… ( Mostly on things that don’t work! ) * Merged the macOS update_cpu_usage() implementation with the linux implementation but still it doesn't work as expected, plus, there are more memory related problems that will be fixed in newer release! NOTE: It will be really good to see how functions are implemented on linux.cc for more complete implementation * Now using a more linux-influenced implementation and dropping the old... ( only keeps mach stuff ) Needs some more work though to print accurate percentage! :) * Add conky installer (.pkg) project * Now gets thread count aswell! For now, we get this from update_total_processes... Also, removed the installer project because I need to learn more the software * Properly get thread count! - Patched core.cc to enable getting threads count on macOS! - Cleanup in darwin.cc * sort out some things in the code: - running_threads_count is not the same as thread_count on macOS! There is actually a difference! Correct a bit the code! * Enable the if_mounted command and start implementing the check_mount function in darwin.cc * Tighten things up * This patch makes conky build easily and without patching on any supported macOS version! The new flag introduced is a temporary solution for allowing conky to compile on other OS without tweaking the cmake files. If you want to compile it with i18l support you will have to run the command: brew link gettext after you install gettext * Update README to provide more complete info on building on macOS * Fix * patch check_mounted + SIP status This commit: - patches check_mounted function to match the implementation found in FreeBSD.cc! Now conky expects typing something like this: conky -t '${if_mounted /Volumes/MacOS} ${endif}' Please note that the correct way is "/Volumes/MacOS", not "/Volumes/MacOS/" ! You shouldnt put the backslash at the end... It will not work! - Adds a new command called sip_status which you can use to make conky show System Integrity Protection related information such as if filesystem protection is enabled, if user approved kexts protection is enabled and more... you can type conky -t '$sip_status' to see what it does... ( I will most likely update some things later regarding sip_status and check_mounted ) * Further implement sip_status sip_status now has different functionality! If you give no arguments it shows whether SIP is enabled or disabled ( generally ) If you give argument ( takes only ONE ) you can specify which specific thing of SIP you want to show status for... You need to pass 0, 1, ..., 9 to $sip_status as argument to print status for apple-internal, untrusted-kexts, and more... Below you can see the list: ARG: RESULT: nothing --> print enabled / disabled 0 --> allow_apple_internal 1 --> allow_untrusted_kexts 2 --> allow_task_for_pid 3 --> allow_unrestricted_fs 4 --> allow_kernel_debugger 5 --> allow_unrestricted_dtrace 6 --> allow_unrestricted_nvram 7 --> allow_device_configuration 8 --> allow_any_recovery_os 9 --> allow_user_approved_kexts * sip_status progress & if_up enabled This commit adds the 'a' argument for $sip_status which checks if the SIP configuration is ok or it is likely to break in the future. Also, enabled the $if_up command, but there are some problems with it... * sip_status patches - Updated code based on newest version of csrstat utility (v.1.8) The 1.8 version fixes a problem in finding status of ALLOW_DEVICE_CONFIGURATION flag. - Fixed a bug where we mistakenly printed 'disabled' even when SIP was enabled. * Disable ncurses checks in a way that will allow compiling for other OSes! ( it was a really quick patch before ) * More changes in cmake file to make code prettier and more exact * More cmake files cuteness * work for supporting versions prior Sierra This patch brings more compatibility with versions prior to Sierra. The project as is nearly links on a 10.9.5 OSX installation. - on versions prior Sierra clock_gettime() is not implemented thus we need to provide our own implementation for conky to work. ( Currently we have minimal support, more studying needs to be done ) NOTE: In order to compile on versions as old as Mavericks you will need newer compilers because command line tools for 10.9.5 dont support some C++11 features... For this I donwloaded the commandline tools for Xcode 8.1 ( or 8 dont remember well ) and installed only the CommandLine Tools section with Pacifist! ( The OSX installer sees the OS as too old, so you need pacifist! ) * Oops * $if_mounted ready This patch removes the unneded print_mounted() function! Also cleanup code. * $if_up works I think $if_up command works therefore remove the APPLE specific code in core.cc ( there wasnt anything different anyway ) and use the FreeBSD code. Minor conky output changes in darwin.cc * fix compatibility with Mavericks and before... This update allows conky to be compiled on Mavericks and before by checking at compilation time what our build target is. If it is Mavericks or lower, then cant use the csr_get_active_config func because it is not available. On higher versions than Mavericks it works as before... NOTE: For compiling on Mavericks or lower you will have to write 10.9 in CMAKE_OSX_DEPLOYMENT_TARGET when you run ccmake * Added link for youtube video showing conky running on macOS * Improvements Minor improvements related to style Removed unneeded free() calls * Simplify Xcode configuration process! :) * Removed update_cpu_usage() implementation It was quite buggy so I removed it... * Cleanup the source code 1. Bogus TODO comments have been deleted! 2. Started using DEBUG_MODE based printf 3. Explain some things better/cleanup * Last small cleanup The TODO in get_from_load_info() was unneeded. Removed! Also, DEBUG_MODE is enabled for now... * update authors file * Improve README Make it more clean and easier to understand. * Update README.md small tweak * Work for conforming with "Development" rules 1. Add to variables.xml documentation about the $sip_status variable. 2. Add sip_status variable to conkyrc.vim and nanorc to allow highlighting 3. the friends in darwin.cc is ambiguous,,, some are more than friends. * First patch set that implements get_top_info() :) * Calculate cpu usage of all processes more efficiently. (Now results match Activity Monitor's results a lot!!!) More info about the get_top_info() implementation will come once I finish it! (soon) * Cleanup patch! o Move a couple things to better places o Rename get_sample() to get_cpu_sample() to allow to be used by different functions such as get_cpu_usage() ( this is a scene from the future... ) o Improve the way we get cpu usage for each process by passing the already created proc_taskinfo struct to the appropriate function instead of creating another one inside it! * Correctly enable $running_processes variable In our implementation update_top() doesn't calculate the count of running processes! We assign this functionality to the update_running_processes() function. * Removed unneeded flag This is not needed because we do not use update_top() for getting the number of running processes! * Update README.md * Update README.md This adds support for TravisCL. Though this will compile the project only on Linux it is a good sign to know if our port still can compile on Linux or we have broken things. It seems like it can't but I suspect the problem existed before my patches. I will investigate. * First patch towards implementing #15 This patch a reworked get_top_info(). We now use the function get_top_info_for_kinfo_proc() to set the contents of each |process| struct. Also, we calculate the total cpu usage and total process usage concurrently using GCD. Aside from these we bring the function helper_get_proc_list() which makes the code simpler and cleaner. * First fix for the algorithm that calculates % CPU usage of a process The previous patch made the algorithm buggy. It required more reentrant-safe functions. Make calc_cpu_total_r() which is a more reentrant-safe reimplementation of the calc_cpu_total() function. This is not the last commit, more are coming in the future. * Previous commit wasn't pushed... * Problems committing * Make the code cleaner but break the algorithm again #15 The algorithm doesn't work... It is a work in progress! But this time we have merged the cpu_info and cpusample into one struct called cpusample ( I copied some variables from the linux implementation but they will probably be removed ) * Rework the code a bit / CPU usage % algorithm still doesn't work Now get_from_load_info() is renamed to helper_update_threads_processes() and is called by both update_threads() and update_total_processes() This makes the code nicer and removes the enum with the flags * cleanup remove unneeded functions, remove unneeded variables * bugfix * bugfix * remove the whole get_top_info() code! I will rework a lot this code so we can get rid of it. * Work for #15 Now we use the ultimate solution for calculating % usage of CPU of a process! Check the #15 Issue for information about this patch! * Quick memory leak fix & some patches for the get_top_info algorithm * quick patch for semaphore class * Update the comments * For consistency * temp * Revert "Merge branch 'master' into update_cpu_usage" This reverts commit 7267a515c40d54b85107e51016703e6c10f3183e, reversing changes made to 2190ff0b51463c12c61b3357cf846b8e705ebeb4. * Revert "Revert "Merge branch 'master' into update_cpu_usage"" This reverts commit 692bd27a3adb2fe7027d65932467a140e42cc7bc. * Partially implement the overall % CPU usage * bug fix: I meant procs and threads! * make the code better part1 * cleanup * Stabilise the values of get_cpu_sample(). Affects get_top_info() and update_cpu_usage() ( fixes #13 and #15 ) For some reason the code that used host_statistics() function didn't produced bad values quite often. Replaced the function with host_processor_info() and changed the algorithm and now the values are correct! This affects the get_top_info() and update_cpu_usage() functions which wouldn't work correctly until now. * Finish the optimised version of get_top_info() Fixes #15 * Quick fix for #16 Probably I will come up with a different location for get_cpu_count() because I want to conform to linux implementation. Also, the memory leak I am mentioning in get_cpu_count() may not actually exist, as I suspected in the back of my head. * Strictness * Cleanup ConkyPlatformChecks.cmake Cleanup the quick patch code for Lua. * Add warning to README If you are using old version of cmake, update it. It will probably have problems when trying to locate lua. * More cleanup * Fix identation This simplifies the diff. Also, note that by merging the new code for checking for NCURSES we acheive better compatibility and easy build process * Remove mixer related patches and files With the newest patches from upstream, cmake checks if the header soundcard.h exists on the system. If it doesn't exist (in the case of macOS for example) all mixer-related variables are disabled. * Changes for using as submodule for ConkyX * Fixes * Implement get_freq This implements #11 Though it doesn't support getting the **current** cpu frequency. I haven't found a way to do it on macOS but i guess it can be done using a kernel extension. I may come back to this again in the future * First work for correcting mem stats #6 Incorporate the update_pages_stolen() function and all of its dependencies. I will see if I can patch the code in order to avoid license problems * Work for #6 Now we follow the way apple's top works and not Activity Monitor. For this reason we find different values. But correct based on top. * cleanup for #6 * bug fix 1 * cleanup * hmm sorry * More cleanup - Move the libtop_tsamp_t object to darwin.cc. - Remove unneeded member variables. * A bit documentation * Implement secondary memory stats #6 Implement memwithbuffers, memeasyfree and memfree (which isn't secondary) * Quit update_meminfo if libtop_tsamp_update_vm_stats() failed * Update README.md Revert to original conky readme Move all macOS related information to the Wiki: https://github.com/Conky-for-macOS/conky-for-macOS/wiki * Alot junk slipped in too! * Merge net_stats branch For now, I have only tested up / down bytes count on en0, and it works. This is for #14 * Corrections - Fix License headers in darwin* files - Remove ConkyX entry from .gitignore which slipped into from the "forConkyX" branch which was used for another project ... ConkyX. - Cleanup top.h (I will request the changes in a pull request finally) * Fix identation and cleanup * identation-fixes part1 * Try to fix problem compiling on linux Improve checks for headers in ConkyPlatformChecks.cmake to amend the problem; I mistakenly thought that statfs64 wasn't available in sys/statfs.h in macOS thus I tried to add platform specific code. Though, I add the checks in the wrong place and also messed up linux-specific code by replacing checks_include sys/statfs with check_symbol_exists statfs64 * attemp to completely fix linux problem!
2018-05-07 11:27:32 +00:00
if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
set(OS_DARWIN true)
Basic macOS support (#480) * Initial patches for Darwin support * cmake files ready for building on Sierra. Dont know about other OSX versions * Added darwin.h which will contain darwin specific headers * Patches for enablin asprintf support (needs _POSIX_C_SOURCE >= __DARWIN_C_FULL so remove -D_POSIX_C_SOURCE=200809L). What is more, -D_LARGEFILE64_SOURCE is used by default so not needed on macOS * Stubs for get_entropy_avail and get_entropy_poolsize * More progress to getting to build * More patches * Now builds, remains fixing linking errors. Also implemented some functions * Now links * Now conky runs without sigabrt()'ing... An exception in semaphore.hh caused it to crash immediately upon initialisation * README changes * This was based on an old attempt I did with porting conky where I hadn't cloned the repo and thus it showed 3166 commits behind * Patched a bit the semaphore.hh and now conky runs at 0.7% CPU usage and not in 100% or 200% as it did before! Yeah * This update fixes swap-related miscalculations, though: On macOS there can be used MANY swapfiles ( NOT swap partitions,,, the installation disk is the partition for storing swap memory data ) Thus conky code must be updated for Darwin to support multi-swapfile usage stats. For now, we default to showing stats for swapfile0 * Fixed a bit the comments so they make sense * Realised that the sysctl code can give us stats for the whole swap storage so removed the swapmode( int swapfd, unsigned long * retvail, unsigned long * retfree ) * I think the code is in good condition now * semaphore.hh: Implemented ~semaphore() and added throwing exception when sem initialisation fails just like in sem() for linux… darwin.cc: partially implemented update_cpu_usage() and update_total_processes() * Implements update_total_processes() ( Now it finds the correct number of tasks ) the changes in cmake file don’t change the functionality… It is only comments. In upcoming updates lua support may be enabled and the comments are related to lua support. * get_cpu_count() now conforms to newer sysctl code as suggested by Apple ( we use hw.logicalcpumax instead of hw.ncpus ) --> The new implementation of get_cpu_count() finds the the max value of logical cores the mac could use on a boot. update_total_processes() was patched to allow initialising only ONCE when conky runs the machHost and processorSet ( this could probably be implemented in a better way I guess though... ) * patch * experimental support for get_top_info() and update_cpu_usage() :) * going to patch stuff * adds getting rss memory in get_top_info() * fixes * Couple things made more beautiful but too many things to fix ... * Remove unneeded code from darwin_soundcard.h and keep only needed to compile ( This way we are compatible to GPLv3, i think ) Include GPLv3 header in darwin.cc, darwin.h and darwin_soundcard.h Add more beautiful and explanatory comments to ease the work of other contributors… ( Mostly on things that don’t work! ) * Merged the macOS update_cpu_usage() implementation with the linux implementation but still it doesn't work as expected, plus, there are more memory related problems that will be fixed in newer release! NOTE: It will be really good to see how functions are implemented on linux.cc for more complete implementation * Now using a more linux-influenced implementation and dropping the old... ( only keeps mach stuff ) Needs some more work though to print accurate percentage! :) * Add conky installer (.pkg) project * Now gets thread count aswell! For now, we get this from update_total_processes... Also, removed the installer project because I need to learn more the software * Properly get thread count! - Patched core.cc to enable getting threads count on macOS! - Cleanup in darwin.cc * sort out some things in the code: - running_threads_count is not the same as thread_count on macOS! There is actually a difference! Correct a bit the code! * Enable the if_mounted command and start implementing the check_mount function in darwin.cc * Tighten things up * This patch makes conky build easily and without patching on any supported macOS version! The new flag introduced is a temporary solution for allowing conky to compile on other OS without tweaking the cmake files. If you want to compile it with i18l support you will have to run the command: brew link gettext after you install gettext * Update README to provide more complete info on building on macOS * Fix * patch check_mounted + SIP status This commit: - patches check_mounted function to match the implementation found in FreeBSD.cc! Now conky expects typing something like this: conky -t '${if_mounted /Volumes/MacOS} ${endif}' Please note that the correct way is "/Volumes/MacOS", not "/Volumes/MacOS/" ! You shouldnt put the backslash at the end... It will not work! - Adds a new command called sip_status which you can use to make conky show System Integrity Protection related information such as if filesystem protection is enabled, if user approved kexts protection is enabled and more... you can type conky -t '$sip_status' to see what it does... ( I will most likely update some things later regarding sip_status and check_mounted ) * Further implement sip_status sip_status now has different functionality! If you give no arguments it shows whether SIP is enabled or disabled ( generally ) If you give argument ( takes only ONE ) you can specify which specific thing of SIP you want to show status for... You need to pass 0, 1, ..., 9 to $sip_status as argument to print status for apple-internal, untrusted-kexts, and more... Below you can see the list: ARG: RESULT: nothing --> print enabled / disabled 0 --> allow_apple_internal 1 --> allow_untrusted_kexts 2 --> allow_task_for_pid 3 --> allow_unrestricted_fs 4 --> allow_kernel_debugger 5 --> allow_unrestricted_dtrace 6 --> allow_unrestricted_nvram 7 --> allow_device_configuration 8 --> allow_any_recovery_os 9 --> allow_user_approved_kexts * sip_status progress & if_up enabled This commit adds the 'a' argument for $sip_status which checks if the SIP configuration is ok or it is likely to break in the future. Also, enabled the $if_up command, but there are some problems with it... * sip_status patches - Updated code based on newest version of csrstat utility (v.1.8) The 1.8 version fixes a problem in finding status of ALLOW_DEVICE_CONFIGURATION flag. - Fixed a bug where we mistakenly printed 'disabled' even when SIP was enabled. * Disable ncurses checks in a way that will allow compiling for other OSes! ( it was a really quick patch before ) * More changes in cmake file to make code prettier and more exact * More cmake files cuteness * work for supporting versions prior Sierra This patch brings more compatibility with versions prior to Sierra. The project as is nearly links on a 10.9.5 OSX installation. - on versions prior Sierra clock_gettime() is not implemented thus we need to provide our own implementation for conky to work. ( Currently we have minimal support, more studying needs to be done ) NOTE: In order to compile on versions as old as Mavericks you will need newer compilers because command line tools for 10.9.5 dont support some C++11 features... For this I donwloaded the commandline tools for Xcode 8.1 ( or 8 dont remember well ) and installed only the CommandLine Tools section with Pacifist! ( The OSX installer sees the OS as too old, so you need pacifist! ) * Oops * $if_mounted ready This patch removes the unneded print_mounted() function! Also cleanup code. * $if_up works I think $if_up command works therefore remove the APPLE specific code in core.cc ( there wasnt anything different anyway ) and use the FreeBSD code. Minor conky output changes in darwin.cc * fix compatibility with Mavericks and before... This update allows conky to be compiled on Mavericks and before by checking at compilation time what our build target is. If it is Mavericks or lower, then cant use the csr_get_active_config func because it is not available. On higher versions than Mavericks it works as before... NOTE: For compiling on Mavericks or lower you will have to write 10.9 in CMAKE_OSX_DEPLOYMENT_TARGET when you run ccmake * Added link for youtube video showing conky running on macOS * Improvements Minor improvements related to style Removed unneeded free() calls * Simplify Xcode configuration process! :) * Removed update_cpu_usage() implementation It was quite buggy so I removed it... * Cleanup the source code 1. Bogus TODO comments have been deleted! 2. Started using DEBUG_MODE based printf 3. Explain some things better/cleanup * Last small cleanup The TODO in get_from_load_info() was unneeded. Removed! Also, DEBUG_MODE is enabled for now... * update authors file * Improve README Make it more clean and easier to understand. * Update README.md small tweak * Work for conforming with "Development" rules 1. Add to variables.xml documentation about the $sip_status variable. 2. Add sip_status variable to conkyrc.vim and nanorc to allow highlighting 3. the friends in darwin.cc is ambiguous,,, some are more than friends. * First patch set that implements get_top_info() :) * Calculate cpu usage of all processes more efficiently. (Now results match Activity Monitor's results a lot!!!) More info about the get_top_info() implementation will come once I finish it! (soon) * Cleanup patch! o Move a couple things to better places o Rename get_sample() to get_cpu_sample() to allow to be used by different functions such as get_cpu_usage() ( this is a scene from the future... ) o Improve the way we get cpu usage for each process by passing the already created proc_taskinfo struct to the appropriate function instead of creating another one inside it! * Correctly enable $running_processes variable In our implementation update_top() doesn't calculate the count of running processes! We assign this functionality to the update_running_processes() function. * Removed unneeded flag This is not needed because we do not use update_top() for getting the number of running processes! * Update README.md * Update README.md This adds support for TravisCL. Though this will compile the project only on Linux it is a good sign to know if our port still can compile on Linux or we have broken things. It seems like it can't but I suspect the problem existed before my patches. I will investigate. * First patch towards implementing #15 This patch a reworked get_top_info(). We now use the function get_top_info_for_kinfo_proc() to set the contents of each |process| struct. Also, we calculate the total cpu usage and total process usage concurrently using GCD. Aside from these we bring the function helper_get_proc_list() which makes the code simpler and cleaner. * First fix for the algorithm that calculates % CPU usage of a process The previous patch made the algorithm buggy. It required more reentrant-safe functions. Make calc_cpu_total_r() which is a more reentrant-safe reimplementation of the calc_cpu_total() function. This is not the last commit, more are coming in the future. * Previous commit wasn't pushed... * Problems committing * Make the code cleaner but break the algorithm again #15 The algorithm doesn't work... It is a work in progress! But this time we have merged the cpu_info and cpusample into one struct called cpusample ( I copied some variables from the linux implementation but they will probably be removed ) * Rework the code a bit / CPU usage % algorithm still doesn't work Now get_from_load_info() is renamed to helper_update_threads_processes() and is called by both update_threads() and update_total_processes() This makes the code nicer and removes the enum with the flags * cleanup remove unneeded functions, remove unneeded variables * bugfix * bugfix * remove the whole get_top_info() code! I will rework a lot this code so we can get rid of it. * Work for #15 Now we use the ultimate solution for calculating % usage of CPU of a process! Check the #15 Issue for information about this patch! * Quick memory leak fix & some patches for the get_top_info algorithm * quick patch for semaphore class * Update the comments * For consistency * temp * Revert "Merge branch 'master' into update_cpu_usage" This reverts commit 7267a515c40d54b85107e51016703e6c10f3183e, reversing changes made to 2190ff0b51463c12c61b3357cf846b8e705ebeb4. * Revert "Revert "Merge branch 'master' into update_cpu_usage"" This reverts commit 692bd27a3adb2fe7027d65932467a140e42cc7bc. * Partially implement the overall % CPU usage * bug fix: I meant procs and threads! * make the code better part1 * cleanup * Stabilise the values of get_cpu_sample(). Affects get_top_info() and update_cpu_usage() ( fixes #13 and #15 ) For some reason the code that used host_statistics() function didn't produced bad values quite often. Replaced the function with host_processor_info() and changed the algorithm and now the values are correct! This affects the get_top_info() and update_cpu_usage() functions which wouldn't work correctly until now. * Finish the optimised version of get_top_info() Fixes #15 * Quick fix for #16 Probably I will come up with a different location for get_cpu_count() because I want to conform to linux implementation. Also, the memory leak I am mentioning in get_cpu_count() may not actually exist, as I suspected in the back of my head. * Strictness * Cleanup ConkyPlatformChecks.cmake Cleanup the quick patch code for Lua. * Add warning to README If you are using old version of cmake, update it. It will probably have problems when trying to locate lua. * More cleanup * Fix identation This simplifies the diff. Also, note that by merging the new code for checking for NCURSES we acheive better compatibility and easy build process * Remove mixer related patches and files With the newest patches from upstream, cmake checks if the header soundcard.h exists on the system. If it doesn't exist (in the case of macOS for example) all mixer-related variables are disabled. * Changes for using as submodule for ConkyX * Fixes * Implement get_freq This implements #11 Though it doesn't support getting the **current** cpu frequency. I haven't found a way to do it on macOS but i guess it can be done using a kernel extension. I may come back to this again in the future * First work for correcting mem stats #6 Incorporate the update_pages_stolen() function and all of its dependencies. I will see if I can patch the code in order to avoid license problems * Work for #6 Now we follow the way apple's top works and not Activity Monitor. For this reason we find different values. But correct based on top. * cleanup for #6 * bug fix 1 * cleanup * hmm sorry * More cleanup - Move the libtop_tsamp_t object to darwin.cc. - Remove unneeded member variables. * A bit documentation * Implement secondary memory stats #6 Implement memwithbuffers, memeasyfree and memfree (which isn't secondary) * Quit update_meminfo if libtop_tsamp_update_vm_stats() failed * Update README.md Revert to original conky readme Move all macOS related information to the Wiki: https://github.com/Conky-for-macOS/conky-for-macOS/wiki * Alot junk slipped in too! * Merge net_stats branch For now, I have only tested up / down bytes count on en0, and it works. This is for #14 * Corrections - Fix License headers in darwin* files - Remove ConkyX entry from .gitignore which slipped into from the "forConkyX" branch which was used for another project ... ConkyX. - Cleanup top.h (I will request the changes in a pull request finally) * Fix identation and cleanup * identation-fixes part1 * Try to fix problem compiling on linux Improve checks for headers in ConkyPlatformChecks.cmake to amend the problem; I mistakenly thought that statfs64 wasn't available in sys/statfs.h in macOS thus I tried to add platform specific code. Though, I add the checks in the wrong place and also messed up linux-specific code by replacing checks_include sys/statfs with check_symbol_exists statfs64 * attemp to completely fix linux problem!
2018-05-07 11:27:32 +00:00
endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
if(NOT OS_LINUX AND NOT OS_FREEBSD AND NOT OS_OPENBSD AND NOT OS_DRAGONFLY
AND NOT OS_SOLARIS AND NOT OS_HAIKU AND NOT OS_DARWIN)
message(FATAL_ERROR "Your platform, '${CMAKE_SYSTEM_NAME}', is not currently supported. Patches are welcome.")
Solaris support (#445) * Basic Solaris support * Fixed indentation & minor improvements * support for diskio
2018-01-19 14:00:42 +00:00
endif(NOT OS_LINUX AND NOT OS_FREEBSD AND NOT OS_OPENBSD AND NOT OS_DRAGONFLY
Basic macOS support (#480) * Initial patches for Darwin support * cmake files ready for building on Sierra. Dont know about other OSX versions * Added darwin.h which will contain darwin specific headers * Patches for enablin asprintf support (needs _POSIX_C_SOURCE >= __DARWIN_C_FULL so remove -D_POSIX_C_SOURCE=200809L). What is more, -D_LARGEFILE64_SOURCE is used by default so not needed on macOS * Stubs for get_entropy_avail and get_entropy_poolsize * More progress to getting to build * More patches * Now builds, remains fixing linking errors. Also implemented some functions * Now links * Now conky runs without sigabrt()'ing... An exception in semaphore.hh caused it to crash immediately upon initialisation * README changes * This was based on an old attempt I did with porting conky where I hadn't cloned the repo and thus it showed 3166 commits behind * Patched a bit the semaphore.hh and now conky runs at 0.7% CPU usage and not in 100% or 200% as it did before! Yeah * This update fixes swap-related miscalculations, though: On macOS there can be used MANY swapfiles ( NOT swap partitions,,, the installation disk is the partition for storing swap memory data ) Thus conky code must be updated for Darwin to support multi-swapfile usage stats. For now, we default to showing stats for swapfile0 * Fixed a bit the comments so they make sense * Realised that the sysctl code can give us stats for the whole swap storage so removed the swapmode( int swapfd, unsigned long * retvail, unsigned long * retfree ) * I think the code is in good condition now * semaphore.hh: Implemented ~semaphore() and added throwing exception when sem initialisation fails just like in sem() for linux… darwin.cc: partially implemented update_cpu_usage() and update_total_processes() * Implements update_total_processes() ( Now it finds the correct number of tasks ) the changes in cmake file don’t change the functionality… It is only comments. In upcoming updates lua support may be enabled and the comments are related to lua support. * get_cpu_count() now conforms to newer sysctl code as suggested by Apple ( we use hw.logicalcpumax instead of hw.ncpus ) --> The new implementation of get_cpu_count() finds the the max value of logical cores the mac could use on a boot. update_total_processes() was patched to allow initialising only ONCE when conky runs the machHost and processorSet ( this could probably be implemented in a better way I guess though... ) * patch * experimental support for get_top_info() and update_cpu_usage() :) * going to patch stuff * adds getting rss memory in get_top_info() * fixes * Couple things made more beautiful but too many things to fix ... * Remove unneeded code from darwin_soundcard.h and keep only needed to compile ( This way we are compatible to GPLv3, i think ) Include GPLv3 header in darwin.cc, darwin.h and darwin_soundcard.h Add more beautiful and explanatory comments to ease the work of other contributors… ( Mostly on things that don’t work! ) * Merged the macOS update_cpu_usage() implementation with the linux implementation but still it doesn't work as expected, plus, there are more memory related problems that will be fixed in newer release! NOTE: It will be really good to see how functions are implemented on linux.cc for more complete implementation * Now using a more linux-influenced implementation and dropping the old... ( only keeps mach stuff ) Needs some more work though to print accurate percentage! :) * Add conky installer (.pkg) project * Now gets thread count aswell! For now, we get this from update_total_processes... Also, removed the installer project because I need to learn more the software * Properly get thread count! - Patched core.cc to enable getting threads count on macOS! - Cleanup in darwin.cc * sort out some things in the code: - running_threads_count is not the same as thread_count on macOS! There is actually a difference! Correct a bit the code! * Enable the if_mounted command and start implementing the check_mount function in darwin.cc * Tighten things up * This patch makes conky build easily and without patching on any supported macOS version! The new flag introduced is a temporary solution for allowing conky to compile on other OS without tweaking the cmake files. If you want to compile it with i18l support you will have to run the command: brew link gettext after you install gettext * Update README to provide more complete info on building on macOS * Fix * patch check_mounted + SIP status This commit: - patches check_mounted function to match the implementation found in FreeBSD.cc! Now conky expects typing something like this: conky -t '${if_mounted /Volumes/MacOS} ${endif}' Please note that the correct way is "/Volumes/MacOS", not "/Volumes/MacOS/" ! You shouldnt put the backslash at the end... It will not work! - Adds a new command called sip_status which you can use to make conky show System Integrity Protection related information such as if filesystem protection is enabled, if user approved kexts protection is enabled and more... you can type conky -t '$sip_status' to see what it does... ( I will most likely update some things later regarding sip_status and check_mounted ) * Further implement sip_status sip_status now has different functionality! If you give no arguments it shows whether SIP is enabled or disabled ( generally ) If you give argument ( takes only ONE ) you can specify which specific thing of SIP you want to show status for... You need to pass 0, 1, ..., 9 to $sip_status as argument to print status for apple-internal, untrusted-kexts, and more... Below you can see the list: ARG: RESULT: nothing --> print enabled / disabled 0 --> allow_apple_internal 1 --> allow_untrusted_kexts 2 --> allow_task_for_pid 3 --> allow_unrestricted_fs 4 --> allow_kernel_debugger 5 --> allow_unrestricted_dtrace 6 --> allow_unrestricted_nvram 7 --> allow_device_configuration 8 --> allow_any_recovery_os 9 --> allow_user_approved_kexts * sip_status progress & if_up enabled This commit adds the 'a' argument for $sip_status which checks if the SIP configuration is ok or it is likely to break in the future. Also, enabled the $if_up command, but there are some problems with it... * sip_status patches - Updated code based on newest version of csrstat utility (v.1.8) The 1.8 version fixes a problem in finding status of ALLOW_DEVICE_CONFIGURATION flag. - Fixed a bug where we mistakenly printed 'disabled' even when SIP was enabled. * Disable ncurses checks in a way that will allow compiling for other OSes! ( it was a really quick patch before ) * More changes in cmake file to make code prettier and more exact * More cmake files cuteness * work for supporting versions prior Sierra This patch brings more compatibility with versions prior to Sierra. The project as is nearly links on a 10.9.5 OSX installation. - on versions prior Sierra clock_gettime() is not implemented thus we need to provide our own implementation for conky to work. ( Currently we have minimal support, more studying needs to be done ) NOTE: In order to compile on versions as old as Mavericks you will need newer compilers because command line tools for 10.9.5 dont support some C++11 features... For this I donwloaded the commandline tools for Xcode 8.1 ( or 8 dont remember well ) and installed only the CommandLine Tools section with Pacifist! ( The OSX installer sees the OS as too old, so you need pacifist! ) * Oops * $if_mounted ready This patch removes the unneded print_mounted() function! Also cleanup code. * $if_up works I think $if_up command works therefore remove the APPLE specific code in core.cc ( there wasnt anything different anyway ) and use the FreeBSD code. Minor conky output changes in darwin.cc * fix compatibility with Mavericks and before... This update allows conky to be compiled on Mavericks and before by checking at compilation time what our build target is. If it is Mavericks or lower, then cant use the csr_get_active_config func because it is not available. On higher versions than Mavericks it works as before... NOTE: For compiling on Mavericks or lower you will have to write 10.9 in CMAKE_OSX_DEPLOYMENT_TARGET when you run ccmake * Added link for youtube video showing conky running on macOS * Improvements Minor improvements related to style Removed unneeded free() calls * Simplify Xcode configuration process! :) * Removed update_cpu_usage() implementation It was quite buggy so I removed it... * Cleanup the source code 1. Bogus TODO comments have been deleted! 2. Started using DEBUG_MODE based printf 3. Explain some things better/cleanup * Last small cleanup The TODO in get_from_load_info() was unneeded. Removed! Also, DEBUG_MODE is enabled for now... * update authors file * Improve README Make it more clean and easier to understand. * Update README.md small tweak * Work for conforming with "Development" rules 1. Add to variables.xml documentation about the $sip_status variable. 2. Add sip_status variable to conkyrc.vim and nanorc to allow highlighting 3. the friends in darwin.cc is ambiguous,,, some are more than friends. * First patch set that implements get_top_info() :) * Calculate cpu usage of all processes more efficiently. (Now results match Activity Monitor's results a lot!!!) More info about the get_top_info() implementation will come once I finish it! (soon) * Cleanup patch! o Move a couple things to better places o Rename get_sample() to get_cpu_sample() to allow to be used by different functions such as get_cpu_usage() ( this is a scene from the future... ) o Improve the way we get cpu usage for each process by passing the already created proc_taskinfo struct to the appropriate function instead of creating another one inside it! * Correctly enable $running_processes variable In our implementation update_top() doesn't calculate the count of running processes! We assign this functionality to the update_running_processes() function. * Removed unneeded flag This is not needed because we do not use update_top() for getting the number of running processes! * Update README.md * Update README.md This adds support for TravisCL. Though this will compile the project only on Linux it is a good sign to know if our port still can compile on Linux or we have broken things. It seems like it can't but I suspect the problem existed before my patches. I will investigate. * First patch towards implementing #15 This patch a reworked get_top_info(). We now use the function get_top_info_for_kinfo_proc() to set the contents of each |process| struct. Also, we calculate the total cpu usage and total process usage concurrently using GCD. Aside from these we bring the function helper_get_proc_list() which makes the code simpler and cleaner. * First fix for the algorithm that calculates % CPU usage of a process The previous patch made the algorithm buggy. It required more reentrant-safe functions. Make calc_cpu_total_r() which is a more reentrant-safe reimplementation of the calc_cpu_total() function. This is not the last commit, more are coming in the future. * Previous commit wasn't pushed... * Problems committing * Make the code cleaner but break the algorithm again #15 The algorithm doesn't work... It is a work in progress! But this time we have merged the cpu_info and cpusample into one struct called cpusample ( I copied some variables from the linux implementation but they will probably be removed ) * Rework the code a bit / CPU usage % algorithm still doesn't work Now get_from_load_info() is renamed to helper_update_threads_processes() and is called by both update_threads() and update_total_processes() This makes the code nicer and removes the enum with the flags * cleanup remove unneeded functions, remove unneeded variables * bugfix * bugfix * remove the whole get_top_info() code! I will rework a lot this code so we can get rid of it. * Work for #15 Now we use the ultimate solution for calculating % usage of CPU of a process! Check the #15 Issue for information about this patch! * Quick memory leak fix & some patches for the get_top_info algorithm * quick patch for semaphore class * Update the comments * For consistency * temp * Revert "Merge branch 'master' into update_cpu_usage" This reverts commit 7267a515c40d54b85107e51016703e6c10f3183e, reversing changes made to 2190ff0b51463c12c61b3357cf846b8e705ebeb4. * Revert "Revert "Merge branch 'master' into update_cpu_usage"" This reverts commit 692bd27a3adb2fe7027d65932467a140e42cc7bc. * Partially implement the overall % CPU usage * bug fix: I meant procs and threads! * make the code better part1 * cleanup * Stabilise the values of get_cpu_sample(). Affects get_top_info() and update_cpu_usage() ( fixes #13 and #15 ) For some reason the code that used host_statistics() function didn't produced bad values quite often. Replaced the function with host_processor_info() and changed the algorithm and now the values are correct! This affects the get_top_info() and update_cpu_usage() functions which wouldn't work correctly until now. * Finish the optimised version of get_top_info() Fixes #15 * Quick fix for #16 Probably I will come up with a different location for get_cpu_count() because I want to conform to linux implementation. Also, the memory leak I am mentioning in get_cpu_count() may not actually exist, as I suspected in the back of my head. * Strictness * Cleanup ConkyPlatformChecks.cmake Cleanup the quick patch code for Lua. * Add warning to README If you are using old version of cmake, update it. It will probably have problems when trying to locate lua. * More cleanup * Fix identation This simplifies the diff. Also, note that by merging the new code for checking for NCURSES we acheive better compatibility and easy build process * Remove mixer related patches and files With the newest patches from upstream, cmake checks if the header soundcard.h exists on the system. If it doesn't exist (in the case of macOS for example) all mixer-related variables are disabled. * Changes for using as submodule for ConkyX * Fixes * Implement get_freq This implements #11 Though it doesn't support getting the **current** cpu frequency. I haven't found a way to do it on macOS but i guess it can be done using a kernel extension. I may come back to this again in the future * First work for correcting mem stats #6 Incorporate the update_pages_stolen() function and all of its dependencies. I will see if I can patch the code in order to avoid license problems * Work for #6 Now we follow the way apple's top works and not Activity Monitor. For this reason we find different values. But correct based on top. * cleanup for #6 * bug fix 1 * cleanup * hmm sorry * More cleanup - Move the libtop_tsamp_t object to darwin.cc. - Remove unneeded member variables. * A bit documentation * Implement secondary memory stats #6 Implement memwithbuffers, memeasyfree and memfree (which isn't secondary) * Quit update_meminfo if libtop_tsamp_update_vm_stats() failed * Update README.md Revert to original conky readme Move all macOS related information to the Wiki: https://github.com/Conky-for-macOS/conky-for-macOS/wiki * Alot junk slipped in too! * Merge net_stats branch For now, I have only tested up / down bytes count on en0, and it works. This is for #14 * Corrections - Fix License headers in darwin* files - Remove ConkyX entry from .gitignore which slipped into from the "forConkyX" branch which was used for another project ... ConkyX. - Cleanup top.h (I will request the changes in a pull request finally) * Fix identation and cleanup * identation-fixes part1 * Try to fix problem compiling on linux Improve checks for headers in ConkyPlatformChecks.cmake to amend the problem; I mistakenly thought that statfs64 wasn't available in sys/statfs.h in macOS thus I tried to add platform specific code. Though, I add the checks in the wrong place and also messed up linux-specific code by replacing checks_include sys/statfs with check_symbol_exists statfs64 * attemp to completely fix linux problem!
2018-05-07 11:27:32 +00:00
AND NOT OS_SOLARIS AND NOT OS_HAIKU AND NOT OS_DARWIN)
Preliminary import from 2.8.1 git release * don't use kvm_* calls, just sysctl (so no suid perm necessary) * sysctls calls in general aren't thread safe, collapse callbacks using same sysctls (specifically total/running procs and proc list ones). Some sysctls need two calls (first to get size of obj returned, second to get object self); if different threads use this schema on same sysctl, weird values are returned (first/second calls sequence should be serialized). In general it makes not much sense too having more threads that use the same sysctl; just get info once and populate all data. * add DragonFly specific extended uname string ($version in conky.conf) with git version and signature Todo: - top process list logic is old style, use top.cc funcs. - find a solution for cpu freq Signed-off-by: Pavel Labath <pavelo@centrum.sk>
2012-06-28 16:56:01 +00:00
Fix to soundcard.h issue (#464) * Fix to issue #463 Add platform check for the soundcard header * Update ConkyPlatformChecks.cmake
2018-02-27 16:34:19 +00:00
# Check for soundcard header
if(OS_LINUX)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
check_include_files("linux/soundcard.h" HAVE_SOME_SOUNDCARD_H)
check_include_files("linux/soundcard.h" HAVE_LINUX_SOUNDCARD_H)
Fix to soundcard.h issue (#464) * Fix to issue #463 Add platform check for the soundcard header * Update ConkyPlatformChecks.cmake
2018-02-27 16:34:19 +00:00
elseif(OS_OPENBSD)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
check_include_files("soundcard.h" HAVE_SOME_SOUNDCARD_H)
Fix to soundcard.h issue (#464) * Fix to issue #463 Add platform check for the soundcard header * Update ConkyPlatformChecks.cmake
2018-02-27 16:34:19 +00:00
else(OS_LINUX)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
check_include_files("sys/soundcard.h" HAVE_SOME_SOUNDCARD_H)
Fix to soundcard.h issue (#464) * Fix to issue #463 Add platform check for the soundcard header * Update ConkyPlatformChecks.cmake
2018-02-27 16:34:19 +00:00
endif(OS_LINUX)
Preliminary import from 2.8.1 git release * don't use kvm_* calls, just sysctl (so no suid perm necessary) * sysctls calls in general aren't thread safe, collapse callbacks using same sysctls (specifically total/running procs and proc list ones). Some sysctls need two calls (first to get size of obj returned, second to get object self); if different threads use this schema on same sysctl, weird values are returned (first/second calls sequence should be serialized). In general it makes not much sense too having more threads that use the same sysctl; just get info once and populate all data. * add DragonFly specific extended uname string ($version in conky.conf) with git version and signature Todo: - top process list logic is old style, use top.cc funcs. - find a solution for cpu freq Signed-off-by: Pavel Labath <pavelo@centrum.sk>
2012-06-28 16:56:01 +00:00
if(BUILD_I18N AND OS_DRAGONFLY)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
set(conky_libs ${conky_libs} -lintl)
Preliminary import from 2.8.1 git release * don't use kvm_* calls, just sysctl (so no suid perm necessary) * sysctls calls in general aren't thread safe, collapse callbacks using same sysctls (specifically total/running procs and proc list ones). Some sysctls need two calls (first to get size of obj returned, second to get object self); if different threads use this schema on same sysctl, weird values are returned (first/second calls sequence should be serialized). In general it makes not much sense too having more threads that use the same sysctl; just get info once and populate all data. * add DragonFly specific extended uname string ($version in conky.conf) with git version and signature Todo: - top process list logic is old style, use top.cc funcs. - find a solution for cpu freq Signed-off-by: Pavel Labath <pavelo@centrum.sk>
2012-06-28 16:56:01 +00:00
endif(BUILD_I18N AND OS_DRAGONFLY)
Improve platform stuff.
2009-12-07 17:35:43 +00:00
Basic macOS support (#480) * Initial patches for Darwin support * cmake files ready for building on Sierra. Dont know about other OSX versions * Added darwin.h which will contain darwin specific headers * Patches for enablin asprintf support (needs _POSIX_C_SOURCE >= __DARWIN_C_FULL so remove -D_POSIX_C_SOURCE=200809L). What is more, -D_LARGEFILE64_SOURCE is used by default so not needed on macOS * Stubs for get_entropy_avail and get_entropy_poolsize * More progress to getting to build * More patches * Now builds, remains fixing linking errors. Also implemented some functions * Now links * Now conky runs without sigabrt()'ing... An exception in semaphore.hh caused it to crash immediately upon initialisation * README changes * This was based on an old attempt I did with porting conky where I hadn't cloned the repo and thus it showed 3166 commits behind * Patched a bit the semaphore.hh and now conky runs at 0.7% CPU usage and not in 100% or 200% as it did before! Yeah * This update fixes swap-related miscalculations, though: On macOS there can be used MANY swapfiles ( NOT swap partitions,,, the installation disk is the partition for storing swap memory data ) Thus conky code must be updated for Darwin to support multi-swapfile usage stats. For now, we default to showing stats for swapfile0 * Fixed a bit the comments so they make sense * Realised that the sysctl code can give us stats for the whole swap storage so removed the swapmode( int swapfd, unsigned long * retvail, unsigned long * retfree ) * I think the code is in good condition now * semaphore.hh: Implemented ~semaphore() and added throwing exception when sem initialisation fails just like in sem() for linux… darwin.cc: partially implemented update_cpu_usage() and update_total_processes() * Implements update_total_processes() ( Now it finds the correct number of tasks ) the changes in cmake file don’t change the functionality… It is only comments. In upcoming updates lua support may be enabled and the comments are related to lua support. * get_cpu_count() now conforms to newer sysctl code as suggested by Apple ( we use hw.logicalcpumax instead of hw.ncpus ) --> The new implementation of get_cpu_count() finds the the max value of logical cores the mac could use on a boot. update_total_processes() was patched to allow initialising only ONCE when conky runs the machHost and processorSet ( this could probably be implemented in a better way I guess though... ) * patch * experimental support for get_top_info() and update_cpu_usage() :) * going to patch stuff * adds getting rss memory in get_top_info() * fixes * Couple things made more beautiful but too many things to fix ... * Remove unneeded code from darwin_soundcard.h and keep only needed to compile ( This way we are compatible to GPLv3, i think ) Include GPLv3 header in darwin.cc, darwin.h and darwin_soundcard.h Add more beautiful and explanatory comments to ease the work of other contributors… ( Mostly on things that don’t work! ) * Merged the macOS update_cpu_usage() implementation with the linux implementation but still it doesn't work as expected, plus, there are more memory related problems that will be fixed in newer release! NOTE: It will be really good to see how functions are implemented on linux.cc for more complete implementation * Now using a more linux-influenced implementation and dropping the old... ( only keeps mach stuff ) Needs some more work though to print accurate percentage! :) * Add conky installer (.pkg) project * Now gets thread count aswell! For now, we get this from update_total_processes... Also, removed the installer project because I need to learn more the software * Properly get thread count! - Patched core.cc to enable getting threads count on macOS! - Cleanup in darwin.cc * sort out some things in the code: - running_threads_count is not the same as thread_count on macOS! There is actually a difference! Correct a bit the code! * Enable the if_mounted command and start implementing the check_mount function in darwin.cc * Tighten things up * This patch makes conky build easily and without patching on any supported macOS version! The new flag introduced is a temporary solution for allowing conky to compile on other OS without tweaking the cmake files. If you want to compile it with i18l support you will have to run the command: brew link gettext after you install gettext * Update README to provide more complete info on building on macOS * Fix * patch check_mounted + SIP status This commit: - patches check_mounted function to match the implementation found in FreeBSD.cc! Now conky expects typing something like this: conky -t '${if_mounted /Volumes/MacOS} ${endif}' Please note that the correct way is "/Volumes/MacOS", not "/Volumes/MacOS/" ! You shouldnt put the backslash at the end... It will not work! - Adds a new command called sip_status which you can use to make conky show System Integrity Protection related information such as if filesystem protection is enabled, if user approved kexts protection is enabled and more... you can type conky -t '$sip_status' to see what it does... ( I will most likely update some things later regarding sip_status and check_mounted ) * Further implement sip_status sip_status now has different functionality! If you give no arguments it shows whether SIP is enabled or disabled ( generally ) If you give argument ( takes only ONE ) you can specify which specific thing of SIP you want to show status for... You need to pass 0, 1, ..., 9 to $sip_status as argument to print status for apple-internal, untrusted-kexts, and more... Below you can see the list: ARG: RESULT: nothing --> print enabled / disabled 0 --> allow_apple_internal 1 --> allow_untrusted_kexts 2 --> allow_task_for_pid 3 --> allow_unrestricted_fs 4 --> allow_kernel_debugger 5 --> allow_unrestricted_dtrace 6 --> allow_unrestricted_nvram 7 --> allow_device_configuration 8 --> allow_any_recovery_os 9 --> allow_user_approved_kexts * sip_status progress & if_up enabled This commit adds the 'a' argument for $sip_status which checks if the SIP configuration is ok or it is likely to break in the future. Also, enabled the $if_up command, but there are some problems with it... * sip_status patches - Updated code based on newest version of csrstat utility (v.1.8) The 1.8 version fixes a problem in finding status of ALLOW_DEVICE_CONFIGURATION flag. - Fixed a bug where we mistakenly printed 'disabled' even when SIP was enabled. * Disable ncurses checks in a way that will allow compiling for other OSes! ( it was a really quick patch before ) * More changes in cmake file to make code prettier and more exact * More cmake files cuteness * work for supporting versions prior Sierra This patch brings more compatibility with versions prior to Sierra. The project as is nearly links on a 10.9.5 OSX installation. - on versions prior Sierra clock_gettime() is not implemented thus we need to provide our own implementation for conky to work. ( Currently we have minimal support, more studying needs to be done ) NOTE: In order to compile on versions as old as Mavericks you will need newer compilers because command line tools for 10.9.5 dont support some C++11 features... For this I donwloaded the commandline tools for Xcode 8.1 ( or 8 dont remember well ) and installed only the CommandLine Tools section with Pacifist! ( The OSX installer sees the OS as too old, so you need pacifist! ) * Oops * $if_mounted ready This patch removes the unneded print_mounted() function! Also cleanup code. * $if_up works I think $if_up command works therefore remove the APPLE specific code in core.cc ( there wasnt anything different anyway ) and use the FreeBSD code. Minor conky output changes in darwin.cc * fix compatibility with Mavericks and before... This update allows conky to be compiled on Mavericks and before by checking at compilation time what our build target is. If it is Mavericks or lower, then cant use the csr_get_active_config func because it is not available. On higher versions than Mavericks it works as before... NOTE: For compiling on Mavericks or lower you will have to write 10.9 in CMAKE_OSX_DEPLOYMENT_TARGET when you run ccmake * Added link for youtube video showing conky running on macOS * Improvements Minor improvements related to style Removed unneeded free() calls * Simplify Xcode configuration process! :) * Removed update_cpu_usage() implementation It was quite buggy so I removed it... * Cleanup the source code 1. Bogus TODO comments have been deleted! 2. Started using DEBUG_MODE based printf 3. Explain some things better/cleanup * Last small cleanup The TODO in get_from_load_info() was unneeded. Removed! Also, DEBUG_MODE is enabled for now... * update authors file * Improve README Make it more clean and easier to understand. * Update README.md small tweak * Work for conforming with "Development" rules 1. Add to variables.xml documentation about the $sip_status variable. 2. Add sip_status variable to conkyrc.vim and nanorc to allow highlighting 3. the friends in darwin.cc is ambiguous,,, some are more than friends. * First patch set that implements get_top_info() :) * Calculate cpu usage of all processes more efficiently. (Now results match Activity Monitor's results a lot!!!) More info about the get_top_info() implementation will come once I finish it! (soon) * Cleanup patch! o Move a couple things to better places o Rename get_sample() to get_cpu_sample() to allow to be used by different functions such as get_cpu_usage() ( this is a scene from the future... ) o Improve the way we get cpu usage for each process by passing the already created proc_taskinfo struct to the appropriate function instead of creating another one inside it! * Correctly enable $running_processes variable In our implementation update_top() doesn't calculate the count of running processes! We assign this functionality to the update_running_processes() function. * Removed unneeded flag This is not needed because we do not use update_top() for getting the number of running processes! * Update README.md * Update README.md This adds support for TravisCL. Though this will compile the project only on Linux it is a good sign to know if our port still can compile on Linux or we have broken things. It seems like it can't but I suspect the problem existed before my patches. I will investigate. * First patch towards implementing #15 This patch a reworked get_top_info(). We now use the function get_top_info_for_kinfo_proc() to set the contents of each |process| struct. Also, we calculate the total cpu usage and total process usage concurrently using GCD. Aside from these we bring the function helper_get_proc_list() which makes the code simpler and cleaner. * First fix for the algorithm that calculates % CPU usage of a process The previous patch made the algorithm buggy. It required more reentrant-safe functions. Make calc_cpu_total_r() which is a more reentrant-safe reimplementation of the calc_cpu_total() function. This is not the last commit, more are coming in the future. * Previous commit wasn't pushed... * Problems committing * Make the code cleaner but break the algorithm again #15 The algorithm doesn't work... It is a work in progress! But this time we have merged the cpu_info and cpusample into one struct called cpusample ( I copied some variables from the linux implementation but they will probably be removed ) * Rework the code a bit / CPU usage % algorithm still doesn't work Now get_from_load_info() is renamed to helper_update_threads_processes() and is called by both update_threads() and update_total_processes() This makes the code nicer and removes the enum with the flags * cleanup remove unneeded functions, remove unneeded variables * bugfix * bugfix * remove the whole get_top_info() code! I will rework a lot this code so we can get rid of it. * Work for #15 Now we use the ultimate solution for calculating % usage of CPU of a process! Check the #15 Issue for information about this patch! * Quick memory leak fix & some patches for the get_top_info algorithm * quick patch for semaphore class * Update the comments * For consistency * temp * Revert "Merge branch 'master' into update_cpu_usage" This reverts commit 7267a515c40d54b85107e51016703e6c10f3183e, reversing changes made to 2190ff0b51463c12c61b3357cf846b8e705ebeb4. * Revert "Revert "Merge branch 'master' into update_cpu_usage"" This reverts commit 692bd27a3adb2fe7027d65932467a140e42cc7bc. * Partially implement the overall % CPU usage * bug fix: I meant procs and threads! * make the code better part1 * cleanup * Stabilise the values of get_cpu_sample(). Affects get_top_info() and update_cpu_usage() ( fixes #13 and #15 ) For some reason the code that used host_statistics() function didn't produced bad values quite often. Replaced the function with host_processor_info() and changed the algorithm and now the values are correct! This affects the get_top_info() and update_cpu_usage() functions which wouldn't work correctly until now. * Finish the optimised version of get_top_info() Fixes #15 * Quick fix for #16 Probably I will come up with a different location for get_cpu_count() because I want to conform to linux implementation. Also, the memory leak I am mentioning in get_cpu_count() may not actually exist, as I suspected in the back of my head. * Strictness * Cleanup ConkyPlatformChecks.cmake Cleanup the quick patch code for Lua. * Add warning to README If you are using old version of cmake, update it. It will probably have problems when trying to locate lua. * More cleanup * Fix identation This simplifies the diff. Also, note that by merging the new code for checking for NCURSES we acheive better compatibility and easy build process * Remove mixer related patches and files With the newest patches from upstream, cmake checks if the header soundcard.h exists on the system. If it doesn't exist (in the case of macOS for example) all mixer-related variables are disabled. * Changes for using as submodule for ConkyX * Fixes * Implement get_freq This implements #11 Though it doesn't support getting the **current** cpu frequency. I haven't found a way to do it on macOS but i guess it can be done using a kernel extension. I may come back to this again in the future * First work for correcting mem stats #6 Incorporate the update_pages_stolen() function and all of its dependencies. I will see if I can patch the code in order to avoid license problems * Work for #6 Now we follow the way apple's top works and not Activity Monitor. For this reason we find different values. But correct based on top. * cleanup for #6 * bug fix 1 * cleanup * hmm sorry * More cleanup - Move the libtop_tsamp_t object to darwin.cc. - Remove unneeded member variables. * A bit documentation * Implement secondary memory stats #6 Implement memwithbuffers, memeasyfree and memfree (which isn't secondary) * Quit update_meminfo if libtop_tsamp_update_vm_stats() failed * Update README.md Revert to original conky readme Move all macOS related information to the Wiki: https://github.com/Conky-for-macOS/conky-for-macOS/wiki * Alot junk slipped in too! * Merge net_stats branch For now, I have only tested up / down bytes count on en0, and it works. This is for #14 * Corrections - Fix License headers in darwin* files - Remove ConkyX entry from .gitignore which slipped into from the "forConkyX" branch which was used for another project ... ConkyX. - Cleanup top.h (I will request the changes in a pull request finally) * Fix identation and cleanup * identation-fixes part1 * Try to fix problem compiling on linux Improve checks for headers in ConkyPlatformChecks.cmake to amend the problem; I mistakenly thought that statfs64 wasn't available in sys/statfs.h in macOS thus I tried to add platform specific code. Though, I add the checks in the wrong place and also messed up linux-specific code by replacing checks_include sys/statfs with check_symbol_exists statfs64 * attemp to completely fix linux problem!
2018-05-07 11:27:32 +00:00
if(BUILD_I18N AND OS_DARWIN)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
find_path(LIBINTL_H_N libintl.h PATHS
/usr/local/opt/gettext/include
/usr/include
/usr/local/include
/usr/local/opt/include
)
if(LIBINTL_H_N)
include_directories(${LIBINTL_H_N})
else(LIBINTL_H_N)
message(FATAL_ERROR "Unable to find libintl.h (try `brew install gettext`)")
endif(LIBINTL_H_N)
find_library(INTL_LIB NAMES intl PATHS
/usr/local/opt/gettext/lib
/usr/lib
/usr/local/lib
/usr/local/opt/lib
)
set(conky_libs ${conky_libs} ${INTL_LIB})
Basic macOS support (#480) * Initial patches for Darwin support * cmake files ready for building on Sierra. Dont know about other OSX versions * Added darwin.h which will contain darwin specific headers * Patches for enablin asprintf support (needs _POSIX_C_SOURCE >= __DARWIN_C_FULL so remove -D_POSIX_C_SOURCE=200809L). What is more, -D_LARGEFILE64_SOURCE is used by default so not needed on macOS * Stubs for get_entropy_avail and get_entropy_poolsize * More progress to getting to build * More patches * Now builds, remains fixing linking errors. Also implemented some functions * Now links * Now conky runs without sigabrt()'ing... An exception in semaphore.hh caused it to crash immediately upon initialisation * README changes * This was based on an old attempt I did with porting conky where I hadn't cloned the repo and thus it showed 3166 commits behind * Patched a bit the semaphore.hh and now conky runs at 0.7% CPU usage and not in 100% or 200% as it did before! Yeah * This update fixes swap-related miscalculations, though: On macOS there can be used MANY swapfiles ( NOT swap partitions,,, the installation disk is the partition for storing swap memory data ) Thus conky code must be updated for Darwin to support multi-swapfile usage stats. For now, we default to showing stats for swapfile0 * Fixed a bit the comments so they make sense * Realised that the sysctl code can give us stats for the whole swap storage so removed the swapmode( int swapfd, unsigned long * retvail, unsigned long * retfree ) * I think the code is in good condition now * semaphore.hh: Implemented ~semaphore() and added throwing exception when sem initialisation fails just like in sem() for linux… darwin.cc: partially implemented update_cpu_usage() and update_total_processes() * Implements update_total_processes() ( Now it finds the correct number of tasks ) the changes in cmake file don’t change the functionality… It is only comments. In upcoming updates lua support may be enabled and the comments are related to lua support. * get_cpu_count() now conforms to newer sysctl code as suggested by Apple ( we use hw.logicalcpumax instead of hw.ncpus ) --> The new implementation of get_cpu_count() finds the the max value of logical cores the mac could use on a boot. update_total_processes() was patched to allow initialising only ONCE when conky runs the machHost and processorSet ( this could probably be implemented in a better way I guess though... ) * patch * experimental support for get_top_info() and update_cpu_usage() :) * going to patch stuff * adds getting rss memory in get_top_info() * fixes * Couple things made more beautiful but too many things to fix ... * Remove unneeded code from darwin_soundcard.h and keep only needed to compile ( This way we are compatible to GPLv3, i think ) Include GPLv3 header in darwin.cc, darwin.h and darwin_soundcard.h Add more beautiful and explanatory comments to ease the work of other contributors… ( Mostly on things that don’t work! ) * Merged the macOS update_cpu_usage() implementation with the linux implementation but still it doesn't work as expected, plus, there are more memory related problems that will be fixed in newer release! NOTE: It will be really good to see how functions are implemented on linux.cc for more complete implementation * Now using a more linux-influenced implementation and dropping the old... ( only keeps mach stuff ) Needs some more work though to print accurate percentage! :) * Add conky installer (.pkg) project * Now gets thread count aswell! For now, we get this from update_total_processes... Also, removed the installer project because I need to learn more the software * Properly get thread count! - Patched core.cc to enable getting threads count on macOS! - Cleanup in darwin.cc * sort out some things in the code: - running_threads_count is not the same as thread_count on macOS! There is actually a difference! Correct a bit the code! * Enable the if_mounted command and start implementing the check_mount function in darwin.cc * Tighten things up * This patch makes conky build easily and without patching on any supported macOS version! The new flag introduced is a temporary solution for allowing conky to compile on other OS without tweaking the cmake files. If you want to compile it with i18l support you will have to run the command: brew link gettext after you install gettext * Update README to provide more complete info on building on macOS * Fix * patch check_mounted + SIP status This commit: - patches check_mounted function to match the implementation found in FreeBSD.cc! Now conky expects typing something like this: conky -t '${if_mounted /Volumes/MacOS} ${endif}' Please note that the correct way is "/Volumes/MacOS", not "/Volumes/MacOS/" ! You shouldnt put the backslash at the end... It will not work! - Adds a new command called sip_status which you can use to make conky show System Integrity Protection related information such as if filesystem protection is enabled, if user approved kexts protection is enabled and more... you can type conky -t '$sip_status' to see what it does... ( I will most likely update some things later regarding sip_status and check_mounted ) * Further implement sip_status sip_status now has different functionality! If you give no arguments it shows whether SIP is enabled or disabled ( generally ) If you give argument ( takes only ONE ) you can specify which specific thing of SIP you want to show status for... You need to pass 0, 1, ..., 9 to $sip_status as argument to print status for apple-internal, untrusted-kexts, and more... Below you can see the list: ARG: RESULT: nothing --> print enabled / disabled 0 --> allow_apple_internal 1 --> allow_untrusted_kexts 2 --> allow_task_for_pid 3 --> allow_unrestricted_fs 4 --> allow_kernel_debugger 5 --> allow_unrestricted_dtrace 6 --> allow_unrestricted_nvram 7 --> allow_device_configuration 8 --> allow_any_recovery_os 9 --> allow_user_approved_kexts * sip_status progress & if_up enabled This commit adds the 'a' argument for $sip_status which checks if the SIP configuration is ok or it is likely to break in the future. Also, enabled the $if_up command, but there are some problems with it... * sip_status patches - Updated code based on newest version of csrstat utility (v.1.8) The 1.8 version fixes a problem in finding status of ALLOW_DEVICE_CONFIGURATION flag. - Fixed a bug where we mistakenly printed 'disabled' even when SIP was enabled. * Disable ncurses checks in a way that will allow compiling for other OSes! ( it was a really quick patch before ) * More changes in cmake file to make code prettier and more exact * More cmake files cuteness * work for supporting versions prior Sierra This patch brings more compatibility with versions prior to Sierra. The project as is nearly links on a 10.9.5 OSX installation. - on versions prior Sierra clock_gettime() is not implemented thus we need to provide our own implementation for conky to work. ( Currently we have minimal support, more studying needs to be done ) NOTE: In order to compile on versions as old as Mavericks you will need newer compilers because command line tools for 10.9.5 dont support some C++11 features... For this I donwloaded the commandline tools for Xcode 8.1 ( or 8 dont remember well ) and installed only the CommandLine Tools section with Pacifist! ( The OSX installer sees the OS as too old, so you need pacifist! ) * Oops * $if_mounted ready This patch removes the unneded print_mounted() function! Also cleanup code. * $if_up works I think $if_up command works therefore remove the APPLE specific code in core.cc ( there wasnt anything different anyway ) and use the FreeBSD code. Minor conky output changes in darwin.cc * fix compatibility with Mavericks and before... This update allows conky to be compiled on Mavericks and before by checking at compilation time what our build target is. If it is Mavericks or lower, then cant use the csr_get_active_config func because it is not available. On higher versions than Mavericks it works as before... NOTE: For compiling on Mavericks or lower you will have to write 10.9 in CMAKE_OSX_DEPLOYMENT_TARGET when you run ccmake * Added link for youtube video showing conky running on macOS * Improvements Minor improvements related to style Removed unneeded free() calls * Simplify Xcode configuration process! :) * Removed update_cpu_usage() implementation It was quite buggy so I removed it... * Cleanup the source code 1. Bogus TODO comments have been deleted! 2. Started using DEBUG_MODE based printf 3. Explain some things better/cleanup * Last small cleanup The TODO in get_from_load_info() was unneeded. Removed! Also, DEBUG_MODE is enabled for now... * update authors file * Improve README Make it more clean and easier to understand. * Update README.md small tweak * Work for conforming with "Development" rules 1. Add to variables.xml documentation about the $sip_status variable. 2. Add sip_status variable to conkyrc.vim and nanorc to allow highlighting 3. the friends in darwin.cc is ambiguous,,, some are more than friends. * First patch set that implements get_top_info() :) * Calculate cpu usage of all processes more efficiently. (Now results match Activity Monitor's results a lot!!!) More info about the get_top_info() implementation will come once I finish it! (soon) * Cleanup patch! o Move a couple things to better places o Rename get_sample() to get_cpu_sample() to allow to be used by different functions such as get_cpu_usage() ( this is a scene from the future... ) o Improve the way we get cpu usage for each process by passing the already created proc_taskinfo struct to the appropriate function instead of creating another one inside it! * Correctly enable $running_processes variable In our implementation update_top() doesn't calculate the count of running processes! We assign this functionality to the update_running_processes() function. * Removed unneeded flag This is not needed because we do not use update_top() for getting the number of running processes! * Update README.md * Update README.md This adds support for TravisCL. Though this will compile the project only on Linux it is a good sign to know if our port still can compile on Linux or we have broken things. It seems like it can't but I suspect the problem existed before my patches. I will investigate. * First patch towards implementing #15 This patch a reworked get_top_info(). We now use the function get_top_info_for_kinfo_proc() to set the contents of each |process| struct. Also, we calculate the total cpu usage and total process usage concurrently using GCD. Aside from these we bring the function helper_get_proc_list() which makes the code simpler and cleaner. * First fix for the algorithm that calculates % CPU usage of a process The previous patch made the algorithm buggy. It required more reentrant-safe functions. Make calc_cpu_total_r() which is a more reentrant-safe reimplementation of the calc_cpu_total() function. This is not the last commit, more are coming in the future. * Previous commit wasn't pushed... * Problems committing * Make the code cleaner but break the algorithm again #15 The algorithm doesn't work... It is a work in progress! But this time we have merged the cpu_info and cpusample into one struct called cpusample ( I copied some variables from the linux implementation but they will probably be removed ) * Rework the code a bit / CPU usage % algorithm still doesn't work Now get_from_load_info() is renamed to helper_update_threads_processes() and is called by both update_threads() and update_total_processes() This makes the code nicer and removes the enum with the flags * cleanup remove unneeded functions, remove unneeded variables * bugfix * bugfix * remove the whole get_top_info() code! I will rework a lot this code so we can get rid of it. * Work for #15 Now we use the ultimate solution for calculating % usage of CPU of a process! Check the #15 Issue for information about this patch! * Quick memory leak fix & some patches for the get_top_info algorithm * quick patch for semaphore class * Update the comments * For consistency * temp * Revert "Merge branch 'master' into update_cpu_usage" This reverts commit 7267a515c40d54b85107e51016703e6c10f3183e, reversing changes made to 2190ff0b51463c12c61b3357cf846b8e705ebeb4. * Revert "Revert "Merge branch 'master' into update_cpu_usage"" This reverts commit 692bd27a3adb2fe7027d65932467a140e42cc7bc. * Partially implement the overall % CPU usage * bug fix: I meant procs and threads! * make the code better part1 * cleanup * Stabilise the values of get_cpu_sample(). Affects get_top_info() and update_cpu_usage() ( fixes #13 and #15 ) For some reason the code that used host_statistics() function didn't produced bad values quite often. Replaced the function with host_processor_info() and changed the algorithm and now the values are correct! This affects the get_top_info() and update_cpu_usage() functions which wouldn't work correctly until now. * Finish the optimised version of get_top_info() Fixes #15 * Quick fix for #16 Probably I will come up with a different location for get_cpu_count() because I want to conform to linux implementation. Also, the memory leak I am mentioning in get_cpu_count() may not actually exist, as I suspected in the back of my head. * Strictness * Cleanup ConkyPlatformChecks.cmake Cleanup the quick patch code for Lua. * Add warning to README If you are using old version of cmake, update it. It will probably have problems when trying to locate lua. * More cleanup * Fix identation This simplifies the diff. Also, note that by merging the new code for checking for NCURSES we acheive better compatibility and easy build process * Remove mixer related patches and files With the newest patches from upstream, cmake checks if the header soundcard.h exists on the system. If it doesn't exist (in the case of macOS for example) all mixer-related variables are disabled. * Changes for using as submodule for ConkyX * Fixes * Implement get_freq This implements #11 Though it doesn't support getting the **current** cpu frequency. I haven't found a way to do it on macOS but i guess it can be done using a kernel extension. I may come back to this again in the future * First work for correcting mem stats #6 Incorporate the update_pages_stolen() function and all of its dependencies. I will see if I can patch the code in order to avoid license problems * Work for #6 Now we follow the way apple's top works and not Activity Monitor. For this reason we find different values. But correct based on top. * cleanup for #6 * bug fix 1 * cleanup * hmm sorry * More cleanup - Move the libtop_tsamp_t object to darwin.cc. - Remove unneeded member variables. * A bit documentation * Implement secondary memory stats #6 Implement memwithbuffers, memeasyfree and memfree (which isn't secondary) * Quit update_meminfo if libtop_tsamp_update_vm_stats() failed * Update README.md Revert to original conky readme Move all macOS related information to the Wiki: https://github.com/Conky-for-macOS/conky-for-macOS/wiki * Alot junk slipped in too! * Merge net_stats branch For now, I have only tested up / down bytes count on en0, and it works. This is for #14 * Corrections - Fix License headers in darwin* files - Remove ConkyX entry from .gitignore which slipped into from the "forConkyX" branch which was used for another project ... ConkyX. - Cleanup top.h (I will request the changes in a pull request finally) * Fix identation and cleanup * identation-fixes part1 * Try to fix problem compiling on linux Improve checks for headers in ConkyPlatformChecks.cmake to amend the problem; I mistakenly thought that statfs64 wasn't available in sys/statfs.h in macOS thus I tried to add platform specific code. Though, I add the checks in the wrong place and also messed up linux-specific code by replacing checks_include sys/statfs with check_symbol_exists statfs64 * attemp to completely fix linux problem!
2018-05-07 11:27:32 +00:00
endif(BUILD_I18N AND OS_DARWIN)
if(BUILD_NCURSES AND OS_DARWIN)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
set(conky_libs ${conky_libs} -lncurses)
Basic macOS support (#480) * Initial patches for Darwin support * cmake files ready for building on Sierra. Dont know about other OSX versions * Added darwin.h which will contain darwin specific headers * Patches for enablin asprintf support (needs _POSIX_C_SOURCE >= __DARWIN_C_FULL so remove -D_POSIX_C_SOURCE=200809L). What is more, -D_LARGEFILE64_SOURCE is used by default so not needed on macOS * Stubs for get_entropy_avail and get_entropy_poolsize * More progress to getting to build * More patches * Now builds, remains fixing linking errors. Also implemented some functions * Now links * Now conky runs without sigabrt()'ing... An exception in semaphore.hh caused it to crash immediately upon initialisation * README changes * This was based on an old attempt I did with porting conky where I hadn't cloned the repo and thus it showed 3166 commits behind * Patched a bit the semaphore.hh and now conky runs at 0.7% CPU usage and not in 100% or 200% as it did before! Yeah * This update fixes swap-related miscalculations, though: On macOS there can be used MANY swapfiles ( NOT swap partitions,,, the installation disk is the partition for storing swap memory data ) Thus conky code must be updated for Darwin to support multi-swapfile usage stats. For now, we default to showing stats for swapfile0 * Fixed a bit the comments so they make sense * Realised that the sysctl code can give us stats for the whole swap storage so removed the swapmode( int swapfd, unsigned long * retvail, unsigned long * retfree ) * I think the code is in good condition now * semaphore.hh: Implemented ~semaphore() and added throwing exception when sem initialisation fails just like in sem() for linux… darwin.cc: partially implemented update_cpu_usage() and update_total_processes() * Implements update_total_processes() ( Now it finds the correct number of tasks ) the changes in cmake file don’t change the functionality… It is only comments. In upcoming updates lua support may be enabled and the comments are related to lua support. * get_cpu_count() now conforms to newer sysctl code as suggested by Apple ( we use hw.logicalcpumax instead of hw.ncpus ) --> The new implementation of get_cpu_count() finds the the max value of logical cores the mac could use on a boot. update_total_processes() was patched to allow initialising only ONCE when conky runs the machHost and processorSet ( this could probably be implemented in a better way I guess though... ) * patch * experimental support for get_top_info() and update_cpu_usage() :) * going to patch stuff * adds getting rss memory in get_top_info() * fixes * Couple things made more beautiful but too many things to fix ... * Remove unneeded code from darwin_soundcard.h and keep only needed to compile ( This way we are compatible to GPLv3, i think ) Include GPLv3 header in darwin.cc, darwin.h and darwin_soundcard.h Add more beautiful and explanatory comments to ease the work of other contributors… ( Mostly on things that don’t work! ) * Merged the macOS update_cpu_usage() implementation with the linux implementation but still it doesn't work as expected, plus, there are more memory related problems that will be fixed in newer release! NOTE: It will be really good to see how functions are implemented on linux.cc for more complete implementation * Now using a more linux-influenced implementation and dropping the old... ( only keeps mach stuff ) Needs some more work though to print accurate percentage! :) * Add conky installer (.pkg) project * Now gets thread count aswell! For now, we get this from update_total_processes... Also, removed the installer project because I need to learn more the software * Properly get thread count! - Patched core.cc to enable getting threads count on macOS! - Cleanup in darwin.cc * sort out some things in the code: - running_threads_count is not the same as thread_count on macOS! There is actually a difference! Correct a bit the code! * Enable the if_mounted command and start implementing the check_mount function in darwin.cc * Tighten things up * This patch makes conky build easily and without patching on any supported macOS version! The new flag introduced is a temporary solution for allowing conky to compile on other OS without tweaking the cmake files. If you want to compile it with i18l support you will have to run the command: brew link gettext after you install gettext * Update README to provide more complete info on building on macOS * Fix * patch check_mounted + SIP status This commit: - patches check_mounted function to match the implementation found in FreeBSD.cc! Now conky expects typing something like this: conky -t '${if_mounted /Volumes/MacOS} ${endif}' Please note that the correct way is "/Volumes/MacOS", not "/Volumes/MacOS/" ! You shouldnt put the backslash at the end... It will not work! - Adds a new command called sip_status which you can use to make conky show System Integrity Protection related information such as if filesystem protection is enabled, if user approved kexts protection is enabled and more... you can type conky -t '$sip_status' to see what it does... ( I will most likely update some things later regarding sip_status and check_mounted ) * Further implement sip_status sip_status now has different functionality! If you give no arguments it shows whether SIP is enabled or disabled ( generally ) If you give argument ( takes only ONE ) you can specify which specific thing of SIP you want to show status for... You need to pass 0, 1, ..., 9 to $sip_status as argument to print status for apple-internal, untrusted-kexts, and more... Below you can see the list: ARG: RESULT: nothing --> print enabled / disabled 0 --> allow_apple_internal 1 --> allow_untrusted_kexts 2 --> allow_task_for_pid 3 --> allow_unrestricted_fs 4 --> allow_kernel_debugger 5 --> allow_unrestricted_dtrace 6 --> allow_unrestricted_nvram 7 --> allow_device_configuration 8 --> allow_any_recovery_os 9 --> allow_user_approved_kexts * sip_status progress & if_up enabled This commit adds the 'a' argument for $sip_status which checks if the SIP configuration is ok or it is likely to break in the future. Also, enabled the $if_up command, but there are some problems with it... * sip_status patches - Updated code based on newest version of csrstat utility (v.1.8) The 1.8 version fixes a problem in finding status of ALLOW_DEVICE_CONFIGURATION flag. - Fixed a bug where we mistakenly printed 'disabled' even when SIP was enabled. * Disable ncurses checks in a way that will allow compiling for other OSes! ( it was a really quick patch before ) * More changes in cmake file to make code prettier and more exact * More cmake files cuteness * work for supporting versions prior Sierra This patch brings more compatibility with versions prior to Sierra. The project as is nearly links on a 10.9.5 OSX installation. - on versions prior Sierra clock_gettime() is not implemented thus we need to provide our own implementation for conky to work. ( Currently we have minimal support, more studying needs to be done ) NOTE: In order to compile on versions as old as Mavericks you will need newer compilers because command line tools for 10.9.5 dont support some C++11 features... For this I donwloaded the commandline tools for Xcode 8.1 ( or 8 dont remember well ) and installed only the CommandLine Tools section with Pacifist! ( The OSX installer sees the OS as too old, so you need pacifist! ) * Oops * $if_mounted ready This patch removes the unneded print_mounted() function! Also cleanup code. * $if_up works I think $if_up command works therefore remove the APPLE specific code in core.cc ( there wasnt anything different anyway ) and use the FreeBSD code. Minor conky output changes in darwin.cc * fix compatibility with Mavericks and before... This update allows conky to be compiled on Mavericks and before by checking at compilation time what our build target is. If it is Mavericks or lower, then cant use the csr_get_active_config func because it is not available. On higher versions than Mavericks it works as before... NOTE: For compiling on Mavericks or lower you will have to write 10.9 in CMAKE_OSX_DEPLOYMENT_TARGET when you run ccmake * Added link for youtube video showing conky running on macOS * Improvements Minor improvements related to style Removed unneeded free() calls * Simplify Xcode configuration process! :) * Removed update_cpu_usage() implementation It was quite buggy so I removed it... * Cleanup the source code 1. Bogus TODO comments have been deleted! 2. Started using DEBUG_MODE based printf 3. Explain some things better/cleanup * Last small cleanup The TODO in get_from_load_info() was unneeded. Removed! Also, DEBUG_MODE is enabled for now... * update authors file * Improve README Make it more clean and easier to understand. * Update README.md small tweak * Work for conforming with "Development" rules 1. Add to variables.xml documentation about the $sip_status variable. 2. Add sip_status variable to conkyrc.vim and nanorc to allow highlighting 3. the friends in darwin.cc is ambiguous,,, some are more than friends. * First patch set that implements get_top_info() :) * Calculate cpu usage of all processes more efficiently. (Now results match Activity Monitor's results a lot!!!) More info about the get_top_info() implementation will come once I finish it! (soon) * Cleanup patch! o Move a couple things to better places o Rename get_sample() to get_cpu_sample() to allow to be used by different functions such as get_cpu_usage() ( this is a scene from the future... ) o Improve the way we get cpu usage for each process by passing the already created proc_taskinfo struct to the appropriate function instead of creating another one inside it! * Correctly enable $running_processes variable In our implementation update_top() doesn't calculate the count of running processes! We assign this functionality to the update_running_processes() function. * Removed unneeded flag This is not needed because we do not use update_top() for getting the number of running processes! * Update README.md * Update README.md This adds support for TravisCL. Though this will compile the project only on Linux it is a good sign to know if our port still can compile on Linux or we have broken things. It seems like it can't but I suspect the problem existed before my patches. I will investigate. * First patch towards implementing #15 This patch a reworked get_top_info(). We now use the function get_top_info_for_kinfo_proc() to set the contents of each |process| struct. Also, we calculate the total cpu usage and total process usage concurrently using GCD. Aside from these we bring the function helper_get_proc_list() which makes the code simpler and cleaner. * First fix for the algorithm that calculates % CPU usage of a process The previous patch made the algorithm buggy. It required more reentrant-safe functions. Make calc_cpu_total_r() which is a more reentrant-safe reimplementation of the calc_cpu_total() function. This is not the last commit, more are coming in the future. * Previous commit wasn't pushed... * Problems committing * Make the code cleaner but break the algorithm again #15 The algorithm doesn't work... It is a work in progress! But this time we have merged the cpu_info and cpusample into one struct called cpusample ( I copied some variables from the linux implementation but they will probably be removed ) * Rework the code a bit / CPU usage % algorithm still doesn't work Now get_from_load_info() is renamed to helper_update_threads_processes() and is called by both update_threads() and update_total_processes() This makes the code nicer and removes the enum with the flags * cleanup remove unneeded functions, remove unneeded variables * bugfix * bugfix * remove the whole get_top_info() code! I will rework a lot this code so we can get rid of it. * Work for #15 Now we use the ultimate solution for calculating % usage of CPU of a process! Check the #15 Issue for information about this patch! * Quick memory leak fix & some patches for the get_top_info algorithm * quick patch for semaphore class * Update the comments * For consistency * temp * Revert "Merge branch 'master' into update_cpu_usage" This reverts commit 7267a515c40d54b85107e51016703e6c10f3183e, reversing changes made to 2190ff0b51463c12c61b3357cf846b8e705ebeb4. * Revert "Revert "Merge branch 'master' into update_cpu_usage"" This reverts commit 692bd27a3adb2fe7027d65932467a140e42cc7bc. * Partially implement the overall % CPU usage * bug fix: I meant procs and threads! * make the code better part1 * cleanup * Stabilise the values of get_cpu_sample(). Affects get_top_info() and update_cpu_usage() ( fixes #13 and #15 ) For some reason the code that used host_statistics() function didn't produced bad values quite often. Replaced the function with host_processor_info() and changed the algorithm and now the values are correct! This affects the get_top_info() and update_cpu_usage() functions which wouldn't work correctly until now. * Finish the optimised version of get_top_info() Fixes #15 * Quick fix for #16 Probably I will come up with a different location for get_cpu_count() because I want to conform to linux implementation. Also, the memory leak I am mentioning in get_cpu_count() may not actually exist, as I suspected in the back of my head. * Strictness * Cleanup ConkyPlatformChecks.cmake Cleanup the quick patch code for Lua. * Add warning to README If you are using old version of cmake, update it. It will probably have problems when trying to locate lua. * More cleanup * Fix identation This simplifies the diff. Also, note that by merging the new code for checking for NCURSES we acheive better compatibility and easy build process * Remove mixer related patches and files With the newest patches from upstream, cmake checks if the header soundcard.h exists on the system. If it doesn't exist (in the case of macOS for example) all mixer-related variables are disabled. * Changes for using as submodule for ConkyX * Fixes * Implement get_freq This implements #11 Though it doesn't support getting the **current** cpu frequency. I haven't found a way to do it on macOS but i guess it can be done using a kernel extension. I may come back to this again in the future * First work for correcting mem stats #6 Incorporate the update_pages_stolen() function and all of its dependencies. I will see if I can patch the code in order to avoid license problems * Work for #6 Now we follow the way apple's top works and not Activity Monitor. For this reason we find different values. But correct based on top. * cleanup for #6 * bug fix 1 * cleanup * hmm sorry * More cleanup - Move the libtop_tsamp_t object to darwin.cc. - Remove unneeded member variables. * A bit documentation * Implement secondary memory stats #6 Implement memwithbuffers, memeasyfree and memfree (which isn't secondary) * Quit update_meminfo if libtop_tsamp_update_vm_stats() failed * Update README.md Revert to original conky readme Move all macOS related information to the Wiki: https://github.com/Conky-for-macOS/conky-for-macOS/wiki * Alot junk slipped in too! * Merge net_stats branch For now, I have only tested up / down bytes count on en0, and it works. This is for #14 * Corrections - Fix License headers in darwin* files - Remove ConkyX entry from .gitignore which slipped into from the "forConkyX" branch which was used for another project ... ConkyX. - Cleanup top.h (I will request the changes in a pull request finally) * Fix identation and cleanup * identation-fixes part1 * Try to fix problem compiling on linux Improve checks for headers in ConkyPlatformChecks.cmake to amend the problem; I mistakenly thought that statfs64 wasn't available in sys/statfs.h in macOS thus I tried to add platform specific code. Though, I add the checks in the wrong place and also messed up linux-specific code by replacing checks_include sys/statfs with check_symbol_exists statfs64 * attemp to completely fix linux problem!
2018-05-07 11:27:32 +00:00
endif(BUILD_NCURSES AND OS_DARWIN)
Conky for mac os master (#579) * Try to amend #31 * BUILD_WLAN should be available for all OS. Keep BUILD_WLAN OFF by default for compatibility reasons. * WLAN-related variables should be available for every OS. There are some problems (probably null-dereference) * Fix $wireless_essid crashing conky if no argument provided. Conky wasn't parsing the argument of the variable as it should, thus wasn't allocating the `dev` member variable. Also fix some documentation stuff. * Improve `get_freq` #20 Using the Intel® Power Gadget API (https://software.intel.com/en-us/blogs/2012/12/13/using-the-intel-power-gadget-api-on-mac-os-x) we can now get actual Core frequency and not the constant factory one. Though, for some weird reason the API gives the same freq for all Cores, thus the |cpu| arg becomes useless. * Oops, this accidently slipped in * Introduce BUILD_IPGFREQ build option This build option has been introduced for one particular reason: On macOS getting current core-frequency is not supported by the APIs. A solution is to install Intel's ® Power Gadget which comes with an .app, a Framework and a kernel-extension. Though, this may trouble some alot, thus introduce BUILD_IPGFREQ. * Forgot static here. * Some improvements for get_freq again. Fix frequency not printing correctly (I wasn't using the divisor) Add more guards. * Setup cmake files and project code for Objective-C code #17 We want to use CoreWLAN framework. * update_cpu_usage() now supports multiple cores Also, some cleanup. * Updated default conky config to monitor Mac Networking * Made Mac Friendly BuildOptions and generic default conky configs * Undid Xdamage config and cleaned up previous IF statements * Re-Added XDamage fix * Finish up the algorithm. I think its now correct. Closes: #33 * Cleanup macro and introduce a no-op free_cpu() function for ALL cpu-related variables free_cpu() must be implemented for every OS and on all except macOS its a no-op function. * Reformat, add empty comment.
2018-08-07 15:54:01 +00:00
if(BUILD_WLAN AND OS_DARWIN)
find_library(CW CoreWLAN)
Wifi (#660) * Work for #17 : Now we have ssid * Since we are using Objective-C++ NSStrings, we need to link to Foundation.framework, too! * If interface is UP use the interface SSID; otherwise "off/any" following the Linux implementation. Add more * More * cleanup
2018-10-11 12:45:43 +00:00
find_library(NS Foundation)
Conky for mac os master (#579) * Try to amend #31 * BUILD_WLAN should be available for all OS. Keep BUILD_WLAN OFF by default for compatibility reasons. * WLAN-related variables should be available for every OS. There are some problems (probably null-dereference) * Fix $wireless_essid crashing conky if no argument provided. Conky wasn't parsing the argument of the variable as it should, thus wasn't allocating the `dev` member variable. Also fix some documentation stuff. * Improve `get_freq` #20 Using the Intel® Power Gadget API (https://software.intel.com/en-us/blogs/2012/12/13/using-the-intel-power-gadget-api-on-mac-os-x) we can now get actual Core frequency and not the constant factory one. Though, for some weird reason the API gives the same freq for all Cores, thus the |cpu| arg becomes useless. * Oops, this accidently slipped in * Introduce BUILD_IPGFREQ build option This build option has been introduced for one particular reason: On macOS getting current core-frequency is not supported by the APIs. A solution is to install Intel's ® Power Gadget which comes with an .app, a Framework and a kernel-extension. Though, this may trouble some alot, thus introduce BUILD_IPGFREQ. * Forgot static here. * Some improvements for get_freq again. Fix frequency not printing correctly (I wasn't using the divisor) Add more guards. * Setup cmake files and project code for Objective-C code #17 We want to use CoreWLAN framework. * update_cpu_usage() now supports multiple cores Also, some cleanup. * Updated default conky config to monitor Mac Networking * Made Mac Friendly BuildOptions and generic default conky configs * Undid Xdamage config and cleaned up previous IF statements * Re-Added XDamage fix * Finish up the algorithm. I think its now correct. Closes: #33 * Cleanup macro and introduce a no-op free_cpu() function for ALL cpu-related variables free_cpu() must be implemented for every OS and on all except macOS its a no-op function. * Reformat, add empty comment.
2018-08-07 15:54:01 +00:00
set(conky_libs ${conky_libs} ${CW})
Wifi (#660) * Work for #17 : Now we have ssid * Since we are using Objective-C++ NSStrings, we need to link to Foundation.framework, too! * If interface is UP use the interface SSID; otherwise "off/any" following the Linux implementation. Add more * More * cleanup
2018-10-11 12:45:43 +00:00
set(conky_libs ${conky_libs} ${NS})
Conky for mac os master (#579) * Try to amend #31 * BUILD_WLAN should be available for all OS. Keep BUILD_WLAN OFF by default for compatibility reasons. * WLAN-related variables should be available for every OS. There are some problems (probably null-dereference) * Fix $wireless_essid crashing conky if no argument provided. Conky wasn't parsing the argument of the variable as it should, thus wasn't allocating the `dev` member variable. Also fix some documentation stuff. * Improve `get_freq` #20 Using the Intel® Power Gadget API (https://software.intel.com/en-us/blogs/2012/12/13/using-the-intel-power-gadget-api-on-mac-os-x) we can now get actual Core frequency and not the constant factory one. Though, for some weird reason the API gives the same freq for all Cores, thus the |cpu| arg becomes useless. * Oops, this accidently slipped in * Introduce BUILD_IPGFREQ build option This build option has been introduced for one particular reason: On macOS getting current core-frequency is not supported by the APIs. A solution is to install Intel's ® Power Gadget which comes with an .app, a Framework and a kernel-extension. Though, this may trouble some alot, thus introduce BUILD_IPGFREQ. * Forgot static here. * Some improvements for get_freq again. Fix frequency not printing correctly (I wasn't using the divisor) Add more guards. * Setup cmake files and project code for Objective-C code #17 We want to use CoreWLAN framework. * update_cpu_usage() now supports multiple cores Also, some cleanup. * Updated default conky config to monitor Mac Networking * Made Mac Friendly BuildOptions and generic default conky configs * Undid Xdamage config and cleaned up previous IF statements * Re-Added XDamage fix * Finish up the algorithm. I think its now correct. Closes: #33 * Cleanup macro and introduce a no-op free_cpu() function for ALL cpu-related variables free_cpu() must be implemented for every OS and on all except macOS its a no-op function. * Reformat, add empty comment.
2018-08-07 15:54:01 +00:00
endif(BUILD_WLAN AND OS_DARWIN)
if(OS_DARWIN AND BUILD_IPGFREQ)
find_library(IPG IntelPowerGadget)
set(conky_libs ${conky_libs} ${IPG})
endif(OS_DARWIN AND BUILD_IPGFREQ)
More work on CMake build system.
2009-12-11 04:37:56 +00:00
if(BUILD_MATH)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
set(conky_libs ${conky_libs} -lm)
More work on CMake build system.
2009-12-11 04:37:56 +00:00
endif(BUILD_MATH)
Add support for $ical
2010-04-27 14:42:21 +00:00
if(BUILD_ICAL)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
check_include_files(libical/ical.h ICAL_H_)
if(NOT ICAL_H_)
message(FATAL_ERROR "Unable to find libical")
endif(NOT ICAL_H_)
set(conky_libs ${conky_libs} -lical)
Add support for $ical
2010-04-27 14:42:21 +00:00
endif(BUILD_ICAL)
Add support for $irc
2010-04-30 17:32:42 +00:00
if(BUILD_IRC)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
find_path(IRC_H_N libircclient.h PATHS /usr/include/libircclient)
find_path(IRC_H_S libircclient.h PATHS /usr/include)
if(IRC_H_N)
include_directories(${IRC_H_N})
endif(IRC_H_N)
if(IRC_H_N OR IRC_H_S)
set(IRC_H_ true)
else()
message(FATAL_ERROR "Unable to find libircclient")
endif(IRC_H_N OR IRC_H_S)
set(conky_libs ${conky_libs} -lircclient)
Add support for $irc
2010-04-30 17:32:42 +00:00
endif(BUILD_IRC)
Add $v6addrs to increase IPv6 support This is only the beginning of the ipv6 support, This var isn't documented and only works on Linux. It should also be patched to show the addresses in compressed format Some other vars should also be added to see things like netmask, scope, routes, ...
2011-02-09 17:49:52 +00:00
if(BUILD_IPV6)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
find_file(IF_INET6 if_inet6 PATHS /proc/net)
if(NOT IF_INET6)
message(WARNING "/proc/net/if_inet6 unavailable")
endif(NOT IF_INET6)
Add $v6addrs to increase IPv6 support This is only the beginning of the ipv6 support, This var isn't documented and only works on Linux. It should also be patched to show the addresses in compressed format Some other vars should also be added to see things like netmask, scope, routes, ...
2011-02-09 17:49:52 +00:00
endif(BUILD_IPV6)
Add support for out_to_http
2010-06-04 12:41:12 +00:00
if(BUILD_HTTP)
Fix problems found when fixing docker (#575) * Require at least glib-2.36 (from 03/2013) to remove deprecated g_type_init() * Fix empty continuation line in Dockerfile * Require at least libmicrohttpd 0.9.25 (from 09/2012) to replace deprecated MHD_create_response_from_data() * fix versioncheck libmicrohttpd * Missing char for null-terminator in print_v6addrs() * safe_asprintf to fix /proc/subdir bufferoverflows There is no max length of /proc/subdir, increasing the value of /proc/sys/kernel/pid_max is one way this can happen * Fix conversion constant c++ string to variable char array * Fix strncpy using unrelated MPD_BUFFER_MAX_LENGTH * Use strncpy instead of strcpy in eve.cc * Use strncpy instead of strcpy in libmpdclient.cc * move safe_asprintf back and use ostreams in proc.cc to make sonarcloud happy
2018-08-07 13:38:36 +00:00
pkg_check_modules(MICROHTTPD REQUIRED libmicrohttpd>=0.9.25)
set(conky_libs ${conky_libs} ${MICROHTTPD_LIBRARIES})
set(conky_includes ${conky_includes} ${MICROHTTPD_INCLUDE_DIRS})
Add support for out_to_http
2010-06-04 12:41:12 +00:00
endif(BUILD_HTTP)
More work on CMake build system.
2009-12-11 04:37:56 +00:00
if(BUILD_NCURSES)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
include(FindCurses)
if(NOT CURSES_FOUND)
message(FATAL_ERROR "Unable to find ncurses library")
endif(NOT CURSES_FOUND)
set(conky_libs ${conky_libs} ${CURSES_LIBRARIES})
set(conky_includes ${conky_includes} ${CURSES_INCLUDE_DIR})
More work on CMake build system.
2009-12-11 04:37:56 +00:00
endif(BUILD_NCURSES)
Add support for MySQL Warning: Altough the current version works (for me), the syntax of the configoptions and vars will probably change over time. Contact me if you have ideas. The following is a example of how you can use it now: mysql_host someserver.com mysql_db my_database mysql_user loginname mysql_password "s3cr3t" TEXT ${mysql select var1 from some_table}${mysql select var2 from some_table}
2010-04-18 15:52:41 +00:00
if(BUILD_MYSQL)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
find_path(mysql_INCLUDE_PATH mysql.h ${INCLUDE_SEARCH_PATH} /usr/include/mysql /usr/local/include/mysql)
if(NOT mysql_INCLUDE_PATH)
message(FATAL_ERROR "Unable to find mysql.h")
endif(NOT mysql_INCLUDE_PATH)
set(conky_includes ${conky_includes} ${mysql_INCLUDE_PATH})
find_library(MYSQLCLIENT_LIB NAMES mysqlclient)
if(NOT MYSQLCLIENT_LIB)
message(FATAL_ERROR "Unable to find mysqlclient library")
endif(NOT MYSQLCLIENT_LIB)
set(conky_libs ${conky_libs} ${MYSQLCLIENT_LIB})
Add support for MySQL Warning: Altough the current version works (for me), the syntax of the configoptions and vars will probably change over time. Contact me if you have ideas. The following is a example of how you can use it now: mysql_host someserver.com mysql_db my_database mysql_user loginname mysql_password "s3cr3t" TEXT ${mysql select var1 from some_table}${mysql select var2 from some_table}
2010-04-18 15:52:41 +00:00
endif(BUILD_MYSQL)
Conky for mac os master (#579) * Try to amend #31 * BUILD_WLAN should be available for all OS. Keep BUILD_WLAN OFF by default for compatibility reasons. * WLAN-related variables should be available for every OS. There are some problems (probably null-dereference) * Fix $wireless_essid crashing conky if no argument provided. Conky wasn't parsing the argument of the variable as it should, thus wasn't allocating the `dev` member variable. Also fix some documentation stuff. * Improve `get_freq` #20 Using the Intel® Power Gadget API (https://software.intel.com/en-us/blogs/2012/12/13/using-the-intel-power-gadget-api-on-mac-os-x) we can now get actual Core frequency and not the constant factory one. Though, for some weird reason the API gives the same freq for all Cores, thus the |cpu| arg becomes useless. * Oops, this accidently slipped in * Introduce BUILD_IPGFREQ build option This build option has been introduced for one particular reason: On macOS getting current core-frequency is not supported by the APIs. A solution is to install Intel's ® Power Gadget which comes with an .app, a Framework and a kernel-extension. Though, this may trouble some alot, thus introduce BUILD_IPGFREQ. * Forgot static here. * Some improvements for get_freq again. Fix frequency not printing correctly (I wasn't using the divisor) Add more guards. * Setup cmake files and project code for Objective-C code #17 We want to use CoreWLAN framework. * update_cpu_usage() now supports multiple cores Also, some cleanup. * Updated default conky config to monitor Mac Networking * Made Mac Friendly BuildOptions and generic default conky configs * Undid Xdamage config and cleaned up previous IF statements * Re-Added XDamage fix * Finish up the algorithm. I think its now correct. Closes: #33 * Cleanup macro and introduce a no-op free_cpu() function for ALL cpu-related variables free_cpu() must be implemented for every OS and on all except macOS its a no-op function. * Reformat, add empty comment.
2018-08-07 15:54:01 +00:00
if(BUILD_WLAN AND OS_LINUX)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
check_include_files(iwlib.h IWLIB_H)
if(NOT IWLIB_H)
message(FATAL_ERROR "Unable to find iwlib.h")
endif(NOT IWLIB_H)
find_library(IWLIB_LIB NAMES iw)
if(NOT IWLIB_LIB)
message(FATAL_ERROR "Unable to find libiw.so")
endif(NOT IWLIB_LIB)
set(conky_libs ${conky_libs} ${IWLIB_LIB})
check_function_exists(iw_sockets_open IWLIB_SOCKETS_OPEN_FUNC)
Conky for mac os master (#579) * Try to amend #31 * BUILD_WLAN should be available for all OS. Keep BUILD_WLAN OFF by default for compatibility reasons. * WLAN-related variables should be available for every OS. There are some problems (probably null-dereference) * Fix $wireless_essid crashing conky if no argument provided. Conky wasn't parsing the argument of the variable as it should, thus wasn't allocating the `dev` member variable. Also fix some documentation stuff. * Improve `get_freq` #20 Using the Intel® Power Gadget API (https://software.intel.com/en-us/blogs/2012/12/13/using-the-intel-power-gadget-api-on-mac-os-x) we can now get actual Core frequency and not the constant factory one. Though, for some weird reason the API gives the same freq for all Cores, thus the |cpu| arg becomes useless. * Oops, this accidently slipped in * Introduce BUILD_IPGFREQ build option This build option has been introduced for one particular reason: On macOS getting current core-frequency is not supported by the APIs. A solution is to install Intel's ® Power Gadget which comes with an .app, a Framework and a kernel-extension. Though, this may trouble some alot, thus introduce BUILD_IPGFREQ. * Forgot static here. * Some improvements for get_freq again. Fix frequency not printing correctly (I wasn't using the divisor) Add more guards. * Setup cmake files and project code for Objective-C code #17 We want to use CoreWLAN framework. * update_cpu_usage() now supports multiple cores Also, some cleanup. * Updated default conky config to monitor Mac Networking * Made Mac Friendly BuildOptions and generic default conky configs * Undid Xdamage config and cleaned up previous IF statements * Re-Added XDamage fix * Finish up the algorithm. I think its now correct. Closes: #33 * Cleanup macro and introduce a no-op free_cpu() function for ALL cpu-related variables free_cpu() must be implemented for every OS and on all except macOS its a no-op function. * Reformat, add empty comment.
2018-08-07 15:54:01 +00:00
endif(BUILD_WLAN AND OS_LINUX)
More work on CMake build system.
2009-12-11 04:37:56 +00:00
if(BUILD_PORT_MONITORS)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
check_function_exists(getnameinfo HAVE_GETNAMEINFO)
if(NOT HAVE_GETNAMEINFO)
message(FATAL_ERROR "could not find getnameinfo()")
endif(NOT HAVE_GETNAMEINFO)
check_include_files("netdb.h;netinet/in.h;netinet/tcp.h;sys/socket.h;arpa/inet.h" HAVE_PORTMON_HEADERS)
if(NOT HAVE_PORTMON_HEADERS)
message(FATAL_ERROR "missing needed network header(s) for port monitoring")
endif(NOT HAVE_PORTMON_HEADERS)
More work on CMake build system.
2009-12-11 04:37:56 +00:00
endif(BUILD_PORT_MONITORS)
# Check for iconv
Get $iconv vars working again
2010-01-20 17:17:30 +00:00
if(BUILD_ICONV)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
check_include_files(iconv.h HAVE_ICONV_H)
find_library(ICONV_LIBRARY NAMES iconv)
if(NOT ICONV_LIBRARY)
# maybe iconv() is provided by libc
set(ICONV_LIBRARY "" CACHE FILEPATH "Path to the iconv library, if iconv is not provided by libc" FORCE)
endif(NOT ICONV_LIBRARY)
set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
check_function_exists(iconv ICONV_FUNC)
if(HAVE_ICONV_H AND ICONV_FUNC)
set(conky_includes ${conky_includes} ${ICONV_INCLUDE_DIR})
set(conky_libs ${conky_libs} ${ICONV_LIBRARY})
else(HAVE_ICONV_H AND ICONV_FUNC)
message(FATAL_ERROR "Unable to find iconv library")
endif(HAVE_ICONV_H AND ICONV_FUNC)
Get $iconv vars working again
2010-01-20 17:17:30 +00:00
endif(BUILD_ICONV)
More work on CMake build system.
2009-12-11 04:37:56 +00:00
More work on CMake stuff, add missing files. Also updated gitignore.
2009-12-05 21:04:31 +00:00
# check for Xlib
if(BUILD_X11)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
include(FindX11)
find_package(X11)
if(X11_FOUND)
set(conky_includes ${conky_includes} ${X11_INCLUDE_DIR})
set(conky_libs ${conky_libs} ${X11_LIBRARIES})
# check for Xdamage
if(BUILD_XDAMAGE)
if(NOT X11_Xdamage_FOUND)
message(FATAL_ERROR "Unable to find Xdamage library")
endif(NOT X11_Xdamage_FOUND)
if(NOT X11_Xfixes_FOUND)
message(FATAL_ERROR "Unable to find Xfixes library")
endif(NOT X11_Xfixes_FOUND)
set(conky_libs ${conky_libs} ${X11_Xdamage_LIB} ${X11_Xfixes_LIB})
endif(BUILD_XDAMAGE)
if(BUILD_XSHAPE)
if(NOT X11_Xshape_FOUND)
message(FATAL_ERROR "Unable to find Xshape library")
endif(NOT X11_Xshape_FOUND)
set(conky_libs ${conky_libs} ${X11_Xshape_LIB} )
endif(BUILD_XSHAPE)
# check for Xft
if(BUILD_XFT)
find_path(freetype_INCLUDE_PATH config/ftconfig.h ${INCLUDE_SEARCH_PATH}
/usr/include/freetype2
/usr/local/include/freetype2
/usr/pkg/include/freetype2)
if(freetype_INCLUDE_PATH)
set(freetype_FOUND true)
set(conky_includes ${conky_includes} ${freetype_INCLUDE_PATH})
else(freetype_INCLUDE_PATH)
find_path(freetype_INCLUDE_PATH freetype/config/ftconfig.h ${INCLUDE_SEARCH_PATH}
/usr/include/freetype2
/usr/local/include/freetype2
/usr/pkg/include/freetype2)
if(freetype_INCLUDE_PATH)
set(freetype_FOUND true)
set(conky_includes ${conky_includes} ${freetype_INCLUDE_PATH})
else(freetype_INCLUDE_PATH)
message(FATAL_ERROR "Unable to find freetype library")
endif(freetype_INCLUDE_PATH)
endif(freetype_INCLUDE_PATH)
if(NOT X11_Xft_FOUND)
message(FATAL_ERROR "Unable to find Xft library")
endif(NOT X11_Xft_FOUND)
set(conky_libs ${conky_libs} ${X11_Xft_LIB})
endif(BUILD_XFT)
# check for Xdbe
if(BUILD_XDBE)
if(NOT X11_Xext_FOUND)
message(FATAL_ERROR "Unable to find Xext library (needed for Xdbe)")
endif(NOT X11_Xext_FOUND)
set(conky_libs ${conky_libs} ${X11_Xext_LIB})
endif(BUILD_XDBE)
else(X11_FOUND)
message(FATAL_ERROR "Unable to find X11 library")
endif(X11_FOUND)
More work on CMake stuff, add missing files. Also updated gitignore.
2009-12-05 21:04:31 +00:00
endif(BUILD_X11)
Add toluapp subtree (#712) * First commit! * Import to git * Droping down CMake requirement * Corrected installation of libraries * Adding travis build * Updated cmake macros * Fixed find package * Updated travis hook * Updated travis hook * Patch to support Lua 5.3. * Fix Lua header include directives in tolua++.h Use angle bracket rather than double quotes when including Lua headers in the tolua++ header. This fixes a problem on systems that default to a Lua version newer than 5.1 and install the tolua++ header to the same directory as newer Lua headers. As there are (usually) no Lua headers in the same directory when building tolua++ itself, the preprocessor will look to the include directories passed to the compiler, one of which would be the Lua 5.1 include directory, and tolua++ will build with those (correct) headers. Then the tolua++ header is usually installed in the default include directory, alongside the newer Lua headers, which you wouldn't expect to cause any trouble. But it does cause trouble when trying to build other programs that include the tolua++ header, because now the preprocessor does find Lua headers in the same directory as the tolua++ header, which are the newer (incorrect) headers. Now the program will either fail to compile, because it doesn't support the newer headers, or fail to link with the tolua++ shared object because they were compiled against different Lua headers. Using angle brackets instead of double quotes in the include directives will fix the problem, because then the preprocessor will look to the include directories passed to the compiler first. See http://www.cegui.org.uk/forum/viewtopic.php?f=10&t=7195 * Remove email notifications. * Update travis build. * Build shared and static libs. * Patch toluapp to support Lua 5.3. With this change, support for Lua 5.1 is dropped. This resolve #116. * Add some comments to clarify the toluapp handling. * Add minor sonar fix.
2018-12-20 20:18:51 +00:00
# Otherwise, use the most recent Lua version
pkg_search_module(LUA REQUIRED lua>=5.3 lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 luajit)
Make lua required by cmake
2010-11-14 00:41:07 +00:00
set(conky_libs ${conky_libs} ${LUA_LIBRARIES})
set(conky_includes ${conky_includes} ${LUA_INCLUDE_DIRS})
Add support for lua 5.2 luamm is now able to be compiled with both lua 5.1 and 5.2 (assuming 5.2 has backward compatibility features compiled in). It is my intention to always support at least two versions of lua.
2013-07-13 21:55:28 +00:00
link_directories(${LUA_LIBRARY_DIRS})
Add toluapp subtree (#712) * First commit! * Import to git * Droping down CMake requirement * Corrected installation of libraries * Adding travis build * Updated cmake macros * Fixed find package * Updated travis hook * Updated travis hook * Patch to support Lua 5.3. * Fix Lua header include directives in tolua++.h Use angle bracket rather than double quotes when including Lua headers in the tolua++ header. This fixes a problem on systems that default to a Lua version newer than 5.1 and install the tolua++ header to the same directory as newer Lua headers. As there are (usually) no Lua headers in the same directory when building tolua++ itself, the preprocessor will look to the include directories passed to the compiler, one of which would be the Lua 5.1 include directory, and tolua++ will build with those (correct) headers. Then the tolua++ header is usually installed in the default include directory, alongside the newer Lua headers, which you wouldn't expect to cause any trouble. But it does cause trouble when trying to build other programs that include the tolua++ header, because now the preprocessor does find Lua headers in the same directory as the tolua++ header, which are the newer (incorrect) headers. Now the program will either fail to compile, because it doesn't support the newer headers, or fail to link with the tolua++ shared object because they were compiled against different Lua headers. Using angle brackets instead of double quotes in the include directives will fix the problem, because then the preprocessor will look to the include directories passed to the compiler first. See http://www.cegui.org.uk/forum/viewtopic.php?f=10&t=7195 * Remove email notifications. * Update travis build. * Build shared and static libs. * Patch toluapp to support Lua 5.3. With this change, support for Lua 5.1 is dropped. This resolve #116. * Add some comments to clarify the toluapp handling. * Add minor sonar fix.
2018-12-20 20:18:51 +00:00
include_directories(3rdparty/toluapp/include)
Require Lua 5.1 when building the Lua bindings The cairo/imlib2/rsvg bindings require tolua++ [1], which is currently only compatible with Lua 5.1 or earlier. We need to force Conky to compile against Lua 5.1 if the user chooses to build the bindings. This commit adds a separate pkg_search_module command specifically for Lua 5.1, along with a note in the documentation. The original pkg_search_module command was updated to include (and prefer) Lua 5.3+. Also, I threw in two other minor random fixes to the docs while I was at it. [1] https://github.com/LuaDist/toluapp
2015-12-11 06:00:17 +00:00
Add toluapp subtree (#712) * First commit! * Import to git * Droping down CMake requirement * Corrected installation of libraries * Adding travis build * Updated cmake macros * Fixed find package * Updated travis hook * Updated travis hook * Patch to support Lua 5.3. * Fix Lua header include directives in tolua++.h Use angle bracket rather than double quotes when including Lua headers in the tolua++ header. This fixes a problem on systems that default to a Lua version newer than 5.1 and install the tolua++ header to the same directory as newer Lua headers. As there are (usually) no Lua headers in the same directory when building tolua++ itself, the preprocessor will look to the include directories passed to the compiler, one of which would be the Lua 5.1 include directory, and tolua++ will build with those (correct) headers. Then the tolua++ header is usually installed in the default include directory, alongside the newer Lua headers, which you wouldn't expect to cause any trouble. But it does cause trouble when trying to build other programs that include the tolua++ header, because now the preprocessor does find Lua headers in the same directory as the tolua++ header, which are the newer (incorrect) headers. Now the program will either fail to compile, because it doesn't support the newer headers, or fail to link with the tolua++ shared object because they were compiled against different Lua headers. Using angle brackets instead of double quotes in the include directives will fix the problem, because then the preprocessor will look to the include directories passed to the compiler first. See http://www.cegui.org.uk/forum/viewtopic.php?f=10&t=7195 * Remove email notifications. * Update travis build. * Build shared and static libs. * Patch toluapp to support Lua 5.3. With this change, support for Lua 5.1 is dropped. This resolve #116. * Add some comments to clarify the toluapp handling. * Add minor sonar fix.
2018-12-20 20:18:51 +00:00
if(BUILD_X11)
# Check for libraries used by Lua bindings
if(BUILD_LUA_CAIRO)
pkg_check_modules(CAIRO REQUIRED cairo cairo-xlib)
set(luacairo_libs ${CAIRO_LIBRARIES} ${LUA_LIBRARIES})
set(luacairo_includes ${CAIRO_INCLUDE_DIRS} ${LUA_INCLUDE_DIRS})
find_program(APP_PATCH patch)
if(NOT APP_PATCH)
message(FATAL_ERROR "Unable to find program 'patch'")
endif(NOT APP_PATCH)
endif(BUILD_LUA_CAIRO)
if(BUILD_LUA_IMLIB2)
pkg_search_module(IMLIB2 REQUIRED imlib2 Imlib2)
set(luaimlib2_libs ${IMLIB2_LIBS} ${IMLIB2_LDFLAGS} ${LUA_LIBRARIES})
set(luaimlib2_includes ${IMLIB2_INCLUDE_DIRS} ${LUA_INCLUDE_DIRS} ${X11_INCLUDE_DIR})
endif(BUILD_LUA_IMLIB2)
if(BUILD_LUA_RSVG)
pkg_check_modules(RSVG REQUIRED librsvg-2.0)
set(luarsvg_libs ${RSVG_LIBRARIES} ${LUA_LIBRARIES})
set(luarsvg_includes ${RSVG_INCLUDE_DIRS} ${LUA_INCLUDE_DIRS})
endif(BUILD_LUA_RSVG)
endif(BUILD_X11)
Portmon CMake build support.
2009-12-06 19:30:06 +00:00
Portmon and audacious CMake support.
2009-12-06 19:43:12 +00:00
if(BUILD_AUDACIOUS)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
set(WANT_GLIB true)
pkg_check_modules(NEW_AUDACIOUS audacious>=1.4.0)
if(NEW_AUDACIOUS_FOUND)
pkg_check_modules(AUDACIOUS REQUIRED audclient>=1.4.0)
pkg_check_modules(DBUS_GLIB REQUIRED dbus-glib-1)
else(NEW_AUDACIOUS_FOUND)
pkg_check_modules(AUDACIOUS REQUIRED audacious<1.4.0)
endif(NEW_AUDACIOUS_FOUND)
set(conky_libs ${conky_libs} ${AUDACIOUS_LIBRARIES} ${DBUS_GLIB_LIBRARIES})
set(conky_includes ${conky_includes} ${AUDACIOUS_INCLUDE_DIRS} ${DBUS_GLIB_INCLUDE_DIRS})
Portmon and audacious CMake support.
2009-12-06 19:43:12 +00:00
endif(BUILD_AUDACIOUS)
More CMake work.
2009-12-08 04:46:49 +00:00
if(BUILD_BMPX)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
pkg_check_modules(BMPX REQUIRED bmp-2.0>=0.14.0)
set(conky_libs ${conky_libs} ${BMPX_LIBRARIES})
set(conky_includes ${conky_includes} ${BMPX_INCLUDE_DIRS})
More CMake work.
2009-12-08 04:46:49 +00:00
endif(BUILD_BMPX)
if(BUILD_XMMS2)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
pkg_check_modules(XMMS2 REQUIRED xmms2-client>=0.6)
set(conky_libs ${conky_libs} ${XMMS2_LIBRARIES})
set(conky_includes ${conky_includes} ${XMMS2_INCLUDE_DIRS})
More CMake work.
2009-12-08 04:46:49 +00:00
endif(BUILD_XMMS2)
if(BUILD_EVE)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
set(WANT_CURL true)
set(WANT_LIBXML2 true)
More CMake work.
2009-12-08 04:46:49 +00:00
endif(BUILD_EVE)
if(BUILD_CURL)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
set(WANT_CURL true)
More CMake work.
2009-12-08 04:46:49 +00:00
endif(BUILD_CURL)
if(BUILD_RSS)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
set(WANT_CURL true)
set(WANT_LIBXML2 true)
More CMake work.
2009-12-08 04:46:49 +00:00
endif(BUILD_RSS)
if(BUILD_WEATHER_METAR)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
set(WANT_CURL true)
set(BUILD_WEATHER true)
More CMake work.
2009-12-08 04:46:49 +00:00
endif(BUILD_WEATHER_METAR)
if(BUILD_NVIDIA)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
find_path(XNVCtrl_INCLUDE_PATH NVCtrl/NVCtrl.h ${INCLUDE_SEARCH_PATH})
find_library(XNVCtrl_LIB NAMES XNVCtrl)
if(XNVCtrl_INCLUDE_PATH AND XNVCtrl_LIB)
set(XNVCtrl_FOUND true)
set(conky_libs ${conky_libs} ${XNVCtrl_LIB})
set(conky_includes ${conky_includes} ${XNVCtrl_INCLUDE_PATH})
else(XNVCtrl_INCLUDE_PATH AND XNVCtrl_LIB)
message(FATAL_ERROR "Unable to find XNVCtrl library")
endif(XNVCtrl_INCLUDE_PATH AND XNVCtrl_LIB)
More CMake work.
2009-12-08 04:46:49 +00:00
endif(BUILD_NVIDIA)
More work on CMake build system.
2009-12-11 04:37:56 +00:00
if(BUILD_IMLIB2)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
pkg_search_module(IMLIB2 REQUIRED imlib2 Imlib2)
Add toluapp subtree (#712) * First commit! * Import to git * Droping down CMake requirement * Corrected installation of libraries * Adding travis build * Updated cmake macros * Fixed find package * Updated travis hook * Updated travis hook * Patch to support Lua 5.3. * Fix Lua header include directives in tolua++.h Use angle bracket rather than double quotes when including Lua headers in the tolua++ header. This fixes a problem on systems that default to a Lua version newer than 5.1 and install the tolua++ header to the same directory as newer Lua headers. As there are (usually) no Lua headers in the same directory when building tolua++ itself, the preprocessor will look to the include directories passed to the compiler, one of which would be the Lua 5.1 include directory, and tolua++ will build with those (correct) headers. Then the tolua++ header is usually installed in the default include directory, alongside the newer Lua headers, which you wouldn't expect to cause any trouble. But it does cause trouble when trying to build other programs that include the tolua++ header, because now the preprocessor does find Lua headers in the same directory as the tolua++ header, which are the newer (incorrect) headers. Now the program will either fail to compile, because it doesn't support the newer headers, or fail to link with the tolua++ shared object because they were compiled against different Lua headers. Using angle brackets instead of double quotes in the include directives will fix the problem, because then the preprocessor will look to the include directories passed to the compiler first. See http://www.cegui.org.uk/forum/viewtopic.php?f=10&t=7195 * Remove email notifications. * Update travis build. * Build shared and static libs. * Patch toluapp to support Lua 5.3. With this change, support for Lua 5.1 is dropped. This resolve #116. * Add some comments to clarify the toluapp handling. * Add minor sonar fix.
2018-12-20 20:18:51 +00:00
set(conky_libs ${conky_libs} ${IMLIB2_LIBS} ${IMLIB2_LDFLAGS})
set(conky_includes ${conky_includes} ${IMLIB2_INCLUDE_DIRS})
More work on CMake build system.
2009-12-11 04:37:56 +00:00
endif(BUILD_IMLIB2)
Add systemd journal support. (#214) This adds support for reading log entries from the Systemd journal. A new command, called simply 'journal', is added which takes a number of lines as a parameter and optionally which journal (user or system) to read from. Obviously, libsystemd is required to build journal support. Tested on Arch Linux (Systemd v229). Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
2016-05-06 11:25:30 +00:00
if(BUILD_JOURNAL)
Build improvements (external libs, enable more options). (#498) - Enable build options by default if they don't require external libraries. - Add as many external libraries to Docker and Travis builds as possible.
2018-05-13 17:33:18 +00:00
pkg_search_module(SYSTEMD REQUIRED libsystemd libsystemd-journal)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
set(conky_libs ${conky_libs} ${SYSTEMD_LIB} ${SYSTEMD_LDFLAGS})
Add toluapp subtree (#712) * First commit! * Import to git * Droping down CMake requirement * Corrected installation of libraries * Adding travis build * Updated cmake macros * Fixed find package * Updated travis hook * Updated travis hook * Patch to support Lua 5.3. * Fix Lua header include directives in tolua++.h Use angle bracket rather than double quotes when including Lua headers in the tolua++ header. This fixes a problem on systems that default to a Lua version newer than 5.1 and install the tolua++ header to the same directory as newer Lua headers. As there are (usually) no Lua headers in the same directory when building tolua++ itself, the preprocessor will look to the include directories passed to the compiler, one of which would be the Lua 5.1 include directory, and tolua++ will build with those (correct) headers. Then the tolua++ header is usually installed in the default include directory, alongside the newer Lua headers, which you wouldn't expect to cause any trouble. But it does cause trouble when trying to build other programs that include the tolua++ header, because now the preprocessor does find Lua headers in the same directory as the tolua++ header, which are the newer (incorrect) headers. Now the program will either fail to compile, because it doesn't support the newer headers, or fail to link with the tolua++ shared object because they were compiled against different Lua headers. Using angle brackets instead of double quotes in the include directives will fix the problem, because then the preprocessor will look to the include directories passed to the compiler first. See http://www.cegui.org.uk/forum/viewtopic.php?f=10&t=7195 * Remove email notifications. * Update travis build. * Build shared and static libs. * Patch toluapp to support Lua 5.3. With this change, support for Lua 5.1 is dropped. This resolve #116. * Add some comments to clarify the toluapp handling. * Add minor sonar fix.
2018-12-20 20:18:51 +00:00
set(conky_includes ${conky_includes} ${SYSTEMD_INCLUDE_DIRS})
Add systemd journal support. (#214) This adds support for reading log entries from the Systemd journal. A new command, called simply 'journal', is added which takes a number of lines as a parameter and optionally which journal (user or system) to read from. Obviously, libsystemd is required to build journal support. Tested on Arch Linux (Systemd v229). Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
2016-05-06 11:25:30 +00:00
endif(BUILD_JOURNAL)
Add native support for pulseaudio. (#283) * Add native support for pulseaudio. This adds ability to get Pulseaudio current volume without calling an external program. Also it provides a few other parameters like card's current profile similarly to pavucontrol. Currently it only queries the default sink (and associated card). * Switch to pulse async API. This us by far the most efficient as conky subscribe to a few pulseaudio notifications. Whenever pulseaudio server changes (volume or default sink or default card), conky's callback updates the results.
2016-06-24 14:17:20 +00:00
if(BUILD_PULSEAUDIO)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
pkg_check_modules(PULSEAUDIO REQUIRED libpulse)
set(conky_libs ${conky_libs} ${PULSEAUDIO_LIBRARIES})
set(conky_includes ${conky_includes} ${PULSEAUDIO_INCLUDE_DIRS})
Add native support for pulseaudio. (#283) * Add native support for pulseaudio. This adds ability to get Pulseaudio current volume without calling an external program. Also it provides a few other parameters like card's current profile similarly to pavucontrol. Currently it only queries the default sink (and associated card). * Switch to pulse async API. This us by far the most efficient as conky subscribe to a few pulseaudio notifications. Whenever pulseaudio server changes (volume or default sink or default card), conky's callback updates the results.
2016-06-24 14:17:20 +00:00
endif(BUILD_PULSEAUDIO)
More CMake work.
2009-12-08 04:46:49 +00:00
# Common libraries
Portmon CMake build support.
2009-12-06 19:30:06 +00:00
if(WANT_GLIB)
Fix problems found when fixing docker (#575) * Require at least glib-2.36 (from 03/2013) to remove deprecated g_type_init() * Fix empty continuation line in Dockerfile * Require at least libmicrohttpd 0.9.25 (from 09/2012) to replace deprecated MHD_create_response_from_data() * fix versioncheck libmicrohttpd * Missing char for null-terminator in print_v6addrs() * safe_asprintf to fix /proc/subdir bufferoverflows There is no max length of /proc/subdir, increasing the value of /proc/sys/kernel/pid_max is one way this can happen * Fix conversion constant c++ string to variable char array * Fix strncpy using unrelated MPD_BUFFER_MAX_LENGTH * Use strncpy instead of strcpy in eve.cc * Use strncpy instead of strcpy in libmpdclient.cc * move safe_asprintf back and use ostreams in proc.cc to make sonarcloud happy
2018-08-07 13:38:36 +00:00
pkg_check_modules(GLIB REQUIRED glib-2.0>=2.36)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
set(conky_libs ${conky_libs} ${GLIB_LIBRARIES})
set(conky_includes ${conky_includes} ${GLIB_INCLUDE_DIRS})
Portmon CMake build support.
2009-12-06 19:30:06 +00:00
endif(WANT_GLIB)
More CMake work.
2009-12-08 04:46:49 +00:00
if(WANT_CURL)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
pkg_check_modules(CURL REQUIRED libcurl)
set(conky_libs ${conky_libs} ${CURL_LIBRARIES})
set(conky_includes ${conky_includes} ${CURL_INCLUDE_DIRS})
More CMake work.
2009-12-08 04:46:49 +00:00
endif(WANT_CURL)
if(WANT_LIBXML2)
Fix platform checks for libxml2. (#687) Use the CMake module for finding libxml2, instead of relying on pkg-config which may break on some platforms like macOS.
2018-12-02 18:26:02 +00:00
include(FindLibXml2)
if(NOT LIBXML2_FOUND)
message(FATAL_ERROR "Unable to find libxml2 library")
endif(NOT LIBXML2_FOUND)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
set(conky_libs ${conky_libs} ${LIBXML2_LIBRARIES})
Fix platform checks for libxml2. (#687) Use the CMake module for finding libxml2, instead of relying on pkg-config which may break on some platforms like macOS.
2018-12-02 18:26:02 +00:00
set(conky_includes ${conky_includes} ${LIBXML2_INCLUDE_DIR})
More CMake work.
2009-12-08 04:46:49 +00:00
endif(WANT_LIBXML2)
More work on CMake build system (possibly finished?).
2009-12-19 19:39:16 +00:00
# Look for doc generation programs
if(MAINTAINER_MODE)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
# Used for doc generation
find_program(APP_DB2X_XSLTPROC db2x_xsltproc)
if(NOT APP_DB2X_XSLTPROC)
message(FATAL_ERROR "Unable to find program 'db2x_xsltproc'")
endif(NOT APP_DB2X_XSLTPROC)
find_program(APP_DB2X_MANXML db2x_manxml)
if(NOT APP_DB2X_MANXML)
message(FATAL_ERROR "Unable to find program 'db2x_manxml'")
endif(NOT APP_DB2X_MANXML)
find_program(APP_XSLTPROC xsltproc)
if(NOT APP_XSLTPROC)
message(FATAL_ERROR "Unable to find program 'xsltproc'")
endif(NOT APP_XSLTPROC)
find_program(APP_MAN man)
if(NOT APP_MAN)
message(FATAL_ERROR "Unable to find program 'man'")
endif(NOT APP_MAN)
find_program(APP_LESS less)
if(NOT APP_LESS)
message(FATAL_ERROR "Unable to find program 'less'")
endif(NOT APP_LESS)
find_program(APP_SED sed)
if(NOT APP_SED)
message(FATAL_ERROR "Unable to find program 'sed'")
endif(NOT APP_SED)
mark_as_advanced(APP_DB2X_XSLTPROC APP_DB2X_MANXML APP_XSLTPROC APP_MAN APP_SED APP_LESS)
More work on CMake build system (possibly finished?).
2009-12-19 19:39:16 +00:00
endif(MAINTAINER_MODE)
Make sure MAINTAINER_MODE sets DEBUG
2010-11-14 01:27:01 +00:00
if(CMAKE_BUILD_TYPE MATCHES "Debug")
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
set(DEBUG true)
Make sure MAINTAINER_MODE sets DEBUG
2010-11-14 01:27:01 +00:00
endif(CMAKE_BUILD_TYPE MATCHES "Debug")
# The version numbers are simply derived from the date and number of commits
# since start of month
if(DEBUG)
Add formatting/static analysis (#486) * Reform source with clang-format. Rules applied with: $ find . -iname *.h -o -iname *.cc | xargs clang-format \ -style=file -i -fallback-style=google * Add clang-format and analyze to build. Based on the excellent work at: https://github.com/ttroy50/cmake-examples * Clean up CMake stuff on macOS. * Remove vim/emacs modelines. * Update copyright dates. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes. * Build fixes.
2018-05-12 16:03:00 +00:00
execute_process(COMMAND
${APP_GIT} --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git log
--since=${VERSION_MAJOR}-${VERSION_MINOR}-01 --pretty=oneline COMMAND
${APP_WC} -l COMMAND ${APP_AWK} "{print $1}" RESULT_VARIABLE RETVAL
OUTPUT_VARIABLE COMMIT_COUNT OUTPUT_STRIP_TRAILING_WHITESPACE)
Make sure MAINTAINER_MODE sets DEBUG
2010-11-14 01:27:01 +00:00
endif(DEBUG)
Copy Permalink