Some time after the last eve-related PR libcurl began returning
`CURLE_RECV_ERROR` from `curl_easy_perform()`, even when the request returns
good data that is otherwise usable.
Now, if the `struct xmlData` has been populated by write_data, we use whatever
came back (almost invariably a complete XML response). We don't depend on
libcurl returning CURLE_OK.
* Cleared TODO for the multi-GPU support
Added an optional parameter to the commands nvidia and nvidiabar.
If the parameter is omited default value is 0 for GPU0
The parameter is the GPU index starting at 0
Enhanced the cache system for multi-GPU support.
* Optimization and added modelname
* Update of documentation
* Update 2 of documentation
* Provide support to query the active port on PA's default sink
This commit exposes 2 objects:
- pa_sink_active_port_name
(example value: "analog-output-headphones")
- pa_sink_active_port_description
(example value: "Headphones")
that give respectively the name and description strings
for the active port on the default sink provided by PulseAudio.
* Reflect 9ed28f2a in the documentation
- For an AMD FX(tm)-6350 Six-Core Processor the file '/sys/.../present'
reports "0,3-7". I assume that chip is really an 8-core die with two
cores disabled... Presumably you could also get "0,3-4,6", and other
combos too...
* remove path from libirc-include
* feature: irc: possibly show last n lines persistently instead of all lines said since last time
* irc: add overflow-check, for case when no newmsg's ->next is NULL
Per manpage of mount(1) in newer util-linux:
The programs mount and umount traditionally maintained a list of
currently mounted filesystems in the file /etc/mtab. This real mtab
file is still supported, but on current Linux systems it is better
to make it a symlink to /proc/mounts instead, because a regular mtab
file maintained in userspace cannot reliably work with namespaces,
containers and other advanced Linux features.
In most new Linux (e.g. Debian) /etc/mtab is already symlinked to
/proc/mounts.
See
e778642a9e
for the gory details.
The code was multiplying the index with the size of the element, and
then adding it to the typed pointer (resulting in a double
multiplication and an OOB access).
Replace the buggy code with a slightly safer c++ alternative.
* eve: fix API, empty queue, conky reload, formatting issues
Since the EVE module was contributed, CCP has changed how the API works and
what the correct API URL is. So the module had to be updated to respect the
changes made on the EVE side.
Additionally, undefined behavior was occurring for characters without active
skill training queue, as is common for folks with multiple characters on a
single account, and was also occurring when Conky was reloaded following a
config file change. Now the `$eve` variable should just contain an empty
string if the character isn't training a skill (to make it detectable by
`$is_empty`), and the module should do The Right Thing (tm) when the
config file is changed while Conky is running.
The time remaining text has been adjusted to be slightly less verbose.
The module should do the right thing for up to 64 distinct characters.
Presently, though, every additional character requires a blocking CURL
request, meaning that querying many characters is presently not ideal. A
rewrite of the module to use asynchronous requests is probably in order, but
will be left for a future PR.
* eve: fix timezone handling; better handling of bad XML
* On Linux `gettimeofday()` doesn't return valid timezone data; we use
`localtime()` and the `tm_gmtoff` instead. Training times are no longer
incorrect as a result.
* Sometimes the EVE API will return spurious non-XML tags as part of the
response. This previously caused the XML parser to return a null document.
We tell libxml to `XML_PARSE_RECOVER` to try to recover from these errors
where they occur on real data.
* Implemented cached versions of get_nvidia_value and get_nvidia_string_balue. Unmutable values now only are queried once.
* Removed the TODO topic related to using static variable as cache + fixed a typo in the sample nvidia config
* Was using mtf variables to store the perf values. Fixed it
* Removed an useless else statement
* llabs() is included in FreeBSD since FreeBSD 5.0.
Oldest supported FreeBSD version is 9.3 now.
* stdio.h needs to be explicitly included here for FreeBSD.
I can wrap it in #ifdefs if needed, but I don't think it can hurt other OSes.
* addr config variable works fine on FreeBSD.
* FreeBSD 5.x is really an ancient version and long unsupported, so I think this check for it can be dropped.
* Fix and simplify code to get battery state and charge.
* Add required include on FreeBSD.
* Add needed include on FreeBSD.
* Also populate basename to avoid printing (null) process names.
Repored by fellow FreeBSD user Szabolcs Grof.
* nvidia: Update the docs and add more arguments
**Updated the docs in variables.xml to reflect the current nvidia object.**
Basically just copied the inline comments into the XML document
**Added the last of the compatible arguments**
The following arguments were added to `get_nvidia_barval`:
* memfree
* ambienttemp
* gpufreq
* memfreq
* mtrfreq
* imagequality
This should leave only incompatible arguments unsupported (e.g. min/max
values).
Decided to base percentages off of zero rather than the specified minimum
values.
Signed-off-by: Matt Sturgeon <matt@sturgeon.me.uk>
* nvidia: Better error/debug printing
* Merged `scan_nvidia_args` and `set_nvidia_type` into new
`set_nvidia_query`
* Added a translation array for `nvidia`, `nvidiabar`, `nvidiagauge` and
`nvidiagraph` commands (helps with error printing)
* Added some NORM_ERR prints to `get_nvidia_barval`, `get_nvidia_value` and
`get_nvidia_string`
* Removed exess newlines in nvidia's core.cc error definitions
Signed-off-by: Matt Sturgeon <matt@sturgeon.me.uk>
* nvidia: Better sanity checks when running queries
Introduced a pair of functions that checks whether the target we are
querying exists and how many of the target there are.
If the target doesn't exist there probably isn't a nvidia card
installed, if the target count query fails then the propietary drivers
probably aren't installed.
Fixes #269
Signed-off-by: Matt Sturgeon <matt@sturgeon.me.uk>
* Add native support for pulseaudio.
This adds ability to get Pulseaudio current volume without calling an
external program. Also it provides a few other parameters like card's
current profile similarly to pavucontrol. Currently it only queries the
default sink (and associated card).
* Switch to pulse async API.
This us by far the most efficient as conky subscribe to a few pulseaudio
notifications. Whenever pulseaudio server changes (volume or default
sink or default card), conky's callback updates the results.
This adds support for reading log entries from the Systemd journal. A
new command, called simply 'journal', is added which takes a number of
lines as a parameter and optionally which journal (user or system) to
read from.
Obviously, libsystemd is required to build journal support. Tested on
Arch Linux (Systemd v229).
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
When parsing the argument string for graph objects, check if there is a
double-quoted command in the beginning of the string and extract it
before parsing any options. This prevents items in a command from being
improperly recognized as graph options. It should also eliminate the
need to place commands with spaces into a separate script.
Also, fall back on default_graph_{height,width} instead of using
hard-coded values so that the default values set in a user's config will
work.
* Make dev_name resolve symlinks before resolving the name.
- When symlinks are not resolved first, you will get an error on startup when
using path in /dev/disk/by-id, for example, in diskiograph_*.
* Improve diskio device name resolution by always resolving symlinks.
- Any device path will be resolved of any symlinks before getting the usual
checks for labels et device name.
* Check if diskio device is really a block device, not only if it exists.
- Current check would succeed in case the device is a path, like when using
label: with an empty argument.
* First experiment with $nvidiabar
Added nvidiabar, nvidiagraph and nvidiagauge. Using a dummy value of 50% for now until it is integrated with the nvidia value query functions.
* Implement get_nvidia_barval()
`get_nvidia_barval()` no longer returns a dummy "50%" but instead an actual value for supported arguments:
`gpuutil`, `memutil`, `membwutil`, `videoutil`,`pcieutil`, `fanlevel` and `gputemp`
* use CLOCK_MONOTONIC if supported
get_time is used to control the update interval etc. so there's
no need to query the system time
* repaint immediately when the root pixmap changed
Original patch by pweisenburger,
In addition resets the next_update_time to ensure "now"
FIXES: #48
This patch modifies logic for setting next_update_time such that the
update is done at full update_interval seconds. That is, for example
with update_interval 60.0, update is done at 00:00:00, 00:01:00,
00:02:00, etc.
This might be useful for using conky as a clock widget which only needs
to be updated once per minute, but is obliged to update exactly at
minute change.
It is implemented in a way that is (hopefully) immune to clockchanges
(as for example by NTP or DST).
The main purpose of this commit is to ensure that exec callbacks are
registered at startup (or config reload), so that they have a chance to
run on the first update interval. Much of the code in exec.cc got
consolidated, making it easier to follow. Several checks for NULL
pointers should eliminate some obscure segfaults I noticed, as well.
During the refactoring, I implemented height and width arguments for
execbar and execgauge. The functionality was already there, but wasn't
being used. All this is accompanied by updates to the man page and
plenty of code comments.
e.g. in the beginning the scale is always 0, leading to NaN and a crash
fixes the "show_graph_scale" not working bug, not yet reported (even though I actually noticed that before, didn't seem to bother me)
also cpugauge works again because fo this BUILD_MATH MATH problem
I ran cppcheck on a whim while trying to debug #103 and it found these possible
memory corruptions. They all seem to be buffers that were made one byte too
small (leaving out the byte for the C-string null terminator).
When we parse /proc/<pid>/* in order to populate the process struct, it isn't
necessary to try to remove any instance of "kdeinit: " anymore (IMO). Here is
why:
* If the user chooses to display full command lines (top_name_verbose = true),
then we should show full command lines without stripping useful info.
* The new basename entry already has a stripped down command. For example, if
the command line is "kdeinit4: kded4 [kdeinit]", then basename is "kded4".
* The code does not account for "kdeinit{4,5}: ", resulting in undesired
behavior, e.g. "kdeinit4: kded4 [kdeinit]" becomes "kdeinit4:".
* The code does not account for NUL separated arguments.
* The code opens /proc/<pid>/cmdline a second time, so this commit is a minor
optimization.
I think it is best to remove this code altogether. If anyone disagrees, please
comment or send me some hate mail with reasons why we should keep it. The commit
is easy enough to revert. :)
The new top_name_verbose option works in most cases, but it will fail if the
executable name contains spaces. Trying to parse command lines from
/proc/<pid>/* turned out to be quite complex due to the many edge cases. My
solution, once again, is to fall back to 1.9.x behavior. If top_name_verbose is
true, use the full command line. Otherwise, use basename.
Fixes #131.
Currently, in order to match a running process with ${if_running}, a user needs
to specify the full command line plus arguments in conky.conf. This commit keeps
that behavior and adds a fallback that is equivalent to the 1.9.x bevahior,
namely matching against the executable name contained in /proc/<pid>/stat.
This completes the fix for #121.
Since we now store a full command line for each process, a few problems are
apparent. For example, the names displayed by ${top ...} are verbose. This has
been partially addressed by the top_name_verbose option, but it is broken
whenever an executable name contains spaces. Another example is ${if_running},
which only matches the input if it exactly matches the entire command line.
This commit adds a basename (i.e. executable filename) entry to the process
struct. The intention is to store the executable filename from /proc/<pid>/stat,
which was the old 1.9.x behavior. This way, we have the best of both worlds.
Those who like the full command line can have it, and those who prefer the old
way can be satisfied too.
According to proc(5), /proc/<pid>/cmdline is supposed to have a NUL between each
argument, plus an additional NUL at the end. Instead of replacing each NUL with
a space, just replace the ones between arguments and ignore the rest.
Partial fix for #121.
lua_gettable returns an int instead of void in Lua 5.3, so provide a
backwards-compatible overload of safe_misc_trampoline to account for this.
Tested with Lua 5.2 and 5.3.
This change does not address other compilation issues related to Lua bindings
for cairo, imlib2, and rsvg.
Fixes #90 and part of #100.
Note: This may not be the correct solution, it depends on the author's intention. Maybe he wanted to keep the headers from the previous call (in other words if there are no new headers use the old ones) and didn't realize they weren't copied in the handle, in which case he'll have to save the headers instead of above.
There are 2 variants of strerror_r, GNU extension and a POSIX variant.
Use the more portable POSIX variant.
Also fix a potensial stack-use-after-return bug, instead of relying on
undefined behavoir in GNU libc implementation. The strerror_r manpage
says:
> This may be either a pointer to a string that the function stores in
> buf, or a pointer to some (immutable) static string (in which case buf
> is unused).
So it does not guarantee that it returns a pointer to some (immutable)
static string. It might return a pointer to "buf", in which case we get
a stack-use-after-return bug.
We fix this by declaring a thread local static buffer which we always
return.
Currently, state::getglobal pushes two values onto the stack: the global
environment and the requested global. For example, if you call
getglobal("conky"), the stack ends up with the following:
| ... global, conky |
The function config_setting_base::lua_set in setting.cc does not take this
behavior into account, resulting in #97.
To correct this, call replace(-2) at the end of state::getglobal where
LUA_VERSION_NUM >= 502.
Since commit 749083a, the output of ${top name <num>} contains the full
command line of each process, including arguments. While this feature can
be very useful, it changes the default behavior of Conky.
The present commit adds a new top_name_verbose option that allows the user
to toggle between basenames with no arguments (the old behavior) and full
command lines with arguments. To remain consistent with past versions of
Conky, the default value of top_name_verbose is false.
Fixes #113 (https://github.com/brndnmtthws/conky/issues/113).
get_cpu_count() is not called before trying to use cpus so conky exits with
conky: obj->data.i 1 info.cpu_count 0
conky: attempting to use more CPUs than you have!
Fixes issue #93.
If BUILD_IPV6=ON (default), but the user has disabled ipv6 support
in the kernel using the parameter ipv6.disable=1, then conky fails
to open /proc/net/if_inet6. This leads to a segfault when conky
calls fclose(file) regardless. This fix simply moves the fclose call
into the preceding if statement.
In our XCreateWindow call, we always set the backing_store attribute
to 'Always'. But since we never add the CWBackingStore to our value
mask, the backing_store setting always gets set to the default
NotUseful. This means that the backing store is never turned on, and
so when unobscuring the conky window, portions of the display will not
be drawn immediately if conky is blocked doing something else (e.g.
network, disk, the process is stopped), which is really annoying.
To fix this, specify the CWBackingStore flag in our value mask, so the
conky data is always visible, even if conky is blocking on some other
operation.
