Code

Basic macOS support#480

Code

Merged

brndnmtthws merged 135 commits intobrndnmtthws:masterbrndnmtthws/conky:masterfrom Conky-for-macOS:masterConky-for-macOS/conky-for-macOS:masterCopy head branch name to clipboardMay 7, 2018

+1,850-50

Commits

Commits on Aug 27, 2017

• Initial patches for Darwin support

  npyl

  committed
  6660020

  Copy full SHA for 6660020

Commits on Aug 28, 2017

• cmake files ready for building on Sierra. Dont know about other OSX versions

  npyl

  committed
  af5996a

  Copy full SHA for af5996a

• Added darwin.h which will contain darwin specific headers

  npyl

  committed
  7107a4c

  Copy full SHA for 7107a4c

• 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

  npyl

  committed
  ff7fdcd

  Copy full SHA for ff7fdcd

• Stubs for get_entropy_avail and get_entropy_poolsize

  npyl

  committed
  04dda9d

  Copy full SHA for 04dda9d

• More progress to getting to build

  npyl

  committed
  1978579

  Copy full SHA for 1978579

• More patches

  npyl

  committed
  2a9ea1a

  Copy full SHA for 2a9ea1a

• Now builds, remains fixing linking errors. Also implemented some functions

  npyl

  committed
  318e889

  Copy full SHA for 318e889

• Now links

  npyl

  committed
  c8bc3f0

  Copy full SHA for c8bc3f0

• Now conky runs without sigabrt()'ing... An exception in semaphore.hh caused it to crash immediately upon initialisation

  npyl

  committed
  a1bcb52

  Copy full SHA for a1bcb52

• README changes

  npyl

  committed
  1df9be7

  Copy full SHA for 1df9be7

• 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

  npyl

  committed
  4f3ef1a

  Copy full SHA for 4f3ef1a

• 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

  npyl

  committed
  2baf7a3

  Copy full SHA for 2baf7a3

Commits on Sep 2, 2017

• This update fixes swap-related miscalculations, though:

  Show description for 0e72e34
  npyl

  committed
  0e72e34

  Copy full SHA for 0e72e34

• Fixed a bit the comments so they make sense

  npyl

  committed
  173e2b2

  Copy full SHA for 173e2b2

Commits on Sep 5, 2017

• 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 )

  npyl

  committed
  201c7eb

  Copy full SHA for 201c7eb

• I think the code is in good condition now

  npyl

  committed
  c9ae8d5

  Copy full SHA for c9ae8d5

Commits on Sep 15, 2017

• semaphore.hh: Implemented ~semaphore() and added throwing exception

  Show description for b88c6ed
  npyl

  committed
  b88c6ed

  Copy full SHA for b88c6ed

Commits on Sep 17, 2017

• Implements update_total_processes()

  Show description for dbfda1d
  npyl

  committed
  dbfda1d

  Copy full SHA for dbfda1d

Commits on Sep 18, 2017

• 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 logi…

  Show description for 3dd49c2
  npyl

  committed
  3dd49c2

  Copy full SHA for 3dd49c2

• patch

  npyl

  committed
  907c808

  Copy full SHA for 907c808

Commits on Sep 20, 2017

• experimental support for get_top_info() and update_cpu_usage() :)

  npyl

  committed
  bd4ef86

  Copy full SHA for bd4ef86

Commits on Sep 21, 2017

• going to patch stuff

  npyl

  committed
  5b1fb9e

  Copy full SHA for 5b1fb9e

• adds getting rss memory in get_top_info()

  npyl

  committed
  dffc2fe

  Copy full SHA for dffc2fe

• fixes

  npyl

  committed
  1365ab5

  Copy full SHA for 1365ab5

Commits on Sep 22, 2017

• Couple things made more beautiful but too many things to fix ...

  npyl

  committed
  c993213

  Copy full SHA for c993213

• Remove unneeded code from darwin_soundcard.h and keep only needed to

  Show description for 88e26a8
  npyl

  committed
  88e26a8

  Copy full SHA for 88e26a8

Commits on Sep 23, 2017

• 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 rele…

  Show description for 0578395
  npyl

  committed
  0578395

  Copy full SHA for 0578395

• Now using a more linux-influenced implementation and dropping the old... ( only keeps mach stuff )

  Show description for 97ecefc
  npyl

  committed
  97ecefc

  Copy full SHA for 97ecefc

Commits on Sep 29, 2017

• Add conky installer (.pkg) project

  npyl

  committed
  f52d713

  Copy full SHA for f52d713

Commits on Oct 1, 2017

• 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

  npyl

  committed
  8d65bee

  Copy full SHA for 8d65bee

Commits on Oct 2, 2017

• Properly get thread count!

  Show description for ac11fab
  npyl

  committed
  ac11fab

  Copy full SHA for ac11fab

Commits on Oct 6, 2017

• sort out some things in the code:

  Show description for 679b823
  npyl

  committed
  679b823

  Copy full SHA for 679b823

Commits on Oct 7, 2017

• Enable the if_mounted command and start implementing the check_mount function in darwin.cc

  npyl

  committed
  18a3d6c

  Copy full SHA for 18a3d6c

Commits on Oct 8, 2017

• Tighten things up

  npyl

  committed
  1fa3dd4

  Copy full SHA for 1fa3dd4

• 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 t…

  Show description for db3e95d
  

  Nickolas Pylarinos

  committed
  db3e95d

  Copy full SHA for db3e95d

• Update README to provide more complete info on building on macOS

  npyl

  committed
  c3288ed

  Copy full SHA for c3288ed

• Fix

  npyl

  committed
  18e93e9

  Copy full SHA for 18e93e9

Commits on Oct 11, 2017

• patch check_mounted + SIP status

  Show description for 0ae7799
  npyl

  committed
  0ae7799

  Copy full SHA for 0ae7799

• Merge https://github.com/npyl/conky

  npyl

  committed
  be95729

  Copy full SHA for be95729

Commits on Oct 12, 2017

• Further implement sip_status

  Show description for 7dbbcf1
  npyl

  committed
  7dbbcf1

  Copy full SHA for 7dbbcf1

Commits on Oct 15, 2017

• sip_status progress & if_up enabled

  Show description for 9975c35
  npyl

  committed
  9975c35

  Copy full SHA for 9975c35

• sip_status patches

  Show description for bfb85fe
  npyl

  committed
  bfb85fe

  Copy full SHA for bfb85fe

Commits on Oct 17, 2017

• Disable ncurses checks in a way that will allow compiling for other OSes! ( it was a really quick patch before )

  npyl

  committed
  1832c6f

  Copy full SHA for 1832c6f

• Merge branch 'master' of https://github.com/npyl/conky

  npyl

  committed
  33dbfac

  Copy full SHA for 33dbfac

• More changes in cmake file to make code prettier and more exact

  npyl

  committed
  ecfabba

  Copy full SHA for ecfabba

• More cmake files cuteness

  npyl

  committed
  fa79efd

  Copy full SHA for fa79efd

Commits on Oct 21, 2017

• work for supporting versions prior Sierra

  Show description for d12d6aa
  npyl

  committed
  d12d6aa

  Copy full SHA for d12d6aa

• Oops

  npyl

  committed
  a4285d0

  Copy full SHA for a4285d0

• $if_mounted ready

  Show description for c46baf1
  npyl

  committed
  c46baf1

  Copy full SHA for c46baf1

Commits on Oct 22, 2017

• $if_up works

  Show description for a4467c7
  npyl

  committed
  a4467c7

  Copy full SHA for a4467c7

Commits on Oct 24, 2017

• fix compatibility with Mavericks and before...

  Show description for 3903e2a
  npyl

  committed
  3903e2a

  Copy full SHA for 3903e2a

• Added link for youtube video showing conky running on macOS

  npyl

  committed
  5e69653

  Copy full SHA for 5e69653

Commits on Oct 28, 2017

• Improvements

  Show description for 777ddc0
  npyl

  committed
  777ddc0

  Copy full SHA for 777ddc0

Commits on Dec 17, 2017

• Simplify Xcode configuration process! :)

  npyl

  committed
  9d07e9b

  Copy full SHA for 9d07e9b

Commits on Dec 18, 2017

• Removed update_cpu_usage() implementation

  Show description for 74a6037
  npyl

  committed
  74a6037

  Copy full SHA for 74a6037

• Cleanup the source code

  Show description for d6776d4
  npyl

  committed
  d6776d4

  Copy full SHA for d6776d4

• Last small cleanup

  Show description for 88c8e49
  npyl

  committed
  88c8e49

  Copy full SHA for 88c8e49

• update authors file

  npyl

  committed
  f0cb3bd

  Copy full SHA for f0cb3bd

Commits on Dec 20, 2017

• Improve README

  Show description for 33be767
  npyl

  authored
  33be767

  Copy full SHA for 33be767

• Update README.md

  Show description for 404d0a7
  npyl

  authored
  404d0a7

  Copy full SHA for 404d0a7

Commits on Dec 21, 2017

• Work for conforming with "Development" rules

  Show description for 1fd7dde
  npyl

  committed
  1fd7dde

  Copy full SHA for 1fd7dde

Commits on Dec 22, 2017

• First patch set that implements get_top_info()

  Show description for c605f73
  npyl

  committed
  c605f73

  Copy full SHA for c605f73

Commits on Dec 23, 2017

• Calculate cpu usage of all processes more efficiently. (Now results match Activity Monitor's results a lot!!!)

  Show description for e1a4e7d
  npyl

  committed
  e1a4e7d

  Copy full SHA for e1a4e7d

• Cleanup patch!

  Show description for f1cbe4f
  npyl

  committed
  f1cbe4f

  Copy full SHA for f1cbe4f

Commits on Dec 26, 2017

• Correctly enable $running_processes variable

  Show description for caf397d
  npyl

  committed
  caf397d

  Copy full SHA for caf397d

• Removed unneeded flag

  Show description for 785329a
  npyl

  committed
  785329a

  Copy full SHA for 785329a

• Update README.md

  npyl

  authored
  24458ed

  Copy full SHA for 24458ed

• Update README.md

  Show description for cd6ce92
  npyl

  authored
  cd6ce92

  Copy full SHA for cd6ce92

Commits on Dec 27, 2017

• First patch towards implementing #15

  Show description for 9957ce2
  npyl

  committed
  9957ce2

  Copy full SHA for 9957ce2

• First fix for the algorithm that calculates % CPU usage of a process

  Show description for cd1d1fb
  npyl

  committed
  cd1d1fb

  Copy full SHA for cd1d1fb

• Merge branch 'master' of https://github.com/npyl/conky-for-macOS

  npyl

  committed
  9c74bd6

  Copy full SHA for 9c74bd6

• Previous commit wasn't pushed...

  npyl

  committed
  7b182fd

  Copy full SHA for 7b182fd

• Problems committing

  npyl

  committed
  7e2dcd4

  Copy full SHA for 7e2dcd4

Commits on Dec 28, 2017

• Make the code cleaner but break the algorithm again #15

  Show description for a00c772
  npyl

  committed
  a00c772

  Copy full SHA for a00c772

• Rework the code a bit / CPU usage % algorithm still doesn't work

  Show description for a6263f8
  npyl

  committed
  a6263f8

  Copy full SHA for a6263f8

• cleanup

  Show description for 3f8522a
  npyl

  committed
  3f8522a

  Copy full SHA for 3f8522a

• bugfix

  npyl

  committed
  de3df15

  Copy full SHA for de3df15

• bugfix

  npyl

  committed
  6a37154

  Copy full SHA for 6a37154

Commits on Dec 29, 2017

• remove the whole get_top_info() code!

  Show description for 103df8e
  npyl

  committed
  103df8e

  Copy full SHA for 103df8e

• Work for #15

  Show description for 2a899e7
  npyl

  committed
  2a899e7

  Copy full SHA for 2a899e7

Commits on Jan 4, 2018

• Quick memory leak fix & some patches for the get_top_info algorithm

  npyl

  committed
  9895f27

  Copy full SHA for 9895f27

Commits on Jan 5, 2018

• Merge branch 'get_top_info'

  npyl

  committed
  df20611

  Copy full SHA for df20611

Commits on Jan 7, 2018

• quick patch for semaphore class

  npyl

  committed
  5a3486c

  Copy full SHA for 5a3486c

• Update the comments

  npyl

  committed
  fac43d2

  Copy full SHA for fac43d2

• For consistency

  npyl

  committed
  5f019be

  Copy full SHA for 5f019be

• temp

  npyl

  committed
  2190ff0

  Copy full SHA for 2190ff0

Commits on Jan 9, 2018

• Merge remote-tracking branch 'upstream/master'

  npyl

  committed
  a5a5f65

  Copy full SHA for a5a5f65

• Merge branch 'master' into update_cpu_usage

  npyl

  committed
  7267a51

  Copy full SHA for 7267a51

• Revert "Merge branch 'master' into update_cpu_usage"

  Show description for 692bd27
  npyl

  committed
  692bd27

  Copy full SHA for 692bd27

• Revert "Revert "Merge branch 'master' into update_cpu_usage""

  Show description for fcfa52b
  npyl

  committed
  fcfa52b

  Copy full SHA for fcfa52b

Commits on Jan 10, 2018

• Partially implement the overall % CPU usage

  npyl

  committed
  1faa38a

  Copy full SHA for 1faa38a

• bug fix: I meant procs and threads!

  npyl

  committed
  2c2c1e6

  Copy full SHA for 2c2c1e6

• Merge branch 'master' into update_cpu_usage

  npyl

  committed
  03c9591

  Copy full SHA for 03c9591

• make the code better part1

  npyl

  committed
  367a19d

  Copy full SHA for 367a19d

• cleanup

  npyl

  committed
  61fc4d1

  Copy full SHA for 61fc4d1

Commits on Jan 13, 2018

• Stabilise the values of get_cpu_sample(). Affects get_top_info() and update_cpu_usage() ( fixes #13 and #15 )

  Show description for 36af374
  npyl

  committed
  36af374

  Copy full SHA for 36af374

• Finish the optimised version of get_top_info()

  Show description for 04a2100
  npyl

  committed
  04a2100

  Copy full SHA for 04a2100

Commits on Jan 19, 2018

• Quick fix for #16

  Show description for 450bab8
  npyl

  committed
  450bab8

  Copy full SHA for 450bab8

Commits on Jan 21, 2018

• Strictness

  npyl

  committed
  d4e35f0

  Copy full SHA for d4e35f0

• Cleanup ConkyPlatformChecks.cmake

  Show description for e6ace31
  npyl

  committed
  e6ace31

  Copy full SHA for e6ace31

Commits on Jan 22, 2018

• Add warning to README

  Show description for 5bc6458
  npyl

  authored
  5bc6458

  Copy full SHA for 5bc6458

• More cleanup

  npyl

  committed
  2a6a2ab

  Copy full SHA for 2a6a2ab

• Merge branch 'master' of https://github.com/npyl/conky-for-macOS

  npyl

  committed
  cdfa702

  Copy full SHA for cdfa702

Commits on Jan 25, 2018

• Merge remote-tracking branch 'upstream/master' into follows_upstream

  Show description for f651780
  npyl

  committed
  f651780

  Copy full SHA for f651780

• Fix identation

  Show description for b37a266
  npyl

  committed
  b37a266

  Copy full SHA for b37a266

• Remove mixer related patches and files

  Show description for cf6dff8
  npyl

  committed
  cf6dff8

  Copy full SHA for cf6dff8

Commits on Jan 27, 2018

• Changes for using as submodule for ConkyX

  npyl

  committed
  68851c2

  Copy full SHA for 68851c2

• Fixes

  npyl

  committed
  00f3bbb

  Copy full SHA for 00f3bbb

Commits on Jan 28, 2018

• Merge branch 'master' into ConkyX

  npyl

  committed
  967b5c2

  Copy full SHA for 967b5c2

Commits on Feb 3, 2018

• Implement get_freq

  Show description for b29629f
  npyl

  committed
  b29629f

  Copy full SHA for b29629f

• Merge branch 'master' into ConkyX

  npyl

  committed
  e2b3d57

  Copy full SHA for e2b3d57

Commits on Feb 11, 2018

• First work for correcting mem stats #6

  Show description for 2c080d1
  npyl

  committed
  2c080d1

  Copy full SHA for 2c080d1

Commits on Feb 12, 2018

• Work for #6

  Show description for 1fc6e36
  npyl

  committed
  1fc6e36

  Copy full SHA for 1fc6e36

• cleanup for #6

  npyl

  committed
  1dabc8b

  Copy full SHA for 1dabc8b

• Merge branch 'memstats' into ConkyX

  npyl

  committed
  b849205

  Copy full SHA for b849205

• bug fix 1

  npyl

  committed
  fcdd547

  Copy full SHA for fcdd547

• cleanup

  npyl

  committed
  598bc0f

  Copy full SHA for 598bc0f

• hmm sorry

  npyl

  committed
  ca2e5b8

  Copy full SHA for ca2e5b8

Commits on Feb 13, 2018

• More cleanup

  Show description for 7b6edeb
  npyl

  committed
  7b6edeb

  Copy full SHA for 7b6edeb

Commits on Feb 15, 2018

• A bit documentation

  npyl

  committed
  eedde68

  Copy full SHA for eedde68

• Implement secondary memory stats #6

  Show description for 8c30d34
  npyl

  committed
  8c30d34

  Copy full SHA for 8c30d34

Commits on Feb 18, 2018

• Quit update_meminfo if libtop_tsamp_update_vm_stats() failed

  npyl

  committed
  4955cdc

  Copy full SHA for 4955cdc

Commits on Feb 26, 2018

• Merge remote-tracking branch 'upstream/master'

  npyl

  committed
  9620531

  Copy full SHA for 9620531

• Update README.md

  Show description for 0636f3b
  npyl

  authored
  0636f3b

  Copy full SHA for 0636f3b

Commits on Mar 3, 2018

• Merge branch 'memstats'

  npyl

  committed
  2d88024

  Copy full SHA for 2d88024

Commits on Mar 4, 2018

• Alot junk slipped in too!

  npyl

  committed
  820b550

  Copy full SHA for 820b550

Commits on Mar 18, 2018

• Merge net_stats branch

  Show description for a4e2284
  npyl

  committed
  a4e2284

  Copy full SHA for a4e2284

Commits on Mar 21, 2018

• Merge remote-tracking branch 'upstream/master'

  npyl

  committed
  5a46336

  Copy full SHA for 5a46336

• Corrections

  Show description for eaf893a
  npyl

  committed
  eaf893a

  Copy full SHA for eaf893a

Commits on Apr 8, 2018

• Fix identation and cleanup

  npyl

  committed
  37e1b0a

  Copy full SHA for 37e1b0a

Commits on Apr 16, 2018

• identation-fixes part1

  npyl

  committed
  e157850

  Copy full SHA for e157850

Commits on May 5, 2018

• Try to fix problem compiling on linux

  Show description for bec872f
  npyl

  committed
  bec872f

  Copy full SHA for bec872f

• attemp to completely fix linux problem!

  npyl

  committed
  28c2531

  Copy full SHA for 28c2531

• Merge remote-tracking branch 'origin/linux'

  npyl

  committed
  ba385a3

  Copy full SHA for ba385a3