- use the same memory allocation values on amd64 and i386 too.

this makes chrome use way less memory and since it does not hit
  datasize limits anymore, it is way more stable too
- remove the warning of datasize bumping from the wrapper script

tested by sthen@, jasper@ and me
This commit is contained in:
robert 2011-05-17 08:35:31 +00:00
parent 3b46dbc2b5
commit 0818a3651c
6 changed files with 30 additions and 24 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.43 2011/05/14 21:29:03 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.44 2011/05/17 08:35:31 robert Exp $
ONLY_FOR_ARCHS= i386 amd64
@ -7,7 +7,7 @@ COMMENT= Chromium browser
V= 11.0.696.68
DISTNAME= chromium-${V}
REVISION= 0
REVISION= 1
CATEGORIES= www

View File

@ -1,9 +1,8 @@
#!/bin/sh
# $OpenBSD: chrome,v 1.3 2011/02/08 21:10:28 sthen Exp $
# $OpenBSD: chrome,v 1.4 2011/05/17 08:35:31 robert Exp $
PROGDIR=TRUEPREFIX/chrome
SHMALL=32768
DATASIZ=716800
FDS=400
if [ `/usr/sbin/sysctl -n kern.shminfo.shmall` -lt ${SHMALL} ]; then
@ -11,11 +10,6 @@ if [ `/usr/sbin/sysctl -n kern.shminfo.shmall` -lt ${SHMALL} ]; then
MSG="${MSG}\ne.g.: sysctl kern.shminfo.shmall=${SHMALL}. This can be added to /etc/sysctl.conf.\n"
fi
[ `ulimit -Sd` -lt ${DATASIZ} ] || ulimit -Sd ${DATASIZ}
if [ `ulimit -Sd` -lt ${DATASIZ} ]; then
LMSG="- increase datasize-max to at least ${DATASIZ}.\n"
fi
[ `ulimit -Sn` -lt ${FDS} ] || ulimit -Sn ${FDS}
if [ `ulimit -Sn` -lt ${FDS} ]; then
LMSG="${LMSG}- increase openfiles-max to at least ${FDS}.\n"

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-content_browser_tab_contents_tab_contents_cc,v 1.1 2011/04/29 13:18:01 robert Exp $
--- content/browser/tab_contents/tab_contents.cc.orig Thu Apr 28 11:30:45 2011
+++ content/browser/tab_contents/tab_contents.cc Thu Apr 28 11:31:37 2011
$OpenBSD: patch-content_browser_tab_contents_tab_contents_cc,v 1.2 2011/05/17 08:35:31 robert Exp $
--- content/browser/tab_contents/tab_contents.cc.orig Sat May 7 11:40:02 2011
+++ content/browser/tab_contents/tab_contents.cc Mon May 16 16:10:04 2011
@@ -301,7 +301,7 @@ TabContents::TabContents(Profile* profile,
registrar_.Add(this, NotificationType::RENDER_WIDGET_HOST_DESTROYED,
@ -10,7 +10,7 @@ $OpenBSD: patch-content_browser_tab_contents_tab_contents_cc,v 1.1 2011/04/29 13
registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
NotificationService::AllSources());
#endif
@@ -2721,7 +2721,7 @@ void TabContents::Observe(NotificationType type,
@@ -2723,7 +2723,7 @@ void TabContents::Observe(NotificationType type,
break;
}

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_PlatformBridge_cpp,v 1.2 2011/04/29 13:18:01 robert Exp $
--- third_party/WebKit/Source/WebKit/chromium/src/PlatformBridge.cpp.orig Thu Apr 28 11:56:06 2011
+++ third_party/WebKit/Source/WebKit/chromium/src/PlatformBridge.cpp Thu Apr 28 11:56:33 2011
$OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_PlatformBridge_cpp,v 1.3 2011/05/17 08:35:31 robert Exp $
--- third_party/WebKit/Source/WebKit/chromium/src/PlatformBridge.cpp.orig Sat May 7 11:42:23 2011
+++ third_party/WebKit/Source/WebKit/chromium/src/PlatformBridge.cpp Mon May 16 16:10:05 2011
@@ -70,7 +70,7 @@
#include "win/WebThemeEngine.h"
#endif
@ -10,7 +10,7 @@ $OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_PlatformBridge_cpp
#include "linux/WebThemeEngine.h"
#include "WebFontInfo.h"
#include "WebFontRenderStyle.h"
@@ -436,7 +436,7 @@ bool PlatformBridge::ensureFontLoaded(HFONT font)
@@ -432,7 +432,7 @@ bool PlatformBridge::ensureFontLoaded(HFONT font)
}
#endif
@ -19,7 +19,7 @@ $OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_PlatformBridge_cpp
String PlatformBridge::getFontFamilyForCharacters(const UChar* characters, size_t numCharacters, const char* preferredLocale)
{
if (webKitClient()->sandboxSupport())
@@ -777,7 +777,7 @@ void PlatformBridge::paintProgressBar(
@@ -773,7 +773,7 @@ void PlatformBridge::paintProgressBar(
gc->platformContext()->canvas(), barRect, valueRect, determinate, animatedSeconds);
}

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_WebViewImpl_cpp,v 1.2 2011/04/29 13:18:02 robert Exp $
--- third_party/WebKit/Source/WebKit/chromium/src/WebViewImpl.cpp.orig Tue Apr 26 10:03:27 2011
+++ third_party/WebKit/Source/WebKit/chromium/src/WebViewImpl.cpp Thu Apr 28 11:17:49 2011
$OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_WebViewImpl_cpp,v 1.3 2011/05/17 08:35:31 robert Exp $
--- third_party/WebKit/Source/WebKit/chromium/src/WebViewImpl.cpp.orig Sat May 7 11:42:23 2011
+++ third_party/WebKit/Source/WebKit/chromium/src/WebViewImpl.cpp Mon May 16 16:10:05 2011
@@ -132,7 +132,7 @@
#if OS(WINDOWS)
#include "RenderThemeChromiumWin.h"
@ -60,7 +60,7 @@ $OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_WebViewImpl_cpp,v
// Mac has no way to open a context menu based on a keyboard event.
bool WebViewImpl::sendContextMenuEvent(const WebKeyboardEvent& event)
{
@@ -2062,7 +2062,7 @@ void WebViewImpl::setDomainRelaxationForbidden(bool fo
@@ -2063,7 +2063,7 @@ void WebViewImpl::setDomainRelaxationForbidden(bool fo
void WebViewImpl::setScrollbarColors(unsigned inactiveColor,
unsigned activeColor,
unsigned trackColor) {
@ -69,7 +69,7 @@ $OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_WebViewImpl_cpp,v
PlatformThemeChromiumGtk::setScrollbarColors(inactiveColor,
activeColor,
trackColor);
@@ -2073,7 +2073,7 @@ void WebViewImpl::setSelectionColors(unsigned activeBa
@@ -2074,7 +2074,7 @@ void WebViewImpl::setSelectionColors(unsigned activeBa
unsigned activeForegroundColor,
unsigned inactiveBackgroundColor,
unsigned inactiveForegroundColor) {
@ -78,7 +78,7 @@ $OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_WebViewImpl_cpp,v
RenderThemeChromiumLinux::setSelectionColors(activeBackgroundColor,
activeForegroundColor,
inactiveBackgroundColor,
@@ -2149,7 +2149,7 @@ bool WebViewImpl::navigationPolicyFromMouseEvent(unsig
@@ -2150,7 +2150,7 @@ bool WebViewImpl::navigationPolicyFromMouseEvent(unsig
bool alt, bool meta,
WebNavigationPolicy* policy)
{

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-v8_src_heap_cc,v 1.1 2011/05/17 08:35:31 robert Exp $
--- v8/src/heap.cc.orig Mon May 16 17:04:03 2011
+++ v8/src/heap.cc Mon May 16 17:07:18 2011
@@ -87,7 +87,7 @@ intptr_t Heap::max_old_generation_size_ = 192*MB;
int Heap::initial_semispace_size_ = 128*KB;
intptr_t Heap::code_range_size_ = 0;
intptr_t Heap::max_executable_size_ = max_old_generation_size_;
-#elif defined(V8_TARGET_ARCH_X64)
+#elif defined(V8_TARGET_ARCH_X64) && !defined(__OpenBSD__)
static const int default_max_semispace_size_ = 16*MB;
intptr_t Heap::max_old_generation_size_ = 1*GB;
int Heap::initial_semispace_size_ = 1*MB;