- revert r310861, which seems to cause IPC memory leaks.

- bump PORTREVISION

Discussed on: 	freebsd-chromium
This commit is contained in:
Rene Ladan 2013-02-04 21:39:41 +00:00
parent 5b7036499d
commit 396cc5daf4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=311648
2 changed files with 14 additions and 16 deletions

View file

@ -4,6 +4,7 @@
PORTNAME= chromium
DISTVERSIONPREFIX= courgette-redacted-
DISTVERSION= 24.0.1312.57
PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://download.goodking.org/downloads/ \
ftp://rene-ladan.nl/pub/distfiles/ \

View file

@ -1,21 +1,18 @@
--- ui/surface/transport_dib_linux.cc.orig 2013-01-08 04:46:06.000000000 +0200
+++ ui/surface/transport_dib_linux.cc 2013-01-17 23:27:10.221168481 +0200
@@ -37,6 +37,14 @@
--- ui/surface/transport_dib_linux.cc.orig 2011-09-14 11:02:00.000000000 +0300
+++ ui/surface/transport_dib_linux.cc 2011-09-21 13:59:55.000000000 +0300
@@ -31,6 +31,11 @@
address_ = kInvalidAddress;
}
+#if defined(OS_FREEBSD)
+ if(is_valid_id(key_))
+ shmctl(key_.shmkey, IPC_RMID, 0);
+#endif
+
if (x_shm_) {
DCHECK(display_);
ui::DetachSharedMemory(display_, x_shm_);
}
+
+#if defined(OS_FREEBSD)
+ if (is_valid_id(key_)) {
+ struct shmid_ds shmst;
+ if (shmctl(key_.shmkey, IPC_STAT, &shmst) == 0 && shmst.shm_nattch == 0)
+ shmctl(key_.shmkey, IPC_RMID, 0);
+ }
+#endif
}
// static
@@ -51,10 +59,13 @@
@@ -50,10 +55,13 @@
}
void* address = shmat(shmkey, NULL /* desired address */, 0 /* flags */);