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
0bc7b80d78
conky/cmake/Conky.cmake

160 lines
5.1 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/>.
#
Add missing file.
2009-12-08 05:17:58 +00:00
Prep for next release.
2015-06-22 00:53:16 +00:00
#set(RELEASE true)
Prep for 1.10.0 release.
2015-06-22 00:49:06 +00:00
Add missing file.
2009-12-08 05:17:58 +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)
Add missing file.
2009-12-08 05:17:58 +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)
Add missing file.
2009-12-08 05:17:58 +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)
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")
Add missing file.
2009-12-08 05:17:58 +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)
Add missing file.
2009-12-08 05:17:58 +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)
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")
Add missing file.
2009-12-08 05:17:58 +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)
Add missing file.
2009-12-08 05:17:58 +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)
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")
Solaris support (#445) * Basic Solaris support * Fixed indentation & minor improvements * support for diskio
2018-01-19 14:00:42 +00:00
if(NOT OS_LINUX AND NOT OS_FREEBSD AND NOT OS_OPENBSD AND NOT 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
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)
Add missing file.
2009-12-08 05:17:58 +00:00
include(FindThreads)
find_package(Threads)
set(conky_libs ${CMAKE_THREAD_LIBS_INIT})
set(conky_includes ${CMAKE_BINARY_DIR})
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
#
# On Darwin _POSIX_C_SOURCE must be >= __DARWIN_C_FULL for asprintf to be enabled!
# Thus disable this and _LARGEFILE64_SOURCE isnt needed, it is already used on macOS.
#
if(NOT 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
add_definitions(-D_LARGEFILE64_SOURCE -D_POSIX_C_SOURCE=200809L) # Standard definitions
set(CMAKE_REQUIRED_DEFINITIONS
"${CMAKE_REQUIRED_DEFINITIONS} -D_LARGEFILE64_SOURCE -D_POSIX_C_SOURCE=200809L")
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(NOT OS_DARWIN)
Fall back to statfs if statfs64 not present mostly needed for the dragonfly port (sf.net #3289079)
2012-07-05 14:41:58 +00:00
Force global library path for pkgsrc. DragonFlyBSD uses pkgsrc package infrastructure, hence the the need for extra flags. Cmake pkg_search_module macro sets according <XPREFIX>_LDFLAGS var, thus the correct way should be to append it to conky_includes and conky_libs for each extra package needed. As all pkgsrc packages always install in /usr/pkg, the simplest thing is to set specific cflags and ldflags at the very beginning. Conky is btw wip (work in progress) in pkgsrc system, mostly with NetBSD patches. This is intended as radical workaround (DragonFlyBSD specific for now) instead of submitting specific patches to pksrc maintainers.
2012-07-05 08:15:22 +00:00
if(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} -L/usr/pkg/lib)
set(conky_includes ${conky_includes} -I/usr/pkg/include)
Force global library path for pkgsrc. DragonFlyBSD uses pkgsrc package infrastructure, hence the the need for extra flags. Cmake pkg_search_module macro sets according <XPREFIX>_LDFLAGS var, thus the correct way should be to append it to conky_includes and conky_libs for each extra package needed. As all pkgsrc packages always install in /usr/pkg, the simplest thing is to set specific cflags and ldflags at the very beginning. Conky is btw wip (work in progress) in pkgsrc system, mostly with NetBSD patches. This is intended as radical workaround (DragonFlyBSD specific for now) instead of submitting specific patches to pksrc maintainers.
2012-07-05 08:15:22 +00:00
endif(OS_DRAGONFLY)
Solaris support (#445) * Basic Solaris support * Fixed indentation & minor improvements * support for diskio
2018-01-19 14:00:42 +00:00
if(OS_SOLARIS)
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} -L/usr/local/lib)
Solaris support (#445) * Basic Solaris support * Fixed indentation & minor improvements * support for diskio
2018-01-19 14:00:42 +00:00
endif(OS_SOLARIS)
Add missing file.
2009-12-08 05:17:58 +00:00
# Do version stuff
Let's be real about the versioning.
2015-05-23 16:30:53 +00:00
set(VERSION_MAJOR "1")
Bump version for next release. (#599)
2018-08-10 15:10:42 +00:00
set(VERSION_MINOR "11")
set(VERSION_PATCH "0")
Add missing file.
2009-12-08 05:17:58 +00:00
Use posix awk instead of GNU awk We don't use any fancy GNU awk extensions so chekc for a portable awk instead of require GNU awk.
2015-07-23 11:15:58 +00:00
find_program(APP_AWK awk)
if(NOT APP_AWK)
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
message(FATAL_ERROR "Unable to find program 'awk'")
Use posix awk instead of GNU awk We don't use any fancy GNU awk extensions so chekc for a portable awk instead of require GNU awk.
2015-07-23 11:15:58 +00:00
endif(NOT APP_AWK)
Add missing file.
2009-12-08 05:17:58 +00:00
find_program(APP_WC wc)
if(NOT APP_WC)
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
message(FATAL_ERROR "Unable to find program 'wc'")
Add missing file.
2009-12-08 05:17:58 +00:00
endif(NOT APP_WC)
find_program(APP_DATE date)
if(NOT APP_DATE)
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
message(FATAL_ERROR "Unable to find program 'date'")
Add missing file.
2009-12-08 05:17:58 +00:00
endif(NOT APP_DATE)
find_program(APP_UNAME uname)
if(NOT APP_UNAME)
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
message(FATAL_ERROR "Unable to find program 'uname'")
Add missing file.
2009-12-08 05:17:58 +00:00
endif(NOT APP_UNAME)
if(NOT RELEASE)
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_program(APP_GIT git)
if(NOT APP_GIT)
message(FATAL_ERROR "Unable to find program 'git'")
endif(NOT APP_GIT)
mark_as_advanced(APP_GIT)
Add missing file.
2009-12-08 05:17:58 +00:00
endif(NOT RELEASE)
Use posix awk instead of GNU awk We don't use any fancy GNU awk extensions so chekc for a portable awk instead of require GNU awk.
2015-07-23 11:15:58 +00:00
mark_as_advanced(APP_AWK APP_WC APP_DATE APP_UNAME)
Implement timed_thread rewrite in C++. Rewrote timed_thread library in C++ using fancy new C++0x features. The main reason for this is to phase out poor encapsulation and C-style function pointers.
2010-01-03 07:59:24 +00:00
Add missing file.
2009-12-08 05:17:58 +00:00
#BUILD_DATE=$(LANG=en_US LC_ALL=en_US LOCALE=en_US date)
#BUILD_ARCH="$(uname -sr) ($(uname -m))"
execute_process(COMMAND ${APP_DATE} RESULT_VARIABLE RETVAL OUTPUT_VARIABLE
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
BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
Add missing file.
2009-12-08 05:17:58 +00:00
execute_process(COMMAND ${APP_UNAME} -srm RESULT_VARIABLE RETVAL
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
OUTPUT_VARIABLE BUILD_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
Add missing file.
2009-12-08 05:17:58 +00:00
if(RELEASE)
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(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
Add missing file.
2009-12-08 05:17:58 +00:00
else(RELEASE)
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(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}_pre${COMMIT_COUNT}")
Add missing file.
2009-12-08 05:17:58 +00:00
endif(RELEASE)
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(COPYRIGHT "Copyright Brenden Matthews, et al, 2005-2018")
Add missing file.
2009-12-08 05:17:58 +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
macro(AC_SEARCH_LIBS FUNCTION_NAME INCLUDES TARGET_VAR)
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("${TARGET_VAR}" MATCHES "^${TARGET_VAR}$")
unset(AC_SEARCH_LIBS_TMP CACHE)
check_symbol_exists(${FUNCTION_NAME} ${INCLUDES} AC_SEARCH_LIBS_TMP)
if(${AC_SEARCH_LIBS_TMP})
set(${TARGET_VAR} "" CACHE INTERNAL "Library containing ${FUNCTION_NAME}")
else(${AC_SEARCH_LIBS_TMP})
foreach(LIB ${ARGN})
unset(AC_SEARCH_LIBS_TMP CACHE)
unset(AC_SEARCH_LIBS_FOUND CACHE)
find_library(AC_SEARCH_LIBS_TMP ${LIB})
check_library_exists(${LIB} ${FUNCTION_NAME} ${AC_SEARCH_LIBS_TMP}
AC_SEARCH_LIBS_FOUND)
if(${AC_SEARCH_LIBS_FOUND})
set(${TARGET_VAR} ${AC_SEARCH_LIBS_TMP} CACHE INTERNAL
"Library containing ${FUNCTION_NAME}")
break()
endif(${AC_SEARCH_LIBS_FOUND})
endforeach(LIB)
endif(${AC_SEARCH_LIBS_TMP})
endif("${TARGET_VAR}" MATCHES "^${TARGET_VAR}$")
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
endmacro(AC_SEARCH_LIBS)
Copy Permalink