Date: Fri, 19 Oct 2012 03:19:40 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1074 - in trunk/www/firefox-nightly: . files Message-ID: <201210190319.q9J3JenE035501@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
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 <android/log.h>
-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 <sys/types.h>
-
- #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 <stddef.h> // for size_t
- #include <stdlib.h> // for malloc, free
- #if defined(XP_UNIX)
- # include <unistd.h> // for valloc on *BSD
- #endif //if defined(XP_UNIX)
--#if defined(__FreeBSD__)
--# include <malloc_np.h> // 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 <jbeich@tormail.org>
-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;
- }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210190319.q9J3JenE035501>