head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.24 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.22 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.20 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.18 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.16 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.14 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.12 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.10 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.8 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.6 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.4 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.2 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.2.0.10 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.8 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.6 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.4 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.2 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.1.0.4 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.2 pkgsrc-2005Q4-base:1.1; locks; strict; comment @# @; 1.3 date 2007.09.20.21.12.27; author wiz; state dead; branches; next 1.2; 1.2 date 2006.03.30.21.09.48; author jmmv; state Exp; branches; next 1.1; 1.1 date 2005.10.12.21.49.39; author jmmv; state Exp; branches; next ; desc @@ 1.3 log @Rename libgtop2 to libgtop, to match upstream name. @ text @$NetBSD: patch-bc,v 1.2 2006/03/30 21:09:48 jmmv Exp $ From FreeBSD's GNOME development repository. --- src/daemon/io.c.orig 2005-12-12 11:09:38.000000000 +0100 +++ src/daemon/io.c @@@@ -22,6 +22,7 @@@@ */ #include +#include #include "daemon.h" #include @@@@ -37,9 +38,13 @@@@ do_output (int s, glibtop_response *resp resp->offset = offset; resp->data_size = data_size; +retry1: if (s == 0) { - if (write (1, (const void *) resp, sizeof (glibtop_response)) < 0) + if (write (1, (const void *) resp, sizeof (glibtop_response)) < 0) { + if (errno == EINTR) + goto retry1; glibtop_warn_io ("write"); + } } else { if (send (s, (const void *) resp, sizeof (glibtop_response), 0) < 0) glibtop_warn_io ("send"); @@@@ -50,9 +55,13 @@@@ do_output (int s, glibtop_response *resp fprintf (stderr, "Writing %d bytes of data.\n", resp->data_size); #endif +retry2: if (s == 0) { - if (write (1, data, resp->data_size) < 0) + if (write (1, data, resp->data_size) < 0) { + if (errno == EINTR) + goto retry2; glibtop_warn_io ("write"); + } } else { if (send (s, data, resp->data_size, 0) , 0) glibtop_warn_io ("send"); @@@@ -68,6 +77,7 @@@@ do_read (int s, void *ptr, size_t total_ size_t already_read = 0, remaining = total_size; while (already_read < total_size) { +retry: if (s) nread = recv (s, ptr, remaining, 0); else @@@@ -79,6 +89,8 @@@@ do_read (int s, void *ptr, size_t total_ } if (nread <= 0) { + if (errno == EINTR) + goto retry; glibtop_warn_io ("recv"); return 0; } @ 1.2 log @Update to 2.14.0: Mars 13, 2006: Overview of changes in 2.14.0 ============================================ * Updated translations. February 27, 2006: Overview of changes in 2.13.92 ================================================= * Fixed proc_state documentation. * Updated mountlist ignore list. January 23, 2006: Overview of changes in 2.13.3 =============================================== * linux: - fixe get_procmap for linux < 2.6.14. January 2, 2006: Overview of changes in 2.13.2 ============================================== * Fixed libtool versioning (James Henstridge) December 15, 2005: Overview of changes in 2.13.1 ================================================ * linux: - fixed proclist - implemented server->real_ncpu December 13, 2005: Overview of changes in 2.13.0 ================================================ * Requires automake-1.9 (James Henstridge) * Supports up to 32 CPU * Supports Linux smaps * linux: fixed SMP detection This release is not ABI compatible with previous releases. Sorry. @ text @d1 1 a1 1 $NetBSD: patch-bc,v 1.1 2005/10/12 21:49:39 jmmv Exp $ @ 1.1 log @Update to 2.12.0. Thanks go to the FreeBSD GNOME developers for all the patches I borrowed from them (patch-b*). September 4, 2005: Overview of changes from 2.11.92 to 2.12.0 ============================================================= * Updated translations. August 22, 2005: Overview of changes from 2.11.91 to 2.11.92 ============================================================ * Linux: - fixed for 2.6 without /sys - glibtop_get_cpu() : Do not add irq, softirq and iowait to idle. August 9, 2005: Overview of changes from 2.11.90 to 2.11.91 =========================================================== * All: - cleaned some headers. - removed static examples. * Linux: - fixed some issues with 2.6 without /sys July 24, 2005: Overview of changes from 2.11.2 to 2.11.90 ========================================================= * Linux: - fixed glibtop_uptime .flags. July &3, 2005: Overview of changes from 2.11.1 to 2.11.2 ======================================================== * Linux: - little improvements for 2.6. July 3, 2005: Overview of changes from 2.11.0 to 2.11.1 ======================================================= * Linux: - glibtop_get_swap : added page(in|out) for linux 2.6. June 8, 2005: Overview of changes from 2.10.x to 2.11.0 ======================================================= * Replaced a lot of macros by functions * Got rid of dozens of useless files. * libgtop 2.11.x are and will stay API and ABI compatible with 2.10.x, i swear. @ text @d1 1 a1 1 $NetBSD$ d5 3 a7 4 --- src/daemon/io.c.orig Mon Apr 11 03:30:12 2005 +++ src/daemon/io.c Mon Apr 11 03:33:22 2005 @@@@ -21,6 +21,7 @@@@ Boston, MA 02111-1307, USA. d10 1 d15 1 a15 1 @@@@ -36,9 +37,13 @@@@ d30 1 a30 1 @@@@ -49,9 +54,13 @@@@ d45 1 a45 1 @@@@ -67,6 +76,7 @@@@ d53 1 a53 1 @@@@ -78,6 +88,8 @@@@ @