[Pkg-voip-commits] r4429 - in /wengophone/trunk/debian: changelog patches/generic/memory-dump-fix-double-dump.patch patches/generic/memory-dump-tmp-path.patch

[cavedon-guest at alioth.debian.org]

Author: cavedon-guest
Date: Sat Sep  8 14:56:52 2007
New Revision: 4429

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4429
Log:
Improved patches generic/memory-dump-fix-double-dump.patch and
generic/memory-dump-tmp-path.patch

Modified:
    wengophone/trunk/debian/changelog
    wengophone/trunk/debian/patches/generic/memory-dump-fix-double-dump.patch
    wengophone/trunk/debian/patches/generic/memory-dump-tmp-path.patch

Modified: wengophone/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/changelog?rev=4429&op=diff
==============================================================================
--- wengophone/trunk/debian/changelog (original)
+++ wengophone/trunk/debian/changelog Sat Sep  8 14:56:52 2007
@@ -11,11 +11,16 @@
     - generic/cmake-fix-ENABLE_CRASHREPORT.patch
     - generic/curl-openssl-mt-fix.patch
     - generic/qobjectthreadsafe-fix-qt42.patch
+  * Improved patches:
+    - generic/memory-dump-fix-double-dump.patch (make sure all thread die
+      after core dump)
+    - generic/memory-dump-tmp-path.patch (create core dumps in
+      WENGOPHONE_COREDUMP_DIR, TMPDIR, or /tmp)
   * Re-enable video support
   * Added patch generic/phapi-fix-crash-missing-codec.patch to avoid crash if
     video codec is not available in ffmpeg
 
- -- Ludovico Cavedon <cavedon at sssup.it>  Fri, 07 Sep 2007 22:01:42 +0000
+ -- Ludovico Cavedon <cavedon at sssup.it>  Sat, 08 Sep 2007 14:54:01 +0000
 
 wengophone (2.1.1.dfsg0-4) unstable; urgency=low
 

Modified: wengophone/trunk/debian/patches/generic/memory-dump-fix-double-dump.patch
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/patches/generic/memory-dump-fix-double-dump.patch?rev=4429&op=diff
==============================================================================
--- wengophone/trunk/debian/patches/generic/memory-dump-fix-double-dump.patch (original)
+++ wengophone/trunk/debian/patches/generic/memory-dump-fix-double-dump.patch Sat Sep  8 14:56:52 2007
@@ -1,19 +1,21 @@
-Index: wengophone-2.1.1.dfsg0/libs/owutil/memorydump/src/unix/UNIXMemoryDump.cpp
+Index: wengophone-2.1.2.dfsg0/libs/owutil/memorydump/src/unix/UNIXMemoryDump.cpp
 ===================================================================
---- wengophone-2.1.1.dfsg0.orig/libs/owutil/memorydump/src/unix/UNIXMemoryDump.cpp	2007-07-24 11:59:11.000000000 +0200
-+++ wengophone-2.1.1.dfsg0/libs/owutil/memorydump/src/unix/UNIXMemoryDump.cpp	2007-07-24 12:00:02.000000000 +0200
-@@ -25,12 +25,13 @@
+--- wengophone-2.1.2.dfsg0.orig/libs/owutil/memorydump/src/unix/UNIXMemoryDump.cpp	2007-04-02 16:01:08.000000000 +0000
++++ wengophone-2.1.2.dfsg0/libs/owutil/memorydump/src/unix/UNIXMemoryDump.cpp	2007-09-08 14:51:43.000000000 +0000
+@@ -25,11 +25,16 @@
  #include <util/Path.h>
  
  #include <unistd.h>
-+#include <stdlib.h>
++#include <sys/resource.h>
  
  UNIXMemoryDump::UNIXMemoryDump(const std::string & applicationName, const std::string & revision)
  	: MemoryDump(applicationName, revision) {
  
  	doJob();
--	abort();
-+	exit(1);
++
++	// avoid an additional core dump
++	struct rlimit rlim = {0, 0};
++	setrlimit(RLIMIT_CORE, &rlim);
+ 	abort();
  }
  
- UNIXMemoryDump::~UNIXMemoryDump() {

Modified: wengophone/trunk/debian/patches/generic/memory-dump-tmp-path.patch
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/patches/generic/memory-dump-tmp-path.patch?rev=4429&op=diff
==============================================================================
--- wengophone/trunk/debian/patches/generic/memory-dump-tmp-path.patch (original)
+++ wengophone/trunk/debian/patches/generic/memory-dump-tmp-path.patch Sat Sep  8 14:56:52 2007
@@ -1,17 +1,30 @@
-Index: wengophone-2.1.1.dfsg0/libs/owutil/memorydump/src/unix/UNIXMemoryDump.cpp
+Index: wengophone-2.1.2.dfsg0/libs/owutil/memorydump/src/unix/UNIXMemoryDump.cpp
 ===================================================================
---- wengophone-2.1.1.dfsg0.orig/libs/owutil/memorydump/src/unix/UNIXMemoryDump.cpp	2007-07-24 12:00:02.000000000 +0200
-+++ wengophone-2.1.1.dfsg0/libs/owutil/memorydump/src/unix/UNIXMemoryDump.cpp	2007-07-24 12:03:53.000000000 +0200
-@@ -47,7 +47,11 @@
+--- wengophone-2.1.2.dfsg0.orig/libs/owutil/memorydump/src/unix/UNIXMemoryDump.cpp	2007-09-08 14:51:43.000000000 +0000
++++ wengophone-2.1.2.dfsg0/libs/owutil/memorydump/src/unix/UNIXMemoryDump.cpp	2007-09-08 14:52:55.000000000 +0000
+@@ -25,6 +25,7 @@
+ #include <util/Path.h>
+ 
+ #include <unistd.h>
++#include <stdlib.h>
+ #include <sys/resource.h>
+ 
+ UNIXMemoryDump::UNIXMemoryDump(const std::string & applicationName, const std::string & revision)
+@@ -51,8 +52,15 @@
  	memoryDumpName += getCurrentDateTime();
  	memoryDumpName += ".core";
  
 -	std::string memoryDumpFile(Path::getApplicationDirPath());
+-	memoryDumpFile += memoryDumpName;
 +	const char * coreDir = getenv("WENGOPHONE_COREDUMP_DIR");
-+	if(!coreDir)
++	if(!coreDir) {
++		coreDir = getenv("TMPDIR");
++	}
++	if(!coreDir) {
 +		coreDir = "/tmp";
++	}
 +	std::string memoryDumpFile(coreDir);
-+	memoryDumpFile += "/";
- 	memoryDumpFile += memoryDumpName;
++	memoryDumpFile += '/' + memoryDumpName;
  
  	WriteCoreDump(memoryDumpFile.c_str());
+