From owner-freebsd-gecko@FreeBSD.ORG Sun Oct 14 16:28:29 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5B5FCA73 for ; Sun, 14 Oct 2012 16:28:29 +0000 (UTC) (envelope-from webmasters@didierpaulassociates.com) Received: from mailgw1.surf-town.net (mail16.surf-town.net [212.97.132.56]) by mx1.freebsd.org (Postfix) with ESMTP id CD28F8FC0C for ; Sun, 14 Oct 2012 16:28:28 +0000 (UTC) Received: by mailgw1.surf-town.net (Postfix, from userid 65534) id 664CF1CDD5A; Sun, 14 Oct 2012 18:28:27 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailgw1.surf-town.net (Postfix) with ESMTP id 578EF1CDD28 for ; Sun, 14 Oct 2012 18:28:27 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mailgw1.surf-town.net X-Spam-Flag: NO X-Spam-Score: 0.231 X-Spam-Level: X-Spam-Status: No, score=0.231 tagged_above=-999 required=7 tests=[ALL_TRUSTED=-1.44, DCC_CHECK=1.37, HTML_MESSAGE=0.001, SARE_WEOFFER=0.3] autolearn=unavailable Received: from mailgw1.surf-town.net ([127.0.0.1]) by localhost (mailgw1.surf-town.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id NNgLK1PqnVIw for ; Sun, 14 Oct 2012 18:28:27 +0200 (CEST) Received: from [172.21.212.133] (unknown [178.86.30.201]) by mailgw1.surf-town.net (Postfix) with ESMTPA id 5C5CF1CD837 for ; Sun, 14 Oct 2012 18:28:22 +0200 (CEST) From: "QATAR - FINANCE" To: "freebsd-gecko" Subject: Loan offer at interest rate of 2 % per annun. Message-ID: <42c91e527ade36458df64dc3c56eb3fe@MAXILASE-PC> Date: Sun, 14 Oct 2012 16:28:52 +0000 MIME-Version: 1.0 X-Priority: 1 X-Mailer: Microsoft Office Outlook 13.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.14 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: qatar@infomaniak.ch List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Oct 2012 16:28:29 -0000 Loan offer at interest rate of 2 % per annun. =0D=0A=0D=0ADo = you need a loan to clear your debts/bills, or start up a business? = Then consider your financial problems over. In today's economic = climate, finding reliable funding sources can be frustrating = and full of disappointments, but with our sophisticated loan = repayment plan, everyone Smiles home.=0D=0AQatar Loan Finance = Foundation provides financing for alternative energy, commercial = real estate projects and personal financing; thus, arranging = a loan with us is simple and straightforward, convenient and = fast. We can give you an immediate 'in principle' decision and = we'll find you some of the most competitive personal loan rates = available.=0D=0AWe Offer guaranteed loan services of any amount = and to any part of the world for (individuals, companies, realtors = and corporate bodies) at our superb interest rate of 2%. Our = team of loan experts first listens to our client's requirements = and then provides them with best loan solutions.=0D=0A=0D=0A=0D=0AWe = Offer LOANS ranging from 100.000 euros Min. to 500 000 000 euros = Max. at 2 % interest rate per annun, Loans for developing your = business expansion. We are certified, trustworthy, reliable, = efficient, Fast and dynamic. and a co-operate financier for = real estate and any kinds of business financing, we give out = long term loan for five to ten years maximum.=0D=0A=0D=0APlease = if you are interested in our financial offer, do not hesitate = to contact us at qatar@infomaniak.ch for more informations =0D=0A =0D= =0AEmir SHEIK HAMAD BIN KHALIFA AL THANI =0D=0AQatar Loan Finance = Foundation From owner-freebsd-gecko@FreeBSD.ORG Mon Oct 15 11:06:16 2012 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 43AC1530 for ; Mon, 15 Oct 2012 11:06:16 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id 120588FC29 for ; Mon, 15 Oct 2012 11:06:16 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q9FB6FCp011734 for ; Mon, 15 Oct 2012 11:06:15 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q9FB6FDG011733 for gecko@FreeBSD.org; Mon, 15 Oct 2012 11:06:15 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 15 Oct 2012 11:06:15 GMT Message-Id: <201210151106.q9FB6FDG011733@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: gnats set sender to owner-bugmaster@FreeBSD.org using -f From: FreeBSD bugmaster To: gecko@FreeBSD.org Subject: Current problem reports assigned to gecko@FreeBSD.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Oct 2012 11:06:16 -0000 Note: to view an individual PR, use: http://www.freebsd.org/cgi/query-pr.cgi?pr=(number). From owner-freebsd-gecko@FreeBSD.ORG Mon Oct 15 19:08:09 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0C686CF6 for ; Mon, 15 Oct 2012 19:08:09 +0000 (UTC) (envelope-from andy@neu.net) Received: from mail.neu.net (unknown [IPv6:2607:fc50:0:d300:216:3eff:fe54:f1c6]) by mx1.freebsd.org (Postfix) with ESMTP id BFF418FC08 for ; Mon, 15 Oct 2012 19:08:08 +0000 (UTC) Received: from neu.net (neu.net [199.48.129.194]) by mail.neu.net (8.14.5/8.14.5) with ESMTP id q9FJ83A3016268 for ; Mon, 15 Oct 2012 15:08:04 -0400 (EDT) (envelope-from andy@neu.net) Date: Mon, 15 Oct 2012 15:08:03 -0400 (EDT) From: AN To: freebsd-gecko@freebsd.org Subject: Video problems in FF-nightly In-Reply-To: <201210071414.q97EEgAL047114@trillian.chruetertee.ch> Message-ID: References: <201210071414.q97EEgAL047114@trillian.chruetertee.ch> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII X-Virus-Scanned: clamav-milter 0.97.6 at my.mail.server X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=4.5 tests=RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.neu.net X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Oct 2012 19:08:09 -0000 Has anyone noticed problems with video in FF-nightly recently? In the last few days I am having a problem watching videos in FF-nightly. The problem is that the audio plays fine, but the video freezes. This happens with both Flash and HTML5 videos. Both had been working previously. I have not changed any of my options for compilation. Is there some change in the source that may have caused this problem? I see the problem on FreeBSD-current with FF-nightly, and also in a VBox VM running opensuse11.4 and FF-nightly. Both were working fine until about 2 days ago. From owner-freebsd-gecko@FreeBSD.ORG Tue Oct 16 01:15:06 2012 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9109031B for ; Tue, 16 Oct 2012 01:15:06 +0000 (UTC) (envelope-from info@cv-inter.net) Received: from mailgw8.surf-town.net (mail3.surf-town.net [212.97.132.43]) by mx1.freebsd.org (Postfix) with ESMTP id 11CCA8FC0C for ; Tue, 16 Oct 2012 01:15:05 +0000 (UTC) Received: by mailgw8.surf-town.net (Postfix, from userid 65534) id ABEC6AFBEE; Tue, 16 Oct 2012 03:15:04 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailgw8.surf-town.net (Postfix) with ESMTP id 9D5BAAFB09 for ; Tue, 16 Oct 2012 03:15:04 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mailgw8.surf-town.net X-Spam-Flag: NO X-Spam-Score: 0.231 X-Spam-Level: X-Spam-Status: No, score=0.231 tagged_above=-999 required=7 tests=[ALL_TRUSTED=-1.44, DCC_CHECK=1.37, HTML_MESSAGE=0.001, SARE_WEOFFER=0.3] autolearn=unavailable Received: from mailgw8.surf-town.net ([127.0.0.1]) by localhost (mailgw8.surf-town.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id haPIwRR9xiA4 for ; Tue, 16 Oct 2012 03:15:04 +0200 (CEST) Received: from [10.119.0.174] (94-23-72-210.ovh.net [94.23.72.210]) by mailgw8.surf-town.net (Postfix) with ESMTPA id 146F2AFAF9 for ; Tue, 16 Oct 2012 03:14:54 +0200 (CEST) From: "QATAR - FINANCE" To: "gecko" Subject: Loan offer at interest rate of 2 % per annun. Message-ID: <37c3a4130b5a3941b834bf8b28d0b5f1@MAXILASE-PC> Date: Tue, 16 Oct 2012 01:15:29 +0000 MIME-Version: 1.0 X-Priority: 1 X-Mailer: Microsoft Office Outlook 13.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.14 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: qatar@infomaniak.ch List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Oct 2012 01:15:06 -0000 Loan offer at interest rate of 2 % per annun. =0D=0A=0D=0ADo = you need a loan to clear your debts/bills, or start up a business? = Then consider your financial problems over. In today's economic = climate, finding reliable funding sources can be frustrating = and full of disappointments, but with our sophisticated loan = repayment plan, everyone Smiles home.=0D=0AQatar Loan Finance = Foundation provides financing for alternative energy, commercial = real estate projects and personal financing; thus, arranging = a loan with us is simple and straightforward, convenient and = fast. We can give you an immediate 'in principle' decision and = we'll find you some of the most competitive personal loan rates = available.=0D=0AWe Offer guaranteed loan services of any amount = and to any part of the world for (individuals, companies, realtors = and corporate bodies) at our superb interest rate of 2%. Our = team of loan experts first listens to our client's requirements = and then provides them with best loan solutions.=0D=0A=0D=0A=0D=0AWe = Offer LOANS ranging from 100.000 euros Min. to 500 000 000 euros = Max. at 2 % interest rate per annun, Loans for developing your = business expansion. We are certified, trustworthy, reliable, = efficient, Fast and dynamic. and a co-operate financier for = real estate and any kinds of business financing, we give out = long term loan for five to ten years maximum.=0D=0A=0D=0APlease = if you are interested in our financial offer, do not hesitate = to contact us at qatar@infomaniak.ch for more informations =0D=0A =0D= =0AEmir SHEIK HAMAD BIN KHALIFA AL THANI =0D=0AQatar Loan Finance = Foundation From owner-freebsd-gecko@FreeBSD.ORG Fri Oct 19 03:19:44 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BDFEC375 for ; Fri, 19 Oct 2012 03:19:44 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 5C08E8FC0A for ; Fri, 19 Oct 2012 03:19:44 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q9J3JbMB033488 for ; Fri, 19 Oct 2012 03:19:37 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q9J3JW8T032403 for freebsd-gecko@freebsd.org; Fri, 19 Oct 2012 03:19:32 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 19 Oct 2012 03:19:32 GMT Message-Id: <201210190319.q9J3JW8T032403@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1073 - in trunk: mail/thunderbird/files www/firefox-nightly/files www/firefox/files www/seamonkey/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Oct 2012 03:19:44 -0000 Author: jbeich Date: Fri Oct 19 03:19:31 2012 New Revision: 1073 Log: count dirty unused pages in heap-committed, too Modified: trunk/mail/thunderbird/files/patch-z-bug762445 trunk/www/firefox-nightly/files/patch-z-bug762445 trunk/www/firefox/files/patch-z-bug762445 trunk/www/seamonkey/files/patch-z-bug762445 Modified: trunk/mail/thunderbird/files/patch-z-bug762445 ============================================================================== --- trunk/mail/thunderbird/files/patch-z-bug762445 Sat Oct 13 00:08:01 2012 (r1072) +++ trunk/mail/thunderbird/files/patch-z-bug762445 Fri Oct 19 03:19:31 2012 (r1073) @@ -11,19 +11,25 @@ index 94ad96e..7adfef5 100644 --- mozilla/memory/build/mozjemalloc_compat.c +++ mozilla/memory/build/mozjemalloc_compat.c -@@ -11,15 +11,37 @@ +@@ -11,15 +11,50 @@ #define wrap(a) je_ ## a #endif -extern MOZ_IMPORT_API(int) ++/* ++ * CTL_* macros are from memory/jemalloc/src/src/stats.c with changes: ++ * - drop `t' argument to avoid redundancy in calculating type size ++ * - require `i' argument for arena number explicitly ++ */ ++ +#define CTL_GET(n, v) do { \ + size_t sz = sizeof(v); \ + wrap(mallctl)(n, &v, &sz, NULL, 0); \ +} while (0) + -+#define CTL_I_GET(n, v) do { \ ++#define CTL_I_GET(n, v, i) do { \ + size_t mib[6]; \ -+ size_t miblen = sizeof(mib) / sizeof(size_t); \ ++ size_t miblen = sizeof(mib) / sizeof(mib[0]); \ + size_t sz = sizeof(v); \ + wrap(mallctlnametomib)(n, mib, &miblen); \ + mib[2] = i; \ @@ -45,13 +51,20 @@ - wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0); - stats->committed = -1; - stats->dirty = -1; -+ unsigned i; -+ size_t page; -+ CTL_GET("arenas.narenas", i); ++ unsigned narenas; ++ size_t active, allocated, mapped, page, pdirty; ++ ++ CTL_GET("arenas.narenas", narenas); + CTL_GET("arenas.page", page); -+ CTL_GET("stats.active", stats->committed); -+ CTL_GET("stats.allocated", stats->allocated); -+ CTL_GET("stats.mapped", stats->mapped); -+ CTL_I_GET("stats.arenas.0.pdirty", stats->dirty); -+ stats->dirty *= page; ++ CTL_GET("stats.active", active); ++ CTL_GET("stats.allocated", allocated); ++ CTL_GET("stats.mapped", mapped); ++ ++ /* get the summation for all arenas, i == narenas */ ++ CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas); ++ ++ stats->allocated = allocated; ++ stats->mapped = mapped; ++ stats->dirty = pdirty * page; ++ stats->committed = active + stats->dirty; } Modified: trunk/www/firefox-nightly/files/patch-z-bug762445 ============================================================================== --- trunk/www/firefox-nightly/files/patch-z-bug762445 Sat Oct 13 00:08:01 2012 (r1072) +++ trunk/www/firefox-nightly/files/patch-z-bug762445 Fri Oct 19 03:19:31 2012 (r1073) @@ -11,19 +11,25 @@ index 94ad96e..7adfef5 100644 --- memory/build/mozjemalloc_compat.c +++ memory/build/mozjemalloc_compat.c -@@ -11,15 +11,37 @@ +@@ -11,15 +11,50 @@ #define wrap(a) je_ ## a #endif -extern MOZ_IMPORT_API(int) ++/* ++ * CTL_* macros are from memory/jemalloc/src/src/stats.c with changes: ++ * - drop `t' argument to avoid redundancy in calculating type size ++ * - require `i' argument for arena number explicitly ++ */ ++ +#define CTL_GET(n, v) do { \ + size_t sz = sizeof(v); \ + wrap(mallctl)(n, &v, &sz, NULL, 0); \ +} while (0) + -+#define CTL_I_GET(n, v) do { \ ++#define CTL_I_GET(n, v, i) do { \ + size_t mib[6]; \ -+ size_t miblen = sizeof(mib) / sizeof(size_t); \ ++ size_t miblen = sizeof(mib) / sizeof(mib[0]); \ + size_t sz = sizeof(v); \ + wrap(mallctlnametomib)(n, mib, &miblen); \ + mib[2] = i; \ @@ -45,13 +51,20 @@ - wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0); - stats->committed = -1; - stats->dirty = -1; -+ unsigned i; -+ size_t page; -+ CTL_GET("arenas.narenas", i); ++ unsigned narenas; ++ size_t active, allocated, mapped, page, pdirty; ++ ++ CTL_GET("arenas.narenas", narenas); + CTL_GET("arenas.page", page); -+ CTL_GET("stats.active", stats->committed); -+ CTL_GET("stats.allocated", stats->allocated); -+ CTL_GET("stats.mapped", stats->mapped); -+ CTL_I_GET("stats.arenas.0.pdirty", stats->dirty); -+ stats->dirty *= page; ++ CTL_GET("stats.active", active); ++ CTL_GET("stats.allocated", allocated); ++ CTL_GET("stats.mapped", mapped); ++ ++ /* get the summation for all arenas, i == narenas */ ++ CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas); ++ ++ stats->allocated = allocated; ++ stats->mapped = mapped; ++ stats->dirty = pdirty * page; ++ stats->committed = active + stats->dirty; } Modified: trunk/www/firefox/files/patch-z-bug762445 ============================================================================== --- trunk/www/firefox/files/patch-z-bug762445 Sat Oct 13 00:08:01 2012 (r1072) +++ trunk/www/firefox/files/patch-z-bug762445 Fri Oct 19 03:19:31 2012 (r1073) @@ -11,19 +11,25 @@ index 94ad96e..7adfef5 100644 --- memory/build/mozjemalloc_compat.c +++ memory/build/mozjemalloc_compat.c -@@ -11,15 +11,37 @@ +@@ -11,15 +11,50 @@ #define wrap(a) je_ ## a #endif -extern MOZ_IMPORT_API(int) ++/* ++ * CTL_* macros are from memory/jemalloc/src/src/stats.c with changes: ++ * - drop `t' argument to avoid redundancy in calculating type size ++ * - require `i' argument for arena number explicitly ++ */ ++ +#define CTL_GET(n, v) do { \ + size_t sz = sizeof(v); \ + wrap(mallctl)(n, &v, &sz, NULL, 0); \ +} while (0) + -+#define CTL_I_GET(n, v) do { \ ++#define CTL_I_GET(n, v, i) do { \ + size_t mib[6]; \ -+ size_t miblen = sizeof(mib) / sizeof(size_t); \ ++ size_t miblen = sizeof(mib) / sizeof(mib[0]); \ + size_t sz = sizeof(v); \ + wrap(mallctlnametomib)(n, mib, &miblen); \ + mib[2] = i; \ @@ -45,13 +51,20 @@ - wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0); - stats->committed = -1; - stats->dirty = -1; -+ unsigned i; -+ size_t page; -+ CTL_GET("arenas.narenas", i); ++ unsigned narenas; ++ size_t active, allocated, mapped, page, pdirty; ++ ++ CTL_GET("arenas.narenas", narenas); + CTL_GET("arenas.page", page); -+ CTL_GET("stats.active", stats->committed); -+ CTL_GET("stats.allocated", stats->allocated); -+ CTL_GET("stats.mapped", stats->mapped); -+ CTL_I_GET("stats.arenas.0.pdirty", stats->dirty); -+ stats->dirty *= page; ++ CTL_GET("stats.active", active); ++ CTL_GET("stats.allocated", allocated); ++ CTL_GET("stats.mapped", mapped); ++ ++ /* get the summation for all arenas, i == narenas */ ++ CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas); ++ ++ stats->allocated = allocated; ++ stats->mapped = mapped; ++ stats->dirty = pdirty * page; ++ stats->committed = active + stats->dirty; } Modified: trunk/www/seamonkey/files/patch-z-bug762445 ============================================================================== --- trunk/www/seamonkey/files/patch-z-bug762445 Sat Oct 13 00:08:01 2012 (r1072) +++ trunk/www/seamonkey/files/patch-z-bug762445 Fri Oct 19 03:19:31 2012 (r1073) @@ -11,19 +11,25 @@ index 94ad96e..7adfef5 100644 --- mozilla/memory/build/mozjemalloc_compat.c +++ mozilla/memory/build/mozjemalloc_compat.c -@@ -11,15 +11,37 @@ +@@ -11,15 +11,50 @@ #define wrap(a) je_ ## a #endif -extern MOZ_IMPORT_API(int) ++/* ++ * CTL_* macros are from memory/jemalloc/src/src/stats.c with changes: ++ * - drop `t' argument to avoid redundancy in calculating type size ++ * - require `i' argument for arena number explicitly ++ */ ++ +#define CTL_GET(n, v) do { \ + size_t sz = sizeof(v); \ + wrap(mallctl)(n, &v, &sz, NULL, 0); \ +} while (0) + -+#define CTL_I_GET(n, v) do { \ ++#define CTL_I_GET(n, v, i) do { \ + size_t mib[6]; \ -+ size_t miblen = sizeof(mib) / sizeof(size_t); \ ++ size_t miblen = sizeof(mib) / sizeof(mib[0]); \ + size_t sz = sizeof(v); \ + wrap(mallctlnametomib)(n, mib, &miblen); \ + mib[2] = i; \ @@ -45,13 +51,20 @@ - wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0); - stats->committed = -1; - stats->dirty = -1; -+ unsigned i; -+ size_t page; -+ CTL_GET("arenas.narenas", i); ++ unsigned narenas; ++ size_t active, allocated, mapped, page, pdirty; ++ ++ CTL_GET("arenas.narenas", narenas); + CTL_GET("arenas.page", page); -+ CTL_GET("stats.active", stats->committed); -+ CTL_GET("stats.allocated", stats->allocated); -+ CTL_GET("stats.mapped", stats->mapped); -+ CTL_I_GET("stats.arenas.0.pdirty", stats->dirty); -+ stats->dirty *= page; ++ CTL_GET("stats.active", active); ++ CTL_GET("stats.allocated", allocated); ++ CTL_GET("stats.mapped", mapped); ++ ++ /* get the summation for all arenas, i == narenas */ ++ CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas); ++ ++ stats->allocated = allocated; ++ stats->mapped = mapped; ++ stats->dirty = pdirty * page; ++ stats->committed = active + stats->dirty; } From owner-freebsd-gecko@FreeBSD.ORG Fri Oct 19 03:19:47 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 21468376 for ; Fri, 19 Oct 2012 03:19:47 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id AB8268FC0C for ; Fri, 19 Oct 2012 03:19:46 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q9J3JjSD037298 for ; Fri, 19 Oct 2012 03:19:45 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q9J3JenE035501 for freebsd-gecko@freebsd.org; Fri, 19 Oct 2012 03:19:40 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 19 Oct 2012 03:19:40 GMT Message-Id: <201210190319.q9J3JenE035501@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1074 - in trunk/www/firefox-nightly: . files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Oct 2012 03:19:47 -0000 Author: jbeich Date: Fri Oct 19 03:19:40 2012 New Revision: 1074 Log: update Nightly Deleted: trunk/www/firefox-nightly/files/patch-bug713802 trunk/www/firefox-nightly/files/patch-bug778078 trunk/www/firefox-nightly/files/patch-bug788955 trunk/www/firefox-nightly/files/patch-bug798354 trunk/www/firefox-nightly/files/patch-z-bug762445 Modified: trunk/www/firefox-nightly/Makefile trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Fri Oct 19 03:19:31 2012 (r1073) +++ trunk/www/firefox-nightly/Makefile Fri Oct 19 03:19:40 2012 (r1074) @@ -19,7 +19,7 @@ BUILD_DEPENDS= nspr>=4.9.2:${PORTSDIR}/devel/nspr \ nss>=3.13.6_1:${PORTSDIR}/security/nss \ - sqlite3>=3.7.14:${PORTSDIR}/databases/sqlite3 \ + sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Fri Oct 19 03:19:31 2012 (r1073) +++ trunk/www/firefox-nightly/Makefile.hgrev Fri Oct 19 03:19:40 2012 (r1074) @@ -1 +1 @@ -HGREV= 109786:ec10630b1a54 +HGREV= 110708:fd5556088388 Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Fri Oct 19 03:19:31 2012 (r1073) +++ trunk/www/firefox-nightly/distinfo Fri Oct 19 03:19:40 2012 (r1074) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/ec10630b1a54.tar.bz2) = 7aadb7b3569d86424a1ed78735356269dda07237467fe3c930aa01d7c9aa8355 -SIZE (firefox-nightly/ec10630b1a54.tar.bz2) = 94703770 +SHA256 (firefox-nightly/fd5556088388.tar.bz2) = 65ce23d4b5c97d4c8bc3bf3bb7bdf842e67fd26b5b3747469c3b516948fb5c42 +SIZE (firefox-nightly/fd5556088388.tar.bz2) = 94933045 Deleted: trunk/www/firefox-nightly/files/patch-bug713802 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug713802 Fri Oct 19 03:19:40 2012 (r1073) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- browser/installer/package-manifest.in~ -+++ browser/installer/package-manifest.in -@@ -679,6 +679,10 @@ bin/libfreebl_32int64_3.so - - ; [Extensions] - ; -+#ifdef MOZ_ENABLE_GIO -+bin/components/@DLL_PREFIX@nkgio@DLL_SUFFIX@ -+#endif -+ - #ifdef MOZ_ENABLE_GNOMEVFS - bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ - #endif Deleted: trunk/www/firefox-nightly/files/patch-bug778078 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug778078 Fri Oct 19 03:19:40 2012 (r1073) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- toolkit/xre/nsAppRunner.cpp~ -+++ toolkit/xre/nsAppRunner.cpp -@@ -3824,7 +3824,7 @@ XREMain::XRE_main(int argc, char* argv[] - ScopedLogging log; - - #if defined(MOZ_WIDGET_GTK) --#ifdef MOZ_MEMORY -+#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__) - // Disable the slice allocator, since jemalloc already uses similar layout - // algorithms, and using a sub-allocator tends to increase fragmentation. - // This must be done before g_thread_init() is called. Deleted: trunk/www/firefox-nightly/files/patch-bug788955 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug788955 Fri Oct 19 03:19:40 2012 (r1073) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,299 +0,0 @@ -diff --git Makefile.in Makefile.in -index e341462..f75bd55 100644 ---- Makefile.in -+++ Makefile.in -@@ -48,8 +48,10 @@ endif - ifdef MOZ_MEMORY - tier_base_dirs += memory/mozjemalloc - ifdef MOZ_JEMALLOC -+ifndef MOZ_NATIVE_JEMALLOC - tier_base_dirs += memory/jemalloc - endif -+endif - tier_base_dirs += memory/build - endif - ifndef MOZ_NATIVE_ZLIB -diff --git allmakefiles.sh allmakefiles.sh -index 6a9be4b..d2e49e3 100755 ---- allmakefiles.sh -+++ allmakefiles.sh -@@ -59,7 +59,7 @@ if [ ! "$LIBXUL_SDK" ]; then - mozglue/Makefile - mozglue/build/Makefile - " -- if [ "$MOZ_JEMALLOC" ]; then -+ if [ "$MOZ_JEMALLOC" -a -z "$MOZ_NATIVE_JEMALLOC" ]; then - add_makefiles " - memory/jemalloc/Makefile - " -diff --git configure.in configure.in -index bb05782..2f32516 100644 ---- configure.in -+++ configure.in -@@ -3711,21 +3711,22 @@ fi - - dnl Check for the existence of various allocation headers/functions - -+MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" - MALLOC_H= --MOZ_CHECK_HEADER(malloc.h, [MALLOC_H=malloc.h]) --if test "$MALLOC_H" = ""; then -- MOZ_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h]) -- if test "$MALLOC_H" = ""; then -- MOZ_CHECK_HEADER(sys/malloc.h, [MALLOC_H=sys/malloc.h]) -+ -+for file in $MALLOC_HEADERS; do -+ MOZ_CHECK_HEADER($file, [MALLOC_H=$file]) -+ if test "$MALLOC_H" != ""; then -+ AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) -+ break - fi --fi --if test "$MALLOC_H" != ""; then -- AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) --fi -+done - - MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc" - AC_CHECK_FUNCS(strndup posix_memalign memalign valloc) - -+AC_CHECK_FUNCS(malloc_usable_size) -+ - dnl See if compiler supports some gcc-style attributes - - AC_CACHE_CHECK(for __attribute__((always_inline)), -@@ -6939,6 +6940,18 @@ else - fi - - if test -z "$MOZ_MEMORY"; then -+ if test -n "$MOZ_JEMALLOC"; then -+ MOZ_NATIVE_JEMALLOC=1 -+ AC_CHECK_FUNCS(mallctl nallocm,, -+ [MOZ_NATIVE_JEMALLOC= -+ break]) -+ if test -n "$MOZ_NATIVE_JEMALLOC"; then -+ MOZ_MEMORY=1 -+ AC_DEFINE(MOZ_MEMORY) -+ AC_DEFINE(MOZ_JEMALLOC) -+ AC_DEFINE(MOZ_NATIVE_JEMALLOC) -+ fi -+ fi - case "${target}" in - *-mingw*) - if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then -@@ -7033,6 +7046,7 @@ else - fi # MOZ_MEMORY - AC_SUBST(MOZ_MEMORY) - AC_SUBST(MOZ_JEMALLOC) -+AC_SUBST(MOZ_NATIVE_JEMALLOC) - AC_SUBST(MOZ_GLUE_LDFLAGS) - AC_SUBST(MOZ_GLUE_PROGRAM_LDFLAGS) - AC_SUBST(WIN32_CRT_LIBS) -@@ -8820,10 +8834,22 @@ fi - - # Run jemalloc configure script - --if test "$MOZ_JEMALLOC" -a "$MOZ_MEMORY"; then -+if test -z "$MOZ_NATIVE_JEMALLOC" -a "$MOZ_JEMALLOC" -a "$MOZ_MEMORY" ; then - ac_configure_args="$_SUBDIR_CONFIG_ARGS --build=$build --host=$target --enable-stats --with-jemalloc-prefix=je_" -- if test "$OS_ARCH" = "Linux"; then -- MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size" -+ case "$OS_ARCH" in -+ Linux|DragonFly|FreeBSD|NetBSD|OpenBSD) -+ MANGLE="malloc calloc valloc free realloc posix_memalign" -+ case "$OS_ARCH" in -+ Linux) -+ MANGLE="$MANGLE memalign malloc_usable_size" -+ ;; -+ FreeBSD) -+ MANGLE="$MANGLE malloc_usable_size" -+ ;; -+ esac -+ ;; -+ esac -+ if test -n "$MANGLE"; then - MANGLED= - JEMALLOC_WRAPPER= - if test -n "$_WRAP_MALLOC"; then -diff --git memory/build/Makefile.in memory/build/Makefile.in -index dca0f48..af93ee0 100644 ---- memory/build/Makefile.in -+++ memory/build/Makefile.in -@@ -22,7 +22,9 @@ CSRCS = extraMallocFuncs.c - - ifdef MOZ_JEMALLOC - CSRCS += mozjemalloc_compat.c -+ifndef MOZ_NATIVE_JEMALLOC - SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc) -+endif - else - SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc) - endif -diff --git memory/build/extraMallocFuncs.c memory/build/extraMallocFuncs.c -index 9d87629..03c8320 100644 ---- memory/build/extraMallocFuncs.c -+++ memory/build/extraMallocFuncs.c -@@ -94,8 +94,16 @@ wrap(wcsdup)(const wchar_t *src) - #endif - - #ifdef MOZ_JEMALLOC -+ -+#undef wrap -+#if defined(MOZ_NATIVE_JEMALLOC) -+#define wrap(a) a -+#else -+#define wrap(a) je_ ## a -+#endif -+ - /* Override some jemalloc defaults */ --const char *je_malloc_conf = "narenas:1,lg_chunk:20"; -+MOZ_EXPORT_DATA(const char *) wrap(malloc_conf) = "narenas:1,lg_chunk:20"; - - #ifdef ANDROID - #include -diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c -index 10a845a..94ad96e 100644 ---- memory/build/mozjemalloc_compat.c -+++ memory/build/mozjemalloc_compat.c -@@ -5,14 +5,21 @@ - #include "mozilla/Types.h" - #include "jemalloc_types.h" - --extern int je_mallctl(const char*, void*, size_t*, void*, size_t); -+#if defined(MOZ_NATIVE_JEMALLOC) -+#define wrap(a) a -+#else -+#define wrap(a) je_ ## a -+#endif - --MOZ_EXPORT_API (void) -+extern MOZ_IMPORT_API(int) -+wrap(mallctl)(const char*, void*, size_t*, void*, size_t); -+ -+MOZ_EXPORT_API(void) - jemalloc_stats(jemalloc_stats_t *stats) - { - size_t size = sizeof(stats->mapped); -- je_mallctl("stats.mapped", &stats->mapped, &size, NULL, 0); -- je_mallctl("stats.allocated", &stats->allocated, &size, NULL, 0); -+ wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0); -+ wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0); - stats->committed = -1; - stats->dirty = -1; - } -diff --git memory/jemalloc/src/src/mutex.c memory/jemalloc/src/src/mutex.c -index 37a843e..55e18c2 100644 ---- memory/jemalloc/src/src/mutex.c -+++ memory/jemalloc/src/src/mutex.c -@@ -64,7 +64,7 @@ pthread_create(pthread_t *__restrict thread, - /******************************************************************************/ - - #ifdef JEMALLOC_MUTEX_INIT_CB --int _pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex, -+JEMALLOC_EXPORT int _pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex, - void *(calloc_cb)(size_t, size_t)); - #endif - -diff --git memory/mozalloc/mozalloc.cpp memory/mozalloc/mozalloc.cpp -index 5b61050b..5b3399a 100644 ---- memory/mozalloc/mozalloc.cpp -+++ memory/mozalloc/mozalloc.cpp -@@ -12,16 +12,13 @@ - #include - - #if defined(MALLOC_H) --# include MALLOC_H // for memalign, valloc where available -+# include MALLOC_H // for memalign, valloc, malloc_size, malloc_usable_size - #endif // if defined(MALLOC_H) - #include // for size_t - #include // for malloc, free - #if defined(XP_UNIX) - # include // for valloc on *BSD - #endif //if defined(XP_UNIX) --#if defined(__FreeBSD__) --# include // for malloc_usable_size --#endif // if defined(__FreeBSD__) - - #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec)) - # define MOZALLOC_EXPORT __declspec(dllexport) -@@ -213,8 +210,7 @@ moz_malloc_usable_size(void *ptr) - - #if defined(XP_MACOSX) - return malloc_size(ptr); --#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__) -- // Android bionic libc doesn't have malloc_usable_size. -+#elif defined(HAVE_MALLOC_USABLE_SIZE) || defined(MOZ_MEMORY) - return malloc_usable_size(ptr); - #elif defined(XP_WIN) - return _msize(ptr); -diff --git memory/mozjemalloc/jemalloc.h memory/mozjemalloc/jemalloc.h -index f0e0878..2486e83 100644 ---- memory/mozjemalloc/jemalloc.h -+++ memory/mozjemalloc/jemalloc.h -@@ -37,22 +37,29 @@ - #endif - #include "jemalloc_types.h" - -+#if defined(MOZ_NATIVE_JEMALLOC) -+#define wrap(a) a -+#else -+#define wrap(a) je_ ## a -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif - --#if defined(MOZ_MEMORY_LINUX) -+#if defined(MOZ_NATIVE_JEMALLOC) \ -+ || defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD) - __attribute__((weak)) - #endif - void jemalloc_stats(jemalloc_stats_t *stats); - - /* Computes the usable size in advance. */ - #if !defined(MOZ_MEMORY_DARWIN) --#if defined(MOZ_MEMORY_LINUX) -+#if defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD) - __attribute__((weak)) - #endif - #if defined(MOZ_JEMALLOC) --int je_nallocm(size_t *rsize, size_t size, int flags); -+MOZ_IMPORT_API(int) wrap(nallocm)(size_t *rsize, size_t size, int flags); - #else - size_t je_malloc_good_size(size_t size); - #endif -@@ -62,11 +69,11 @@ static inline size_t je_malloc_usable_size_in_advance(size_t size) { - #if defined(MOZ_MEMORY_DARWIN) - return malloc_good_size(size); - #elif defined(MOZ_JEMALLOC) -- if (je_nallocm) { -+ if (wrap(nallocm)) { - size_t ret; - if (size == 0) - size = 1; -- if (!je_nallocm(&ret, size, 0)) -+ if (!wrap(nallocm)(&ret, size, 0)) - return ret; - } - return size; -@@ -113,4 +120,6 @@ void jemalloc_purge_freed_pages(); - } /* extern "C" */ - #endif - -+#undef wrap -+ - #endif /* _JEMALLOC_H_ */ -diff --git mozglue/build/Makefile.in mozglue/build/Makefile.in -index c333647..15ba505 100644 ---- mozglue/build/Makefile.in -+++ mozglue/build/Makefile.in -@@ -23,7 +23,7 @@ FORCE_STATIC_LIB = 1 - endif - - # Keep jemalloc separated when mozglue is statically linked --ifeq (1_1,$(MOZ_MEMORY)_$(FORCE_SHARED_LIB)) -+ifeq (1_1,$(MOZ_MEMORY)_$(or $(MOZ_NATIVE_JEMALLOC),$(FORCE_SHARED_LIB))) - SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,memory,$(DEPTH)/memory/build) - else - # Temporary, until bug 662814 lands Deleted: trunk/www/firefox-nightly/files/patch-bug798354 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug798354 Fri Oct 19 03:19:40 2012 (r1073) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- ipc/chromium/src/chrome/common/ipc_channel_posix.cc~ -+++ ipc/chromium/src/chrome/common/ipc_channel_posix.cc -@@ -133,7 +133,12 @@ int ChannelNameToClientFD(const std::string& channel_id) { - } - - //------------------------------------------------------------------------------ -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2 -+sockaddr_un sizecheck; -+const size_t kMaxPipeNameLength = sizeof(sizecheck.sun_path); -+#else - const size_t kMaxPipeNameLength = sizeof(sockaddr_un::sun_path); -+#endif - - // Creates a Fifo with the specified name ready to listen on. - bool CreateServerFifo(const std::string& pipe_name, int* server_listen_fd) { Deleted: trunk/www/firefox-nightly/files/patch-z-bug762445 ============================================================================== --- trunk/www/firefox-nightly/files/patch-z-bug762445 Fri Oct 19 03:19:40 2012 (r1073) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,70 +0,0 @@ -commit b44dc8e -Author: Jan Beich -Date: Fri Oct 12 18:49:59 2012 +0000 - - Bug 762445 - Add jemalloc3 glue for heap-committed, heap-dirty in about:memory. ---- - memory/build/mozjemalloc_compat.c | 34 ++++++++++++++++++++++++++++------ - 1 file changed, 28 insertions(+), 6 deletions(-) - -diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c -index 94ad96e..7adfef5 100644 ---- memory/build/mozjemalloc_compat.c -+++ memory/build/mozjemalloc_compat.c -@@ -11,15 +11,50 @@ - #define wrap(a) je_ ## a - #endif - --extern MOZ_IMPORT_API(int) -+/* -+ * CTL_* macros are from memory/jemalloc/src/src/stats.c with changes: -+ * - drop `t' argument to avoid redundancy in calculating type size -+ * - require `i' argument for arena number explicitly -+ */ -+ -+#define CTL_GET(n, v) do { \ -+ size_t sz = sizeof(v); \ -+ wrap(mallctl)(n, &v, &sz, NULL, 0); \ -+} while (0) -+ -+#define CTL_I_GET(n, v, i) do { \ -+ size_t mib[6]; \ -+ size_t miblen = sizeof(mib) / sizeof(mib[0]); \ -+ size_t sz = sizeof(v); \ -+ wrap(mallctlnametomib)(n, mib, &miblen); \ -+ mib[2] = i; \ -+ wrap(mallctlbymib)(mib, miblen, &v, &sz, NULL, 0); \ -+} while (0) -+ -+MOZ_IMPORT_API(int) - wrap(mallctl)(const char*, void*, size_t*, void*, size_t); -+MOZ_IMPORT_API(int) -+wrap(mallctlnametomib)(const char *name, size_t *mibp, size_t *miblenp); -+MOZ_IMPORT_API(int) -+wrap(mallctlbymib)(const size_t *mib, size_t miblen, void *oldp, size_t *oldlenp, void *newp, size_t newlen); - - MOZ_EXPORT_API(void) - jemalloc_stats(jemalloc_stats_t *stats) - { -- size_t size = sizeof(stats->mapped); -- wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0); -- wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0); -- stats->committed = -1; -- stats->dirty = -1; -+ unsigned narenas; -+ size_t active, allocated, mapped, page, pdirty; -+ -+ CTL_GET("arenas.narenas", narenas); -+ CTL_GET("arenas.page", page); -+ CTL_GET("stats.active", active); -+ CTL_GET("stats.allocated", allocated); -+ CTL_GET("stats.mapped", mapped); -+ -+ /* get the summation for all arenas, i == narenas */ -+ CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas); -+ -+ stats->allocated = allocated; -+ stats->mapped = mapped; -+ stats->dirty = pdirty * page; -+ stats->committed = active + stats->dirty; - } From owner-freebsd-gecko@FreeBSD.ORG Sat Oct 20 20:24:50 2012 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CA7BC73C for ; Sat, 20 Oct 2012 20:24:50 +0000 (UTC) (envelope-from prvs=064095b409=ob@gruft.de) Received: from main.mx.e-gitt.net (service.rules.org [IPv6:2001:1560:2342::2]) by mx1.freebsd.org (Postfix) with ESMTP id 893508FC16 for ; Sat, 20 Oct 2012 20:24:50 +0000 (UTC) Received: from ob by main.mx.e-gitt.net with local (Exim 4.80 (FreeBSD)) (envelope-from ) id 1TPfbE-0003EH-IH for gecko@FreeBSD.org; Sat, 20 Oct 2012 22:24:48 +0200 Date: Sat, 20 Oct 2012 22:24:48 +0200 From: Oliver Brandmueller To: gecko@FreeBSD.org Subject: www/firefox build build broken w/ GNOMEVFS2 option Message-ID: <20121020202448.GA55513@e-Gitt.NET> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Face: "TT~P'b_)-jKU_0^a=usXryz`YTz)z.[FZrI,A~PREI2U}frrZ`>_J&; ^t|^.dR/mqtC,Vb.Y>~u8(|aL)vAv(k">zY"]*m*y|b8S7:WK[/qP5i>HO#Ek; C[X:b|FP0*Ly_4Ni User-Agent: Mutt/1.5.21 (2010-09-15) Sender: Oliver Brandmueller X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Oct 2012 20:24:50 -0000 Hello, unfortunately I missed to copy&paste the error message (I could do so the next days if needed), but it seems the GNOMEVFS2 optione breaks the www/firefox port build. Thanx, Oliver -- | Oliver Brandmueller http://sysadm.in/ ob@sysadm.in | | Ich bin das Internet. Sowahr ich Gott helfe. |