From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "=?UTF-8?Q?=C4=B0smail_D=C3=B6nmez?=" Newsgroups: gmane.emacs.devel Subject: [PATCH] XCloseDisplay already calls XrmDestroyDatabase Date: Tue, 19 Aug 2008 13:19:29 +0300 Message-ID: <19e566510808190319r454900a7sc3b5a4e9d6d68f95@mail.gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_34533_12403494.1219141169801" X-Trace: ger.gmane.org 1219141473 14099 80.91.229.12 (19 Aug 2008 10:24:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 19 Aug 2008 10:24:33 +0000 (UTC) To: "emacs- devel" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Aug 19 12:25:26 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1KVOOx-0004NL-1L for ged-emacs-devel@m.gmane.org; Tue, 19 Aug 2008 12:25:23 +0200 Original-Received: from localhost ([127.0.0.1]:44366 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KVONz-0005Lu-7B for ged-emacs-devel@m.gmane.org; Tue, 19 Aug 2008 06:24:23 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KVOJS-0004Hp-H8 for emacs-devel@gnu.org; Tue, 19 Aug 2008 06:19:42 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KVOJN-0004GT-Dh for emacs-devel@gnu.org; Tue, 19 Aug 2008 06:19:38 -0400 Original-Received: from [199.232.76.173] (port=36587 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KVOJJ-0004Fu-D0 for emacs-devel@gnu.org; Tue, 19 Aug 2008 06:19:34 -0400 Original-Received: from nf-out-0910.google.com ([64.233.182.186]:22435) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KVOJI-0007lG-Kk for emacs-devel@gnu.org; Tue, 19 Aug 2008 06:19:32 -0400 Original-Received: by nf-out-0910.google.com with SMTP id c7so1380658nfi.26 for ; Tue, 19 Aug 2008 03:19:30 -0700 (PDT) Original-Received: by 10.210.27.20 with SMTP id a20mr9592942eba.89.1219141169796; Tue, 19 Aug 2008 03:19:29 -0700 (PDT) Original-Received: by 10.210.136.18 with HTTP; Tue, 19 Aug 2008 03:19:29 -0700 (PDT) X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 2) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:102636 Archived-At: ------=_Part_34533_12403494.1219141169801 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi, Running on Ubuntu's upcoming Intrepid release I experienced X crashes when I quit emacsclient. The gdb log shows XrmDestroyDatabase() is the failing line. Looking at src/xterm.c lines around about 10514: #ifndef USE_X_TOOLKIT /* I'm told Xt does this itself. */ #ifndef AIX /* On AIX, XCloseDisplay calls this. */ XrmDestroyDatabase (dpyinfo->xrdb); #endif #endif So this code assumes only on AIX XCloseDisplay itself calls XrmDestroyDatabase but this doesn't seem to be the case, looking at libX11 1.1.4 source code, src/OpenDis.c starting line 832: 822 /* if RM database was allocated by XGetDefault() free it */ 823 if (dpy->db && (dpy->flags & XlibDisplayDfltRMDB)) 824 XrmDestroyDatabase(dpy->db); this is from the _XFreeDisplayStructure() function and the function documentation says: /* XFreeDisplayStructure frees all the storage associated with a * Display. It is used by XOpenDisplay if it runs out of memory, * and also by XCloseDisplay. .... */ So looks like there is no need to manually call XrmDestroyDatabase() anymore, attached patch removes it. Regards, ismail -- Programmer Excuse #4: It's too complicated for you to understand. ------=_Part_34533_12403494.1219141169801 Content-Type: text/x-diff; name=xrm.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_fk2d65og0 Content-Disposition: attachment; filename=xrm.patch ZGlmZiAtLWdpdCBhL3NyYy94dGVybS5jIGIvc3JjL3h0ZXJtLmMKaW5kZXggYTMyZjRlMS4uYjVi M2YxOSAxMDA2NDQKLS0tIGEvc3JjL3h0ZXJtLmMKKysrIGIvc3JjL3h0ZXJtLmMKQEAgLTEwNTE0 LDExICsxMDUxNCw2IEBAIHhfZGVsZXRlX2Rpc3BsYXkgKGRweWluZm8pCiAJICB0YWlsLT5uZXh0 ID0gdGFpbC0+bmV4dC0+bmV4dDsKICAgICB9CiAKLSNpZm5kZWYgVVNFX1hfVE9PTEtJVCAgIC8q IEknbSB0b2xkIFh0IGRvZXMgdGhpcyBpdHNlbGYuICAqLwotI2lmbmRlZiBBSVgJCS8qIE9uIEFJ WCwgWENsb3NlRGlzcGxheSBjYWxscyB0aGlzLiAgKi8KLSAgWHJtRGVzdHJveURhdGFiYXNlIChk cHlpbmZvLT54cmRiKTsKLSNlbmRpZgotI2VuZGlmCiAjaWZkZWYgSEFWRV9YX0kxOE4KICAgaWYg KGRweWluZm8tPnhpbSkKICAgICB4aW1fY2xvc2VfZHB5IChkcHlpbmZvKTsK ------=_Part_34533_12403494.1219141169801--