From owner-freebsd-gnome@FreeBSD.ORG Wed Mar 31 00:14:01 2004 Return-Path: Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA53516A4CE; Wed, 31 Mar 2004 00:14:01 -0800 (PST) Received: from sv02.webonaut.com (kirk.webonaut.com [212.41.243.26]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E2F943D45; Wed, 31 Mar 2004 00:14:00 -0800 (PST) (envelope-from klammer@webonaut.com) Received: from localhost (localhost [127.0.0.1]) by sv02.webonaut.com (Postfix) with ESMTP id 169DD76426; Wed, 31 Mar 2004 10:13:55 +0200 (CEST) Received: from sv02.webonaut.com ([127.0.0.1]) by localhost (sv02.webonaut.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 67619-06; Wed, 31 Mar 2004 10:13:50 +0200 (CEST) Received: from webonaut.com (sisko.webonaut.com [212.41.243.28]) by sv02.webonaut.com (Postfix) with ESMTP id 8B8C776425; Wed, 31 Mar 2004 10:13:50 +0200 (CEST) Message-ID: <406A7DEA.9000002@webonaut.com> Date: Wed, 31 Mar 2004 10:14:34 +0200 From: Franz Klammer User-Agent: Mozilla Thunderbird 0.5 (X11/20040318) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Joe Marcus Clarke References: <4069F0A2.7040706@webonaut.com> <1080686927.792.69.camel@gyros> In-Reply-To: <1080686927.792.69.camel@gyros> Content-Type: multipart/mixed; boundary="------------080108030609050204070500" X-Virus-Scanned: by amavisd-new at webonaut.com cc: FreeBSD GNOME Users cc: Pav Lucistnik Subject: Re: gdesklets - calculation of disksize X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Mar 2004 08:14:01 -0000 This is a multi-part message in MIME format. --------------080108030609050204070500 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Joe Marcus Clarke wrote: >On Tue, 2004-03-30 at 17:11, Franz Klammer wrote: > >>question to the knowing people: >> >>gdesklets didn't calculate the correct disk size returned from glibtop. >>i had to change the following lines (excerpt from a diff): >> >>- free = float(bfree * 512) >>- total = float(blocks * 512) >>+ free = float(bfree * 2048) >>+ total = float(blocks * 2048) >> >>my questions: >>- is this only necessary on -CURRENT? >>- if yes: from which version upwards i should check? >> > >On -CURRENT, we have statvfs, but there are parts of the GNOME code that >don't use it right. This is why you were seeing weird values in >nautilus previously. Places where statvfs is used need to be modified >to use the f_frsize member for block size, and f_bavail for available >blocks. > >In this case, you also need to make sure that the value given to you >from libgtop2 is using f_blocks and f_bfree. Then, multiply those >values by whatever you get for f_frsize. > > ok! i hope i this is it ... attached patch gdesklets_current.diff for testting. the only thing which i'm not sure now is the free-disk value. seems that this values includes also the amount fbsd reserves for failover, e..g.: df -h returns: 30G 19G 8.9G 68% /usr sysinfo desklets are showing this values: 29.79 18.51 11.28 only the free/avail values is not really correct. @pav - guess you are using -CURRENT can you please test it? franz. ps: patch is also fetchable from http://webonaut.com/temp/gdesklets_current.diff. >Joe > > >>franz >> --------------080108030609050204070500 Content-Type: text/plain; name="gdesklets_current.diff" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="gdesklets_current.diff" ZGlmZiAtTnVyIGdkZXNrbGV0cy5vcmlnL01ha2VmaWxlIGdkZXNrbGV0cy9NYWtlZmlsZQot LS0gZ2Rlc2tsZXRzLm9yaWcvTWFrZWZpbGUJV2VkIE1hciAyNCAxMDo0MzowNCAyMDA0Cisr KyBnZGVza2xldHMvTWFrZWZpbGUJV2VkIE1hciAzMSAwOTo1NjoyMiAyMDA0CkBAIC0zMiw2 ICszMiw5IEBACiAKIE1BTjE9CWdkZXNrbGV0cy4xCiAKK3Bvc3QtcGF0Y2g6CisJQCR7VE9V Q0h9ICR7V1JLU1JDfS9saWJkZXNrbGV0cy9nbGlidG9wKgorCiBwb3N0LWluc3RhbGw6CiAJ QCR7TUtESVJ9ICR7UFJFRklYfS9zaGFyZS9nbm9tZS9nZGVza2xldHMvRGlzcGxheXMKIAlA JHtQWVRIT05fQ01EfSAke1BZVEhPTl9MSUJESVJ9L2NvbXBpbGVhbGwucHkgJHtQUkVGSVh9 L3NoYXJlL2dub21lL2dkZXNrbGV0cy9jb25maWcKZGlmZiAtTnVyIGdkZXNrbGV0cy5vcmln L2ZpbGVzL3BhdGNoLWxpYmRlc2tsZXRzOjpEaXNrLnB5IGdkZXNrbGV0cy9maWxlcy9wYXRj aC1saWJkZXNrbGV0czo6RGlzay5weQotLS0gZ2Rlc2tsZXRzLm9yaWcvZmlsZXMvcGF0Y2gt bGliZGVza2xldHM6OkRpc2sucHkJV2VkIEZlYiAyNSAxNDoxMzozMiAyMDA0CisrKyBnZGVz a2xldHMvZmlsZXMvcGF0Y2gtbGliZGVza2xldHM6OkRpc2sucHkJV2VkIE1hciAzMSAxMDow MDowMiAyMDA0CkBAIC0xLDUgKzEsNSBAQAotLS0tIGxpYmRlc2tsZXRzL0Rpc2sucHkub3Jp ZwlNb24gRmViIDIzIDEwOjUyOjUwIDIwMDQKLSsrKyBsaWJkZXNrbGV0cy9EaXNrLnB5CU1v biBGZWIgMjMgMTA6NTQ6MzEgMjAwNAorLS0tIGxpYmRlc2tsZXRzL0Rpc2sucHkub3JpZwlG cmkgRmViIDIwIDE0OjI5OjA3IDIwMDQKKysrKyBsaWJkZXNrbGV0cy9EaXNrLnB5CVdlZCBN YXIgMzEgMDk6MzQ6NTQgMjAwNAogQEAgLTEsNiArMSw2IEBACiAgaW1wb3J0IGdsaWJ0b3AK ICBpbXBvcnQgcG9sbGluZwpAQCAtMzUsMyArMzUsMTcgQEAKICAKICAgICAgICAgIHJldHVy biBwYXJ0aXRpb25zCiAgICAgICAgICAgICAgCitAQCAtNDQsOSArNDksMTAgQEAKKyAgICAg IworICAgICBkZWYgX19wb2xsX3NpemUoc2VsZiwgcGFydGl0aW9uKToKKyAKKy0gICAgICAg IGJsb2NrcywgYmZyZWUsIGJhdmFpbCwgZmlsZXMsIGZmcmVlID0gZ2xpYnRvcC5nZXRfZnN1 c2FnZShwYXJ0aXRpb24pCistICAgICAgICBmcmVlID0gZmxvYXQoYmZyZWUgKiA1MTIpCist ICAgICAgICB0b3RhbCA9IGZsb2F0KGJsb2NrcyAqIDUxMikKKysgICAgICAgIGJsb2Nrcywg YmZyZWUsIGJhdmFpbCwgZmlsZXMsIGZmcmVlLCBibG9ja19zaXplID0gZ2xpYnRvcC5nZXRf ZnN1c2FnZShwYXJ0aXRpb24pCisrCisrICAgICAgICBmcmVlID0gZmxvYXQoYmZyZWUgKiBi bG9ja19zaXplKQorKyAgICAgICAgdG90YWwgPSBmbG9hdChibG9ja3MgKiBibG9ja19zaXpl KQorICAgICAgICAgdXNlZCA9IHRvdGFsIC0gZnJlZQorIAorICAgICAgICAgcmV0dXJuICh0 b3RhbCwgdXNlZCkjLCBmcmVlKQpkaWZmIC1OdXIgZ2Rlc2tsZXRzLm9yaWcvZmlsZXMvcGF0 Y2gtbGliZGVza2xldHM6OmdsaWJ0b3AuYyBnZGVza2xldHMvZmlsZXMvcGF0Y2gtbGliZGVz a2xldHM6OmdsaWJ0b3AuYwotLS0gZ2Rlc2tsZXRzLm9yaWcvZmlsZXMvcGF0Y2gtbGliZGVz a2xldHM6OmdsaWJ0b3AuYwlUaHUgSmFuICAxIDAxOjAwOjAwIDE5NzAKKysrIGdkZXNrbGV0 cy9maWxlcy9wYXRjaC1saWJkZXNrbGV0czo6Z2xpYnRvcC5jCVdlZCBNYXIgMzEgMDk6NTM6 NDEgMjAwNApAQCAtMCwwICsxLDE5IEBACistLS0gbGliZGVza2xldHMvZ2xpYnRvcC5jLm9y aWcJV2VkIE1hciAzMSAwOTo1MDo0OCAyMDA0CisrKysgbGliZGVza2xldHMvZ2xpYnRvcC5j CVdlZCBNYXIgMzEgMDk6NDc6MjkgMjAwNAorQEAgLTUxOSw3ICs1MTksNyBAQAorIAorIFB5 T2JqZWN0KiBnZXRfZnN1c2FnZShjb25zdCBjaGFyICptb3VudF9kaXIpCisgeworLSAgUHlP YmplY3QgKiBjb25zdCB0ID0gUHlUdXBsZV9OZXcoNSk7CisrICBQeU9iamVjdCAqIGNvbnN0 IHQgPSBQeVR1cGxlX05ldyg2KTsKKyAgICAgICAKKyAgIGdsaWJ0b3BfZnN1c2FnZSBidWY7 ICAKKyAgIGdsaWJ0b3BfZ2V0X2ZzdXNhZ2UoJmJ1ZiwgbW91bnRfZGlyKTsKK0BAIC01Mjks NiArNTI5LDcgQEAKKyAgIFB5VHVwbGVfU2V0SXRlbSh0LCAyLCBQeUxfVUxMKGJ1Zi5iYXZh aWwpKTsKKyAgIFB5VHVwbGVfU2V0SXRlbSh0LCAzLCBQeUxfVUxMKGJ1Zi5maWxlcykpOwor ICAgUHlUdXBsZV9TZXRJdGVtKHQsIDQsIFB5TF9VTEwoYnVmLmZmcmVlKSk7CisrICBQeVR1 cGxlX1NldEl0ZW0odCwgNSwgUHlMX1VMTChidWYuYmxvY2tfc2l6ZSkpOworIAorICAgcmV0 dXJuIHQ7ICAgIAorIH0K --------------080108030609050204070500--