mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-06-02 07:20:47 +00:00
Update docs + minor changes
* document DragonFly specific $version variable * add sample conky config file * some dragonfly.cc code cleanup
This commit is contained in:
Magliano Andrea
Pavel Labath
parent
d5af1be997
commit
78b1daf848
92
data/conky-dfly-smp.conf
Normal file
92
data/conky-dfly-smp.conf
Normal file
|
|
@ -0,0 +1,92 @@
|
|||
-- vim: ts=4 sw=4 noet ai cindent syntax=lua
|
||||
--[[
|
||||
Conky, a system monitor, based on torsmo
|
||||
|
||||
Any original torsmo code is licensed under the BSD license
|
||||
|
||||
All code written since the fork of torsmo is licensed under the GPL
|
||||
|
||||
Please see COPYING for details
|
||||
|
||||
Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
|
||||
Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
|
||||
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/>.
|
||||
]]
|
||||
|
||||
conky.config = {
|
||||
alignment = 'bottom_left',
|
||||
background = false,
|
||||
border_width = 1,
|
||||
cpu_avg_samples = 2,
|
||||
default_color = 'white',
|
||||
default_outline_color = 'white',
|
||||
default_shade_color = 'white',
|
||||
draw_borders = false,
|
||||
draw_graph_borders = true,
|
||||
draw_outline = false,
|
||||
draw_shades = false,
|
||||
use_xft = false,
|
||||
--font = 'DejaVu Sans Mono:size=12',
|
||||
gap_x = 5,
|
||||
gap_y = 30,
|
||||
minimum_height = 5,
|
||||
minimum_width = 5,
|
||||
net_avg_samples = 2,
|
||||
no_buffers = true,
|
||||
out_to_console = false,
|
||||
out_to_stderr = false,
|
||||
extra_newline = false,
|
||||
own_window = false,
|
||||
own_window_class = 'Conky',
|
||||
own_window_type = 'desktop',
|
||||
stippled_borders = 0,
|
||||
update_interval = 3.0,
|
||||
uppercase = false,
|
||||
use_spacer = 'none',
|
||||
show_graph_scale = false,
|
||||
show_graph_range = false
|
||||
}
|
||||
|
||||
conky.text = [[
|
||||
$sysname $version on $machine
|
||||
$hr
|
||||
${color grey}Uptime:$color $uptime
|
||||
#${color grey}Temp:$color $acpitemp
|
||||
#${color grey}Frequency (in MHz):$color $freq
|
||||
#${color grey}Frequency (in GHz):$color $freq_g
|
||||
${color grey}RAM Usage:$color $mem/$memmax - $memperc% ${membar 4}
|
||||
${color grey}Swap Usage:$color $swap/$swapmax - $swapperc% ${swapbar 4}
|
||||
${color grey}CPU Usage:$color $cpu% ${cpubar 4}
|
||||
${color grey}CPU 0: ${cpu cpu1}% ${cpubar cpu1 4}
|
||||
CPU 1: ${cpu cpu2}% ${cpubar cpu2 4}
|
||||
CPU 2: ${cpu cpu3}% ${cpubar cpu3 4}
|
||||
CPU 3: ${cpu cpu4}% ${cpubar cpu4 4}$color
|
||||
${color grey}Processes:$color $processes ${color grey}Running:$color $running_processes
|
||||
$hr
|
||||
${color grey}File systems:
|
||||
/ $color${fs_used /}/${fs_size /} ${fs_bar 6 /}
|
||||
${color grey}Networking:
|
||||
Up:$color ${upspeed re0} ${color grey} - Down:$color ${downspeed re0}
|
||||
$hr
|
||||
${color grey}Name PID CPU% MEM%
|
||||
${color lightgrey} ${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1}
|
||||
${color lightgrey} ${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2}
|
||||
${color lightgrey} ${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3}
|
||||
${color lightgrey} ${top name 4} ${top pid 4} ${top cpu 4} ${top mem 4}
|
||||
${color lightgrey} ${top name 5} ${top pid 5} ${top cpu 5} ${top mem 5}
|
||||
${color lightgrey} ${top name 6} ${top pid 6} ${top cpu 6} ${top mem 6}
|
||||
${color lightgrey} ${top name 7} ${top pid 7} ${top cpu 7} ${top mem 7}
|
||||
${color lightgrey} ${top name 8} ${top pid 8} ${top cpu 8} ${top mem 8}
|
||||
]]
|
||||
|
|
@ -1972,6 +1972,15 @@
|
|||
<listitem>Kernel version
|
||||
<para /></listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>
|
||||
<command>
|
||||
<option>version</option>
|
||||
</command>
|
||||
</term>
|
||||
<listitem>Git version numer (DragonFly only)
|
||||
<para /></listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>
|
||||
<command>
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ int update_uname(void)
|
|||
strcpy(info.uname_v, strsep(&start, " "));
|
||||
}
|
||||
|
||||
if (errno == ENOMEM) printf("desc_n %lu\n", desc_n);
|
||||
if (errno == ENOMEM) printf("desc_n %zu\n", desc_n);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -61,10 +61,6 @@
|
|||
#define KELVTOC(x) ((x - 2732) / 10.0)
|
||||
#define MAXSHOWDEVS 16
|
||||
|
||||
#if 0
|
||||
#define DRAGONFLY_DEBUG
|
||||
#endif
|
||||
|
||||
static short cpu_setup = 0;
|
||||
|
||||
static int getsysctl(const char *name, void *ptr, size_t len)
|
||||
|
|
@ -78,7 +74,7 @@ static int getsysctl(const char *name, void *ptr, size_t len)
|
|||
}
|
||||
|
||||
if (nlen != len && errno == ENOMEM) {
|
||||
fprintf(stderr, "getsysctl(): %s failed %lu != %lu\n", name, nlen, len);
|
||||
fprintf(stderr, "getsysctl(): %s failed %zu != %zu\n", name, nlen, len);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -117,8 +113,7 @@ int update_uptime(void)
|
|||
time_t now;
|
||||
size_t size = sizeof(boottime);
|
||||
|
||||
if ((sysctl(mib, 2, &boottime, &size, NULL, 0) != -1)
|
||||
&& (boottime.tv_sec != 0)) {
|
||||
if ((sysctl(mib, 2, &boottime, &size, NULL, 0) != -1) && boottime.tv_sec) {
|
||||
time(&now);
|
||||
info.uptime = now - boottime.tv_sec;
|
||||
} else {
|
||||
|
|
@ -660,19 +655,6 @@ int update_diskio(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
//#define DRAGONFLY_DEBUG
|
||||
#ifdef DRAGONFLY_DEBUG
|
||||
static void proc_show(struct process **mem, const char *desc)
|
||||
{
|
||||
int i; printf("%s\n", desc);
|
||||
for (i = 0; i < 10; i++)
|
||||
if (mem[i])
|
||||
printf("\t%d: %s(%d) %d %d\n", i, mem[i]->name,
|
||||
mem[i]->pid, mem[i]->vsize, mem[i]->rss);
|
||||
printf("\n");
|
||||
}
|
||||
#endif
|
||||
|
||||
static int proc_rusage(struct kinfo_proc *p)
|
||||
{
|
||||
struct kinfo_lwp *lwp = &p->kp_lwp;
|
||||
|
|
@ -705,6 +687,7 @@ static void proc_count(struct kinfo_proc *kp, size_t proc_n)
|
|||
static void proc_fill(struct kinfo_proc *kp, size_t proc_n)
|
||||
{
|
||||
size_t i, f = getpagesize();
|
||||
static long prev_ticks = 0; /* safe as long as in same thread */
|
||||
|
||||
for (i = 0; i < proc_n; i++) {
|
||||
struct kinfo_proc *p = &kp[i];
|
||||
|
|
@ -715,6 +698,7 @@ static void proc_fill(struct kinfo_proc *kp, size_t proc_n)
|
|||
!lwp->kl_tid) { /* 'main' lwp, the real process (observed) */
|
||||
|
||||
struct process *my = get_process(p->kp_pid);
|
||||
long ticks = proc_rusage(p);
|
||||
|
||||
my->time_stamp = g_time;
|
||||
|
||||
|
|
@ -724,11 +708,9 @@ static void proc_fill(struct kinfo_proc *kp, size_t proc_n)
|
|||
my->amount = 100.0 * lwp->kl_pctcpu / FSCALE;
|
||||
my->vsize = p->kp_vm_map_size;
|
||||
my->rss = p->kp_vm_rssize * f;
|
||||
my->total_cpu_time = proc_rusage(p);
|
||||
|
||||
if (my->previous_user_time == ULONG_MAX)
|
||||
my->previous_user_time = my->total_cpu_time;
|
||||
else my->total_cpu_time -= my->previous_user_time;
|
||||
my->total_cpu_time = ticks - prev_ticks;
|
||||
prev_ticks = ticks;
|
||||
|
||||
// printf("\tmy[%p]: %s(%u) %d %d 0x%x 0x%x %f\n", p,
|
||||
// my->name, my->pid, my->vsize, my->rss,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user