Merge lp:~noskcaj/ubuntu/vivid/gnome-system-monitor/3.15.91 into lp:ubuntu/vivid/gnome-system-monitor

Proposed by Jackson Doak
Status: Needs review
Proposed branch: lp:~noskcaj/ubuntu/vivid/gnome-system-monitor/3.15.91
Merge into: lp:ubuntu/vivid/gnome-system-monitor
Diff against target: 1013 lines (+250/-192)
18 files modified
ChangeLog (+34/-0)
NEWS (+5/-0)
configure (+10/-10)
configure.ac (+1/-1)
debian/changelog (+6/-0)
gnome-system-monitor-kde.desktop.in (+1/-1)
gnome-system-monitor.desktop.in (+1/-1)
po/it.po (+91/-100)
src/Makefile.am (+1/-0)
src/Makefile.in (+5/-3)
src/application.h (+1/-1)
src/prefsdialog.cpp (+3/-4)
src/procproperties.cpp (+1/-24)
src/proctable.cpp (+12/-42)
src/systemd.cpp (+62/-0)
src/systemd.h (+12/-0)
src/util.cpp (+2/-2)
src/util.h (+2/-3)
To merge this branch: bzr merge lp:~noskcaj/ubuntu/vivid/gnome-system-monitor/3.15.91
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+251516@code.launchpad.net

Description of the change

New upstream bugfix release
- Improve bsd support
- Move systemd code to a separate file
- Minor bugfixes
- Translation updates

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve

Unmerged revisions

111. By Jackson Doak

New upstream bugfix release.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2015-02-11 17:15:36 +0000
3+++ ChangeLog 2015-03-02 20:22:51 +0000
4@@ -1,3 +1,37 @@
5+2015-03-02 Benoit Dejean <bdejean@gmail.com>
6+
7+ Remove code specific to linux to compute the writable memory. Use instead libgtop flags.
8+
9+ Signed-off-by: Robert Roth <robert.roth.off@gmail.com>
10+
11+2015-03-02 Benoit Dejean <bdejean@gmail.com>
12+
13+ Move all code related to systemd in systemd.{cpp,h} to have a clean interface instead of #ifdef all over the place.
14+
15+ Signed-off-by: Robert Roth <robert.roth.off@gmail.com>
16+
17+2015-03-02 Benoit Dejean <bdejean@gmail.com>
18+
19+ Use the same CPU time format in the process properties than in the process list by using format_duration_for_display(). Get rid of useless OS-specific code.
20+
21+ Signed-off-by: Robert Roth <robert.roth.off@gmail.com>
22+
23+2015-03-01 Benoît Dejean <bdejean@gmail.com>
24+
25+ Fixed forward declaration of class ProcInfo.
26+
27+2015-02-18 Milo Casagrande <milo@ubuntu.com>
28+
29+ Updated Italian translation
30+
31+2015-02-17 Milo Casagrande <milo@ubuntu.com>
32+
33+ Updated Italian translation
34+
35+2015-01-19 Robert Roth <robert.roth.off@gmail.com>
36+
37+ Release 3.15.4
38+
39 2015-01-10 Robert Roth <robert.roth.off@gmail.com>
40
41 Removed iconthemewrapper
42
43=== modified file 'NEWS'
44--- NEWS 2015-02-11 17:15:36 +0000
45+++ NEWS 2015-03-02 20:22:51 +0000
46@@ -1,3 +1,8 @@
47+New in 3.15.91 - 2 March 2015
48+
49+* added/updated translations
50+ it, courtesy of Milo Casagrande
51+
52 New in 3.15.4 - 19 January 2015
53
54 List of fixed bugs
55
56=== modified file 'configure'
57--- configure 2015-02-11 17:15:36 +0000
58+++ configure 2015-03-02 20:22:51 +0000
59@@ -1,6 +1,6 @@
60 #! /bin/sh
61 # Guess values for system-dependent variables and create Makefiles.
62-# Generated by GNU Autoconf 2.69 for gnome-system-monitor 3.15.4.
63+# Generated by GNU Autoconf 2.69 for gnome-system-monitor 3.15.91.
64 #
65 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=system-monitor>.
66 #
67@@ -591,8 +591,8 @@
68 # Identity of this package.
69 PACKAGE_NAME='gnome-system-monitor'
70 PACKAGE_TARNAME='gnome-system-monitor'
71-PACKAGE_VERSION='3.15.4'
72-PACKAGE_STRING='gnome-system-monitor 3.15.4'
73+PACKAGE_VERSION='3.15.91'
74+PACKAGE_STRING='gnome-system-monitor 3.15.91'
75 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=system-monitor'
76 PACKAGE_URL=''
77
78@@ -1417,7 +1417,7 @@
79 # Omit some internal or obsolete options to make the list less imposing.
80 # This message is too long to be a string in the A/UX 3.1 sh.
81 cat <<_ACEOF
82-\`configure' configures gnome-system-monitor 3.15.4 to adapt to many kinds of systems.
83+\`configure' configures gnome-system-monitor 3.15.91 to adapt to many kinds of systems.
84
85 Usage: $0 [OPTION]... [VAR=VALUE]...
86
87@@ -1488,7 +1488,7 @@
88
89 if test -n "$ac_init_help"; then
90 case $ac_init_help in
91- short | recursive ) echo "Configuration of gnome-system-monitor 3.15.4:";;
92+ short | recursive ) echo "Configuration of gnome-system-monitor 3.15.91:";;
93 esac
94 cat <<\_ACEOF
95
96@@ -1632,7 +1632,7 @@
97 test -n "$ac_init_help" && exit $ac_status
98 if $ac_init_version; then
99 cat <<\_ACEOF
100-gnome-system-monitor configure 3.15.4
101+gnome-system-monitor configure 3.15.91
102 generated by GNU Autoconf 2.69
103
104 Copyright (C) 2012 Free Software Foundation, Inc.
105@@ -2098,7 +2098,7 @@
106 This file contains any messages produced by compilers while
107 running configure, to aid debugging if configure makes a mistake.
108
109-It was created by gnome-system-monitor $as_me 3.15.4, which was
110+It was created by gnome-system-monitor $as_me 3.15.91, which was
111 generated by GNU Autoconf 2.69. Invocation command line was
112
113 $ $0 $@
114@@ -2967,7 +2967,7 @@
115
116 # Define the identity of the package.
117 PACKAGE='gnome-system-monitor'
118- VERSION='3.15.4'
119+ VERSION='3.15.91'
120
121
122 cat >>confdefs.h <<_ACEOF
123@@ -17946,7 +17946,7 @@
124 # report actual input values of CONFIG_FILES etc. instead of their
125 # values after options handling.
126 ac_log="
127-This file was extended by gnome-system-monitor $as_me 3.15.4, which was
128+This file was extended by gnome-system-monitor $as_me 3.15.91, which was
129 generated by GNU Autoconf 2.69. Invocation command line was
130
131 CONFIG_FILES = $CONFIG_FILES
132@@ -18012,7 +18012,7 @@
133 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
134 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
135 ac_cs_version="\\
136-gnome-system-monitor config.status 3.15.4
137+gnome-system-monitor config.status 3.15.91
138 configured by $0, generated by GNU Autoconf 2.69,
139 with options \\"\$ac_cs_config\\"
140
141
142=== modified file 'configure.ac'
143--- configure.ac 2015-02-11 17:15:36 +0000
144+++ configure.ac 2015-03-02 20:22:51 +0000
145@@ -2,7 +2,7 @@
146 AC_PREREQ([2.63])
147
148 AC_INIT([gnome-system-monitor],
149- [3.15.4],
150+ [3.15.91],
151 [http://bugzilla.gnome.org/enter_bug.cgi?product=system-monitor],
152 [gnome-system-monitor])
153
154
155=== modified file 'debian/changelog'
156--- debian/changelog 2015-02-11 17:15:36 +0000
157+++ debian/changelog 2015-03-02 20:22:51 +0000
158@@ -1,3 +1,9 @@
159+gnome-system-monitor (3.15.91-0ubuntu1) vivid; urgency=medium
160+
161+ * New upstream bugfix release.
162+
163+ -- Jackson Doak <noskcaj@ubuntu.com> Tue, 03 Mar 2015 07:05:47 +1100
164+
165 gnome-system-monitor (3.15.4-0ubuntu1) vivid; urgency=medium
166
167 * New upstream release.
168
169=== modified file 'gnome-system-monitor-kde.desktop.in'
170--- gnome-system-monitor-kde.desktop.in 2015-02-11 17:15:36 +0000
171+++ gnome-system-monitor-kde.desktop.in 2015-03-02 20:22:51 +0000
172@@ -12,5 +12,5 @@
173 X-GNOME-Bugzilla-Bugzilla=GNOME
174 X-GNOME-Bugzilla-Product=system-monitor
175 X-GNOME-Bugzilla-Component=general
176-X-GNOME-Bugzilla-Version=3.15.4
177+X-GNOME-Bugzilla-Version=3.15.91
178 _Keywords=Monitor;System;Process;CPU;Memory;Network;History;Usage;
179
180=== modified file 'gnome-system-monitor.desktop.in'
181--- gnome-system-monitor.desktop.in 2015-02-11 17:15:36 +0000
182+++ gnome-system-monitor.desktop.in 2015-03-02 20:22:51 +0000
183@@ -12,5 +12,5 @@
184 X-GNOME-Bugzilla-Bugzilla=GNOME
185 X-GNOME-Bugzilla-Product=system-monitor
186 X-GNOME-Bugzilla-Component=general
187-X-GNOME-Bugzilla-Version=3.15.4
188+X-GNOME-Bugzilla-Version=3.15.91
189 _Keywords=Monitor;System;Process;CPU;Memory;Network;History;Usage;Performance;Task;Manager;
190
191=== modified file 'po/it.po'
192--- po/it.po 2015-02-11 17:15:36 +0000
193+++ po/it.po 2015-03-02 20:22:51 +0000
194@@ -1,18 +1,18 @@
195 # Italian messages for gnome-system-monitor
196-# Copyright (C) 2001-2009, 2012, 2013, 2014 Free Software Foundation, Inc.
197+# Copyright (C) 2001-2009, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
198 # This package is distributed under the same license as the gnome-system-monitor package.
199 # Alessio Frusciante <algol@firenze.linux.it>, 2001, 2002, 2003, 2004, 2005, 2006, 2007.
200 # Davide Falanga <davide.falanga@alice.it>, 2009.
201 # Luca Ferretti <lferrett@gnome.org>, 2007, 2008, 2011.
202-# Milo Casagrande <milo@milo.name>, 2008, 2009, 2012, 2013, 2014.
203+# Milo Casagrande <milo@milo.name>, 2008, 2009, 2012, 2013, 2014, 2015.
204 #
205 msgid ""
206 msgstr ""
207 "Project-Id-Version: gnome-system-monitor\n"
208 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=system-"
209 "monitor&keywords=I18N+L10N&component=general\n"
210-"POT-Creation-Date: 2014-10-05 07:47+0000\n"
211-"PO-Revision-Date: 2014-10-05 17:34+0100\n"
212+"POT-Creation-Date: 2015-02-17 20:48+0000\n"
213+"PO-Revision-Date: 2015-02-18 08:56+0100\n"
214 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
215 "Language-Team: Italian <tp@lists.linux.it>\n"
216 "Language: it\n"
217@@ -21,7 +21,7 @@
218 "Content-Transfer-Encoding: 8bit\n"
219 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
220 "X-Launchpad-Export-Date: 2012-04-05 10:00+0000\n"
221-"X-Generator: Poedit 1.6.9\n"
222+"X-Generator: Poedit 1.7.4\n"
223
224 #: ../gnome-system-monitor.desktop.in.in.h:1 ../data/interface.ui.h:1
225 #: ../src/application.cpp:268 ../src/interface.cpp:363
226@@ -34,12 +34,10 @@
227 msgstr "Visualizza i processi correnti e controlla lo stato del sistema"
228
229 #: ../gnome-system-monitor.desktop.in.in.h:3
230-msgid ""
231-"Monitor;System;Process;CPU;Memory;Network;History;Usage;Performance;Task;"
232-"Manager;"
233+msgid "Monitor;System;Process;CPU;Memory;Network;History;Usage;Performance;Task;Manager;"
234 msgstr ""
235-"Monitor;Controllo;Sistema;Processo;Processi;CPU;Memoria;Network;Rete;"
236-"Cronologia;Utilizzo;Uso;Prestazioni;Performance;Task;Lavori;Manager;Gestione;"
237+"Monitor;Controllo;Sistema;Processo;Processi;CPU;Memoria;Network;Rete;Cronologia;"
238+"Utilizzo;Uso;Prestazioni;Performance;Task;Lavori;Manager;Gestione;"
239
240 #: ../gnome-system-monitor-kde.desktop.in.in.h:1
241 #: ../gnome-system-monitor.appdata.xml.in.h:1 ../src/application.cpp:324
242@@ -49,8 +47,8 @@
243 #: ../gnome-system-monitor-kde.desktop.in.in.h:3
244 msgid "Monitor;System;Process;CPU;Memory;Network;History;Usage;"
245 msgstr ""
246-"Monitor;Controllo;Sistema;Processo;Processi;CPU;Memoria;Network;Rete;"
247-"Cronologia;Utilizzo;Uso;"
248+"Monitor;Controllo;Sistema;Processo;Processi;CPU;Memoria;Network;Rete;Cronologia;"
249+"Utilizzo;Uso;"
250
251 #: ../gnome-system-monitor.appdata.xml.in.h:2
252 msgid "View and manage system resources"
253@@ -58,31 +56,29 @@
254
255 #: ../gnome-system-monitor.appdata.xml.in.h:3
256 msgid ""
257-"System Monitor is a process viewer and system monitor with an attractive, "
258-"easy-to-use interface."
259+"System Monitor is a process viewer and system monitor with an attractive, easy-to-use "
260+"interface."
261 msgstr ""
262-"«Monitor di sistema» è un visualizzatore di processi e delle risorse di "
263-"sistema, dotato di un'interfacca semplice da usare."
264+"«Monitor di sistema» è un visualizzatore di processi e delle risorse di sistema, "
265+"dotato di un'interfacca semplice da usare."
266
267 #: ../gnome-system-monitor.appdata.xml.in.h:4
268 msgid ""
269-"System Monitor can help you find out what applications are using the "
270-"processor or the memory of your computer, can manage the running "
271-"applications, force stop processes not responding, and change the state or "
272-"priority of existing processes."
273+"System Monitor can help you find out what applications are using the processor or the "
274+"memory of your computer, can manage the running applications, force stop processes not "
275+"responding, and change the state or priority of existing processes."
276 msgstr ""
277-"«Monitor di sistema» è in grado di mostrare quali applicazioni stanno "
278-"utilizzato il processore o la memoria del computer; può gestire le "
279-"applicazioni in esecuzione, terminare i processi bloccai e modificare la "
280-"priorità dei process."
281+"«Monitor di sistema» è in grado di mostrare quali applicazioni stanno utilizzato il "
282+"processore o la memoria del computer; può gestire le applicazioni in esecuzione, "
283+"terminare i processi bloccai e modificare la priorità dei process."
284
285 #: ../gnome-system-monitor.appdata.xml.in.h:5
286 msgid ""
287-"The resource graphs feature shows you a quick overview of what is going on "
288-"with your computer displaying recent network, memory and processor usage."
289+"The resource graphs feature shows you a quick overview of what is going on with your "
290+"computer displaying recent network, memory and processor usage."
291 msgstr ""
292-"Il grafico delle risorse consente di avere una panoramica sullo stato del "
293-"sistema visualizzando l'utilizzo della rete, della memoria e del processore."
294+"Il grafico delle risorse consente di avere una panoramica sullo stato del sistema "
295+"visualizzando l'utilizzo della rete, della memoria e del processore."
296
297 #: ../org.gnome.gnome-system-monitor.policy.in.in.h:1
298 msgid "Kill process"
299@@ -90,8 +86,7 @@
300
301 #: ../org.gnome.gnome-system-monitor.policy.in.in.h:2
302 msgid "Privileges are required to control other users' processes"
303-msgstr ""
304-"Sono richiesti dei privilegi per controllare i processi di altri utenti"
305+msgstr "Sono richiesti dei privilegi per controllare i processi di altri utenti"
306
307 #: ../org.gnome.gnome-system-monitor.policy.in.in.h:3
308 msgid "Renice process"
309@@ -99,8 +94,7 @@
310
311 #: ../org.gnome.gnome-system-monitor.policy.in.in.h:4
312 msgid "Privileges are required to change the priority of processes"
313-msgstr ""
314-"Sono richiesti dei privilegi per poter modificare la priorità dei processi"
315+msgstr "Sono richiesti dei privilegi per poter modificare la priorità dei processi"
316
317 #: ../data/interface.ui.h:2
318 msgid "End _Process"
319@@ -122,8 +116,8 @@
320 msgid "Memory and Swap History"
321 msgstr "Cronologia memoria e swap"
322
323-#: ../data/interface.ui.h:7 ../src/interface.cpp:260
324-#: ../src/procproperties.cpp:92 ../src/proctable.cpp:337
325+#: ../data/interface.ui.h:7 ../src/interface.cpp:260 ../src/procproperties.cpp:92
326+#: ../src/proctable.cpp:337
327 msgid "Memory"
328 msgstr "Memoria"
329
330@@ -343,62 +337,62 @@
331
332 #: ../data/renice.ui.h:4
333 msgid ""
334-"<small><i><b>Note:</b> The priority of a process is given by its nice value. "
335-"A lower nice value corresponds to a higher priority.</i></small>"
336+"<small><i><b>Note:</b> The priority of a process is given by its nice value. A lower "
337+"nice value corresponds to a higher priority.</i></small>"
338 msgstr ""
339-"<small><i><b>Nota:</b> la priorità di un processo è data dal suo valore di "
340-"nice. Un valore più basso corrisponde a una priorità più alta.</i></small>"
341+"<small><i><b>Nota:</b> la priorità di un processo è data dal suo valore di nice. Un "
342+"valore più basso corrisponde a una priorità più alta.</i></small>"
343
344 #: ../src/application.cpp:310
345 msgid "A simple process and system monitor."
346 msgstr "Un semplice monitor dei processi e del sistema."
347
348-#: ../src/argv.cpp:21
349+#: ../src/argv.cpp:22
350 msgid "Show the Processes tab"
351 msgstr "Mostra la scheda \"Processi\""
352
353 # (ndt) messo tra "", è un'opzione a riga di comando
354-#: ../src/argv.cpp:26
355+#: ../src/argv.cpp:27
356 msgid "Show the Resources tab"
357 msgstr "Mostra la scheda \"Risorse\""
358
359 # (ndt) messo tra "", è un'opzione a riga di comando
360-#: ../src/argv.cpp:31
361+#: ../src/argv.cpp:32
362 msgid "Show the File Systems tab"
363 msgstr "Mostra la scheda \"File system\""
364
365-#: ../src/argv.cpp:35
366+#: ../src/argv.cpp:36
367 msgid "Show the application's version"
368 msgstr "Mostra la versione dell'applicazione"
369
370-#: ../src/disks.cpp:369 ../src/memmaps.cpp:325
371+#: ../src/disks.cpp:361 ../src/memmaps.cpp:329
372 msgid "Device"
373 msgstr "Device"
374
375-#: ../src/disks.cpp:370
376+#: ../src/disks.cpp:362
377 msgid "Directory"
378 msgstr "Directory"
379
380-#: ../src/disks.cpp:371 ../src/gsm_color_button.c:165 ../src/openfiles.cpp:252
381+#: ../src/disks.cpp:363 ../src/gsm_color_button.c:165 ../src/openfiles.cpp:252
382 msgid "Type"
383 msgstr "Tipo"
384
385-#: ../src/disks.cpp:372
386+#: ../src/disks.cpp:364
387 msgid "Total"
388 msgstr "Totale"
389
390 # spazio su disco, quindi maschile
391-#: ../src/disks.cpp:373
392+#: ../src/disks.cpp:365
393 msgid "Free"
394 msgstr "Libero"
395
396 # spazio su disco, quindi maschile
397-#: ../src/disks.cpp:374
398+#: ../src/disks.cpp:366
399 msgid "Available"
400 msgstr "Disponibile"
401
402 # spazio su disco, quindi maschile
403-#: ../src/disks.cpp:375
404+#: ../src/disks.cpp:367
405 msgid "Used"
406 msgstr "Usato"
407
408@@ -409,19 +403,19 @@
409
410 #: ../src/e_date.c:163
411 msgid "Today %l:%M %p"
412-msgstr "Oggi %k.%M"
413+msgstr "Oggi %H:%M"
414
415 #: ../src/e_date.c:172
416 msgid "Yesterday %l:%M %p"
417-msgstr "Ieri %k.%M"
418+msgstr "Ieri %H:%M"
419
420 #: ../src/e_date.c:184
421 msgid "%a %l:%M %p"
422-msgstr "%a %k.%M"
423+msgstr "%a %H:%M"
424
425 #: ../src/e_date.c:192
426 msgid "%b %d %l:%M %p"
427-msgstr "%d %b %k.%M"
428+msgstr "%d %b %H:%M"
429
430 #: ../src/e_date.c:194
431 msgid "%b %d %Y"
432@@ -509,98 +503,98 @@
433 msgid "%s (%.1f%%) of %s"
434 msgstr "%s (%.1f%%) di %s"
435
436-#: ../src/lsof.cpp:109
437+#: ../src/lsof.cpp:115
438 msgid "Error"
439 msgstr "Errore"
440
441-#: ../src/lsof.cpp:110
442+#: ../src/lsof.cpp:116
443 #, c-format
444 msgid "'%s' is not a valid Perl regular expression."
445 msgstr "«%s» non è un'espressione regolare valida in Perl."
446
447-#: ../src/lsof.cpp:128
448+#: ../src/lsof.cpp:134
449 #, c-format
450 msgid "%d open file"
451 msgid_plural "%d open files"
452 msgstr[0] "%d file aperto"
453 msgstr[1] "%d file aperti"
454
455-#: ../src/lsof.cpp:130
456+#: ../src/lsof.cpp:136
457 #, c-format
458 msgid "%d matching open file"
459 msgid_plural "%d matching open files"
460 msgstr[0] "%d file corrispondente aperto"
461 msgstr[1] "%d file corrispondenti aperti"
462
463-#: ../src/lsof.cpp:246
464+#: ../src/lsof.cpp:252
465 msgid "Process"
466 msgstr "Processi"
467
468-#: ../src/lsof.cpp:258
469+#: ../src/lsof.cpp:264
470 msgid "PID"
471 msgstr "PID"
472
473-#: ../src/lsof.cpp:268 ../src/memmaps.cpp:303
474+#: ../src/lsof.cpp:274 ../src/memmaps.cpp:307
475 msgid "Filename"
476 msgstr "Nome file"
477
478 #. xgettext: virtual memory start
479-#: ../src/memmaps.cpp:305
480+#: ../src/memmaps.cpp:309
481 msgid "VM Start"
482 msgstr "Inizio VM"
483
484 #. xgettext: virtual memory end
485-#: ../src/memmaps.cpp:307
486+#: ../src/memmaps.cpp:311
487 msgid "VM End"
488 msgstr "Fine VM"
489
490 #. xgettext: virtual memory syze
491-#: ../src/memmaps.cpp:309
492+#: ../src/memmaps.cpp:313
493 msgid "VM Size"
494 msgstr "Dimensione VM"
495
496-#: ../src/memmaps.cpp:310
497+#: ../src/memmaps.cpp:314
498 msgid "Flags"
499 msgstr "Flag"
500
501 #. xgettext: virtual memory offset
502-#: ../src/memmaps.cpp:312
503+#: ../src/memmaps.cpp:316
504 msgid "VM Offset"
505 msgstr "Offset VM"
506
507 #. xgettext: memory that has not been modified since
508 #. it has been allocated
509-#: ../src/memmaps.cpp:315
510+#: ../src/memmaps.cpp:319
511 msgid "Private clean"
512 msgstr "Privata clean"
513
514 #. xgettext: memory that has been modified since it
515 #. has been allocated
516-#: ../src/memmaps.cpp:318
517+#: ../src/memmaps.cpp:322
518 msgid "Private dirty"
519 msgstr "Privata dirty"
520
521 #. xgettext: shared memory that has not been modified
522 #. since it has been allocated
523-#: ../src/memmaps.cpp:321
524+#: ../src/memmaps.cpp:325
525 msgid "Shared clean"
526 msgstr "Condivisa clean"
527
528 #. xgettext: shared memory that has been modified
529 #. since it has been allocated
530-#: ../src/memmaps.cpp:324
531+#: ../src/memmaps.cpp:328
532 msgid "Shared dirty"
533 msgstr "Condivisa dirty"
534
535-#: ../src/memmaps.cpp:326
536+#: ../src/memmaps.cpp:330
537 msgid "Inode"
538 msgstr "Inode"
539
540-#: ../src/memmaps.cpp:436
541+#: ../src/memmaps.cpp:440
542 msgid "Memory Maps"
543 msgstr "Mappe della memoria"
544
545-#: ../src/memmaps.cpp:448
546+#: ../src/memmaps.cpp:452
547 #, c-format
548 msgid "_Memory maps for process \"%s\" (PID %u):"
549 msgstr "_Mappe di memoria per il processo «%s» (PID %u):"
550@@ -648,8 +642,8 @@
551 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:1
552 msgid "Main window size and position in the form (width, height, xpos, ypos)"
553 msgstr ""
554-"Dimensione e posizione della finestra principale nella forma (larghezza, "
555-"altezza, posx, posy)"
556+"Dimensione e posizione della finestra principale nella forma (larghezza, altezza, "
557+"posx, posy)"
558
559 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:2
560 msgid "Main Window should open maximized"
561@@ -665,13 +659,12 @@
562
563 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:5
564 msgid ""
565-"If TRUE, system-monitor operates in 'Solaris mode' where a task's CPU usage "
566-"is divided by the total number of CPUs. Otherwise, it operates in 'Irix "
567-"mode'."
568+"If TRUE, system-monitor operates in 'Solaris mode' where a task's CPU usage is divided "
569+"by the total number of CPUs. Otherwise, it operates in 'Irix mode'."
570 msgstr ""
571 "Se impostata a VERO, Monitor di sistema opera in \"modalità Solaris\" in cui "
572-"l'utilizzo di CPU di un task è diviso per il numero totale di CPU. In caso "
573-"contrario opera in \"modalità Irix\"."
574+"l'utilizzo di CPU di un task è diviso per il numero totale di CPU. In caso contrario "
575+"opera in \"modalità Irix\"."
576
577 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:6
578 msgid "Show CPU chart as stacked area chart"
579@@ -679,11 +672,11 @@
580
581 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:7
582 msgid ""
583-"If TRUE, system-monitor shows the CPU chart as a stacked area chart instead "
584-"of a line chart."
585+"If TRUE, system-monitor shows the CPU chart as a stacked area chart instead of a line "
586+"chart."
587 msgstr ""
588-"Se VERO il grafico della CPU viene mostrato come un grafico ad area al posto "
589-"di quello lineare."
590+"Se VERO il grafico della CPU viene mostrato come un grafico ad area al posto di quello "
591+"lineare."
592
593 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:8
594 msgid "Enable/Disable smooth refresh"
595@@ -703,18 +696,16 @@
596
597 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:12
598 msgid "Whether information about all file systems should be displayed"
599-msgstr ""
600-"Indica se devono essere visualizzate le informazioni su tutti i file system"
601+msgstr "Indica se devono essere visualizzate le informazioni su tutti i file system"
602
603 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:13
604 msgid ""
605-"Whether to display information about all file systems (including types like "
606-"'autofs' and 'procfs'). Useful for getting a list of all currently mounted "
607-"file systems."
608+"Whether to display information about all file systems (including types like 'autofs' "
609+"and 'procfs'). Useful for getting a list of all currently mounted file systems."
610 msgstr ""
611-"Indica se devono essere mostrate informazioni su tutti i file system "
612-"(inclusi quei tipi come autofs e procfs). Utile per avere un elenco di tutti "
613-"i file system montati al momento."
614+"Indica se devono essere mostrate informazioni su tutti i file system (inclusi quei "
615+"tipi come autofs e procfs). Utile per avere un elenco di tutti i file system montati "
616+"al momento."
617
618 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:14
619 msgid "Time in milliseconds between updates of the devices list"
620@@ -1093,12 +1084,12 @@
621 #. xgettext: secondary alert message
622 #: ../src/procdialogs.cpp:98 ../src/procdialogs.cpp:104
623 msgid ""
624-"Killing a process may destroy data, break the session or introduce a "
625-"security risk. Only unresponsive processes should be killed."
626+"Killing a process may destroy data, break the session or introduce a security risk. "
627+"Only unresponsive processes should be killed."
628 msgstr ""
629-"Uccidendo un processo si potrebbero perdere dei dati, interrompere la "
630-"sessione di lavoro o introdurre un rischio di sicurezza. Solo i processi "
631-"fuori controllo dovrebbero essere uccisi."
632+"Uccidendo un processo si potrebbero perdere dei dati, interrompere la sessione di "
633+"lavoro o introdurre un rischio di sicurezza. Solo i processi fuori controllo "
634+"dovrebbero essere uccisi."
635
636 #: ../src/procdialogs.cpp:101
637 msgid "_Kill Process"
638@@ -1136,11 +1127,11 @@
639 # dimenticati che anche i : vanno localizzati... mah --Luca
640 #: ../src/procdialogs.cpp:211
641 msgid ""
642-"The priority of a process is given by its nice value. A lower nice value "
643-"corresponds to a higher priority."
644+"The priority of a process is given by its nice value. A lower nice value corresponds "
645+"to a higher priority."
646 msgstr ""
647-"la priorità di un processo è data dal suo valore di nice. Un valore più "
648-"basso corrisponde a una priorità più alta."
649+"la priorità di un processo è data dal suo valore di nice. Un valore più basso "
650+"corrisponde a una priorità più alta."
651
652 #: ../src/procproperties.cpp:55 ../src/procproperties.cpp:106
653 #: ../src/procproperties.cpp:109 ../src/util.cpp:432
654
655=== modified file 'src/Makefile.am'
656--- src/Makefile.am 2015-02-11 17:15:36 +0000
657+++ src/Makefile.am 2015-03-02 20:22:51 +0000
658@@ -26,6 +26,7 @@
659 smooth_refresh.cpp \
660 disks.cpp \
661 selinux.cpp \
662+ systemd.cpp \
663 cgroups.cpp \
664 gsm_gnomesu.cpp \
665 gsm_gksu.cpp \
666
667=== modified file 'src/Makefile.in'
668--- src/Makefile.in 2015-02-11 17:15:36 +0000
669+++ src/Makefile.in 2015-03-02 20:22:51 +0000
670@@ -105,9 +105,9 @@
671 util.$(OBJEXT) procactions.$(OBJEXT) procdialogs.$(OBJEXT) \
672 memmaps.$(OBJEXT) openfiles.$(OBJEXT) procproperties.$(OBJEXT) \
673 smooth_refresh.$(OBJEXT) disks.$(OBJEXT) selinux.$(OBJEXT) \
674- cgroups.$(OBJEXT) gsm_gnomesu.$(OBJEXT) gsm_gksu.$(OBJEXT) \
675- gsm_pkexec.$(OBJEXT) lsof.$(OBJEXT) prefsdialog.$(OBJEXT) \
676- application.$(OBJEXT)
677+ systemd.$(OBJEXT) cgroups.$(OBJEXT) gsm_gnomesu.$(OBJEXT) \
678+ gsm_gksu.$(OBJEXT) gsm_pkexec.$(OBJEXT) lsof.$(OBJEXT) \
679+ prefsdialog.$(OBJEXT) application.$(OBJEXT)
680 am__objects_5 = e_date.$(OBJEXT) gsm_color_button.$(OBJEXT) \
681 treeview.$(OBJEXT)
682 am_gnome_system_monitor_OBJECTS = $(am__objects_1) $(am__objects_3) \
683@@ -387,6 +387,7 @@
684 smooth_refresh.cpp \
685 disks.cpp \
686 selinux.cpp \
687+ systemd.cpp \
688 cgroups.cpp \
689 gsm_gnomesu.cpp \
690 gsm_gksu.cpp \
691@@ -556,6 +557,7 @@
692 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proctable.Po@am__quote@
693 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/selinux.Po@am__quote@
694 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smooth_refresh.Po@am__quote@
695+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/systemd.Po@am__quote@
696 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treeview.Po@am__quote@
697 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
698
699
700=== modified file 'src/application.h'
701--- src/application.h 2015-02-11 17:15:36 +0000
702+++ src/application.h 2015-03-02 20:22:51 +0000
703@@ -7,7 +7,7 @@
704
705 #include <algorithm>
706
707-struct ProcInfo;
708+class ProcInfo;
709 struct LoadGraph;
710
711 #include "smooth_refresh.h"
712
713=== modified file 'src/prefsdialog.cpp'
714--- src/prefsdialog.cpp 2014-08-28 23:19:57 +0000
715+++ src/prefsdialog.cpp 2015-03-02 20:22:51 +0000
716@@ -11,6 +11,7 @@
717 #include "proctable.h"
718 #include "selinux.h"
719 #include "settings-keys.h"
720+#include "systemd.h"
721 #include "util.h"
722
723 static GtkWidget *prefs_dialog = NULL;
724@@ -179,10 +180,8 @@
725 column_id == COL_SESSION ||
726 column_id == COL_SEAT ||
727 column_id == COL_OWNER)
728-#ifdef HAVE_SYSTEMD
729- && !LOGIND_RUNNING()
730-#endif
731- )
732+ && !procman::systemd_logind_running()
733+ )
734 continue;
735
736 visible = gtk_tree_view_column_get_visible (column);
737
738=== modified file 'src/procproperties.cpp'
739--- src/procproperties.cpp 2015-02-02 17:03:04 +0000
740+++ src/procproperties.cpp 2015-03-02 20:22:51 +0000
741@@ -24,12 +24,6 @@
742 #include <glibtop/procmem.h>
743 #include <glibtop/procmap.h>
744 #include <glibtop/procstate.h>
745-#if defined (__linux__)
746-#include <asm/param.h>
747-#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
748-#include <sys/param.h>
749-#include <sys/sysctl.h>
750-#endif
751
752 #include "application.h"
753 #include "procproperties.h"
754@@ -68,23 +62,6 @@
755
756 get_process_memory_writable (info);
757
758-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
759- struct clockinfo cinf;
760- size_t size = sizeof (cinf);
761- int HZ;
762- int mib[] = { CTL_KERN, KERN_CLOCKRATE };
763-
764- if (sysctl (mib, G_N_ELEMENTS (mib), &cinf, &size, NULL, 0) == -1)
765- HZ = 100;
766- else
767- HZ = (cinf.stathz ? cinf.stathz : cinf.hz);
768-#endif
769-#ifdef __GNU__
770- int HZ;
771- HZ = sysconf(_SC_CLK_TCK);
772- if (HZ < 0)
773- HZ = 100;
774-#endif
775 proc_arg proc_props[] = {
776 { N_("Process Name"), g_strdup_printf("%s", info->name)},
777 { N_("User"), g_strdup_printf("%s (%d)", info->user.c_str(), info->uid)},
778@@ -98,7 +75,7 @@
779 { N_("X Server Memory"), format_memsize(info->memxserver)},
780 #endif
781 { N_("CPU"), g_strdup_printf("%d%%", info->pcpu)},
782- { N_("CPU Time"), g_strdup_printf(ngettext("%lld second", "%lld seconds", info->cpu_time/HZ), (unsigned long long)info->cpu_time/HZ) },
783+ { N_("CPU Time"), procman::format_duration_for_display(100 * info->cpu_time / GsmApplication::get()->frequency) },
784 { N_("Started"), g_strdup_printf("%s", ctime((const time_t*)(&info->start_time)))},
785 { N_("Nice"), g_strdup_printf("%d", info->nice)},
786 { N_("Priority"), g_strdup_printf("%s", procman::get_nice_level(info->nice)) },
787
788=== modified file 'src/proctable.cpp'
789--- src/proctable.cpp 2015-02-11 17:15:36 +0000
790+++ src/proctable.cpp 2015-03-02 20:22:51 +0000
791@@ -43,10 +43,6 @@
792 #include <set>
793 #include <list>
794
795-#ifdef HAVE_SYSTEMD
796-#include <systemd/sd-login.h>
797-#endif
798-
799 #ifdef HAVE_WNCK
800 #define WNCK_I_KNOW_THIS_IS_UNSTABLE
801 #include <libwnck/libwnck.h>
802@@ -61,6 +57,7 @@
803 #include "settings-keys.h"
804 #include "cgroups.h"
805 #include "treeview.h"
806+#include "systemd.h"
807
808 ProcInfo::UserMap ProcInfo::users;
809 ProcInfo::List ProcInfo::all;
810@@ -554,9 +551,7 @@
811 if (!cgroups_enabled ())
812 gsm_tree_view_add_excluded_column (GSM_TREE_VIEW (proctree), COL_CGROUP);
813
814-#ifdef HAVE_SYSTEMD
815- if (!LOGIND_RUNNING ())
816-#endif
817+ if (!procman::systemd_logind_running())
818 {
819 gsm_tree_view_add_excluded_column (GSM_TREE_VIEW (proctree), COL_UNIT);
820 gsm_tree_view_add_excluded_column (GSM_TREE_VIEW (proctree), COL_SESSION);
821@@ -686,16 +681,20 @@
822
823 maps = glibtop_get_proc_map(&buf, info->pid);
824
825+ const bool use_private_dirty = buf.flags & (1 << GLIBTOP_MAP_ENTRY_PRIVATE_DIRTY);
826+
827 gulong memwritable = 0;
828 const unsigned number = buf.number;
829
830 for (unsigned i = 0; i < number; ++i) {
831-#ifdef __linux__
832- memwritable += maps[i].private_dirty;
833-#else
834- if (maps[i].perm & GLIBTOP_MAP_PERM_WRITE)
835+ if (use_private_dirty) {
836+ // clang++ 3.4 is not smart enough to move this invariant out of the loop
837+ // but who cares ?
838+ memwritable += maps[i].private_dirty;
839+ }
840+ else if (maps[i].perm & GLIBTOP_MAP_PERM_WRITE) {
841 memwritable += maps[i].size;
842-#endif
843+ }
844 }
845
846 info->memwritable = memwritable;
847@@ -853,35 +852,6 @@
848 procman::poison(current->node, 0x69);
849 }
850
851-static void
852-get_process_systemd_info(ProcInfo *info)
853-{
854-#ifdef HAVE_SYSTEMD
855- uid_t uid;
856-
857- if (!LOGIND_RUNNING())
858- return;
859-
860- free(info->unit);
861- info->unit = NULL;
862- sd_pid_get_unit(info->pid, &info->unit);
863-
864- free(info->session);
865- info->session = NULL;
866- sd_pid_get_session(info->pid, &info->session);
867-
868- free(info->seat);
869- info->seat = NULL;
870-
871- if (info->session != NULL)
872- sd_session_get_seat(info->session, &info->seat);
873-
874- if (sd_pid_get_owner_uid(info->pid, &uid) >= 0)
875- info->owner = info->lookup_user(uid);
876- else
877- info->owner = "";
878-#endif
879-}
880
881 static void
882 update_info (GsmApplication *app, ProcInfo *info)
883@@ -930,7 +900,7 @@
884 /* get cgroup data */
885 get_process_cgroup_info(info);
886
887- get_process_systemd_info(info);
888+ procman::get_process_systemd_info(info);
889 }
890
891 ProcInfo::ProcInfo(pid_t pid)
892
893=== added file 'src/systemd.cpp'
894--- src/systemd.cpp 1970-01-01 00:00:00 +0000
895+++ src/systemd.cpp 2015-03-02 20:22:51 +0000
896@@ -0,0 +1,62 @@
897+#include <config.h>
898+#include <stdlib.h>
899+
900+#ifdef HAVE_SYSTEMD
901+#include <systemd/sd-login.h>
902+#endif
903+
904+#include "application.h"
905+#include "systemd.h"
906+
907+
908+bool
909+procman::systemd_logind_running()
910+{
911+#ifdef HAVE_SYSTEMD
912+ static bool init;
913+ static bool is_running;
914+
915+ if (!init) {
916+ /* check if logind is running */
917+ if (access("/run/systemd/seats/", F_OK) >= 0) {
918+ is_running = true;
919+ }
920+ init = true;
921+ }
922+
923+ return is_running;
924+
925+#else
926+ return false;
927+#endif
928+}
929+
930+void
931+procman::get_process_systemd_info(ProcInfo *info)
932+{
933+#ifdef HAVE_SYSTEMD
934+ uid_t uid;
935+
936+ if (!systemd_logind_running())
937+ return;
938+
939+ free(info->unit);
940+ info->unit = NULL;
941+ sd_pid_get_unit(info->pid, &info->unit);
942+
943+ free(info->session);
944+ info->session = NULL;
945+ sd_pid_get_session(info->pid, &info->session);
946+
947+ free(info->seat);
948+ info->seat = NULL;
949+
950+ if (info->session != NULL)
951+ sd_session_get_seat(info->session, &info->seat);
952+
953+ if (sd_pid_get_owner_uid(info->pid, &uid) >= 0)
954+ info->owner = info->lookup_user(uid);
955+ else
956+ info->owner = "";
957+#endif
958+}
959
960=== added file 'src/systemd.h'
961--- src/systemd.h 1970-01-01 00:00:00 +0000
962+++ src/systemd.h 2015-03-02 20:22:51 +0000
963@@ -0,0 +1,12 @@
964+#ifndef PROCMAN_SYSTEMD_H_144CA8D6_BF03_11E4_B291_000C298F6617
965+#define PROCMAN_SYSTEMD_H_144CA8D6_BF03_11E4_B291_000C298F6617
966+
967+#include "application.h"
968+
969+namespace procman
970+{
971+ bool systemd_logind_running();
972+ void get_process_systemd_info(ProcInfo *info);
973+}
974+
975+#endif
976
977=== modified file 'src/util.cpp'
978--- src/util.cpp 2015-02-02 17:03:04 +0000
979+++ src/util.cpp 2015-03-02 20:22:51 +0000
980@@ -82,8 +82,8 @@
981 * @param d: duration in centiseconds
982 * @type d: unsigned
983 */
984-static char *
985-format_duration_for_display(unsigned centiseconds)
986+char *
987+procman::format_duration_for_display(unsigned centiseconds)
988 {
989 unsigned weeks = 0, days = 0, hours = 0, minutes = 0, seconds = 0;
990
991
992=== modified file 'src/util.h'
993--- src/util.h 2015-02-11 17:15:36 +0000
994+++ src/util.h 2015-03-02 20:22:51 +0000
995@@ -8,9 +8,6 @@
996
997 using std::string;
998
999-/* check if logind is running */
1000-#define LOGIND_RUNNING() (access("/run/systemd/seats/", F_OK) >= 0)
1001-
1002 GtkWidget*
1003 procman_make_label_for_mmaps_or_ofiles(const char *format,
1004 const char *process_name,
1005@@ -45,6 +42,8 @@
1006
1007 namespace procman
1008 {
1009+ char* format_duration_for_display(unsigned centiseconds);
1010+
1011 void size_cell_data_func(GtkTreeViewColumn *col, GtkCellRenderer *renderer,
1012 GtkTreeModel *model, GtkTreeIter *iter,
1013 gpointer user_data);

Subscribers

People subscribed via source and target branches

to all changes: