From mboxrd@z Thu Jan 1 00:00:00 1970
Path: news.gmane.org!.POSTED!not-for-mail
From: Philipp Stephani
Newsgroups: gmane.emacs.bugs
Subject: bug#30106: [PATCH 2/2] Fix module support if threads are disabled
(Bug#30106)
Date: Wed, 17 Jan 2018 23:28:46 +0100
Message-ID: <20180117222846.93077-2-phst@google.com>
References:
<20180117222846.93077-1-phst@google.com>
NNTP-Posting-Host: blaine.gmane.org
X-Trace: blaine.gmane.org 1516228106 24131 195.159.176.226 (17 Jan 2018 22:28:26 GMT)
X-Complaints-To: usenet@blaine.gmane.org
NNTP-Posting-Date: Wed, 17 Jan 2018 22:28:26 +0000 (UTC)
Cc: Philipp Stephani
To: Glenn Morris , Eli Zaretskii ,
30106@debbugs.gnu.org
Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jan 17 23:28:21 2018
Return-path:
Envelope-to: geb-bug-gnu-emacs@m.gmane.org
Original-Received: from lists.gnu.org ([208.118.235.17])
by blaine.gmane.org with esmtp (Exim 4.84_2)
(envelope-from )
id 1ebwBq-0005dO-O2
for geb-bug-gnu-emacs@m.gmane.org; Wed, 17 Jan 2018 23:28:14 +0100
Original-Received: from localhost ([::1]:39233 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from )
id 1ebwDq-000203-LH
for geb-bug-gnu-emacs@m.gmane.org; Wed, 17 Jan 2018 17:30:18 -0500
Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47581)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ebwDh-0001z0-Pu
for bug-gnu-emacs@gnu.org; Wed, 17 Jan 2018 17:30:10 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1ebwDd-00072p-3B
for bug-gnu-emacs@gnu.org; Wed, 17 Jan 2018 17:30:09 -0500
Original-Received: from debbugs.gnu.org ([208.118.235.43]:52758)
by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
(Exim 4.71) (envelope-from )
id 1ebwDc-00072b-WA
for bug-gnu-emacs@gnu.org; Wed, 17 Jan 2018 17:30:05 -0500
Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
(envelope-from ) id 1ebwDb-0000SM-AE
for bug-gnu-emacs@gnu.org; Wed, 17 Jan 2018 17:30:04 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Philipp Stephani
Original-Sender: "Debbugs-submit"
Resent-CC: bug-gnu-emacs@gnu.org
Resent-Date: Wed, 17 Jan 2018 22:30:03 +0000
Resent-Message-ID:
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 30106
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords:
Original-Received: via spool by 30106-submit@debbugs.gnu.org id=B30106.15162281601669
(code B ref 30106); Wed, 17 Jan 2018 22:30:03 +0000
Original-Received: (at 30106) by debbugs.gnu.org; 17 Jan 2018 22:29:20 +0000
Original-Received: from localhost ([127.0.0.1]:60654 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from )
id 1ebwCt-0000Qr-OW
for submit@debbugs.gnu.org; Wed, 17 Jan 2018 17:29:19 -0500
Original-Received: from mail-wr0-f193.google.com ([209.85.128.193]:38733)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from ) id 1ebwCr-0000Qe-Sx
for 30106@debbugs.gnu.org; Wed, 17 Jan 2018 17:29:18 -0500
Original-Received: by mail-wr0-f193.google.com with SMTP id x1so16409737wrb.5
for <30106@debbugs.gnu.org>; Wed, 17 Jan 2018 14:29:17 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=from:to:cc:subject:date:message-id:in-reply-to:references;
bh=yWwskjJ5GvpylHrDfwbHTXWw34HuuKccqu3eiaxQCck=;
b=BcUm83l774segCZHtCAT0+3NeLFC1oaD3rYs/+7/duvU2DdMxLZaWR3vi6J/B+zw18
H7tlfZxqt9KDwNU29H6pXxExztfnh//1FtDf9IzhjDi5N4Ki1NKqNURQ2zVmzn24kr7W
6Acd0hrcmy43iOE26s7PTV1coKdaD97qOrAgf5a7lD614FQ3JclhuxP1G0ekMVLDeyH9
OYiv2SsJCNODPDzv/zE9bQC85wWUOJLnfPp0YPLrsVIjPRixcPD0M4zuQmtf5jdqvqbo
DMI1sHdD7AJRREMqzZxIkk0ejvRKK0jZ4XhV4ze2QmwfjdVYPaRuSC0/KqOk/jOhwFbN
rSjg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references;
bh=yWwskjJ5GvpylHrDfwbHTXWw34HuuKccqu3eiaxQCck=;
b=g+f73U7YOwQzVxpda5cGUTGP36Ec4ar/cmLbHLesfREOXZ0Ej1r0J++W0f6sLqh4Qh
ICtXkCuuBC8Ci0Eywax4GBg34w9zxOEcDx4XrFNZQoQi6CualHhWk0gtGn7FmFuPkTGX
tLdD46YPiabb+TuWyfwDmKbRxCSUa1MlPSCVT/MmGAq+4nFsjq3r8HWuPTrQeu/M+Kay
37UrEvD3z3Men9KH/YLFSOXSep0l9EcM/+ISt9l7aWHg/GwYW2j2rcAQJ0o03IUUmg7i
1ST3Z7oTCYDRJggOb3zNADxA682CqmjeWLuInQSNWZl9DieBjpq11t/HuQlYX0iU3FjI
nCiw==
X-Gm-Message-State: AKwxytdhcRjv65iLyue/UFXRncDmZbupFFnxf7SAanbsMEsPAjZeC0Hw
m7Og/qvhp8cAwKavsxevN5hx9hDJ
X-Google-Smtp-Source: ACJfBota37fR0HgFgEJ8E/nagnkl+TlijWmnmyzitRc1zZ350reicoMWw3vN3VybYGsBG7Eoe2JoDg==
X-Received: by 10.223.190.4 with SMTP id n4mr4480954wrh.28.1516228152212;
Wed, 17 Jan 2018 14:29:12 -0800 (PST)
Original-Received: from p.cm.cablesurf.de (46.128.198.151.dynamic.cablesurf.de.
[46.128.198.151]) by smtp.gmail.com with ESMTPSA id
z71sm16696138wrc.11.2018.01.17.14.29.10
(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
Wed, 17 Jan 2018 14:29:11 -0800 (PST)
X-Google-Original-From: Philipp Stephani
X-Mailer: git-send-email 2.15.1
In-Reply-To: <20180117222846.93077-1-phst@google.com>
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
X-BeenThere: bug-gnu-emacs@gnu.org
List-Id: "Bug reports for GNU Emacs,
the Swiss army knife of text editors"
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org
Original-Sender: "bug-gnu-emacs"
Xref: news.gmane.org gmane.emacs.bugs:142239
Archived-At:
* src/systhread.c (sys_thread_equal): New function.
* src/emacs-module.c (in_current_thread): Use it.
---
src/emacs-module.c | 7 ++-----
src/systhread.c | 18 ++++++++++++++++++
src/systhread.h | 1 +
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/emacs-module.c b/src/emacs-module.c
index 00f0e86d7d..298080e646 100644
--- a/src/emacs-module.c
+++ b/src/emacs-module.c
@@ -31,6 +31,7 @@ along with GNU Emacs. If not, see . */
#include "coding.h"
#include "keyboard.h"
#include "syssignal.h"
+#include "systhread.h"
#include "thread.h"
#include
@@ -805,11 +806,7 @@ in_current_thread (void)
{
if (current_thread == NULL)
return false;
-#ifdef HAVE_PTHREAD
- return pthread_equal (pthread_self (), current_thread->thread_id);
-#elif defined WINDOWSNT
- return GetCurrentThreadId () == current_thread->thread_id;
-#endif
+ return sys_thread_equal (sys_thread_self (), current_thread->thread_id);
}
static void
diff --git a/src/systhread.c b/src/systhread.c
index 4ffb7db143..3f162a2bcb 100644
--- a/src/systhread.c
+++ b/src/systhread.c
@@ -74,6 +74,12 @@ sys_thread_self (void)
return 0;
}
+bool
+sys_thread_equal (sys_thread_t t, sys_thread_t u)
+{
+ return t == u;
+}
+
int
sys_thread_create (sys_thread_t *t, const char *name,
thread_creation_function *func, void *datum)
@@ -155,6 +161,12 @@ sys_thread_self (void)
return pthread_self ();
}
+bool
+sys_thread_equal (sys_thread_t t, sys_thread_t u)
+{
+ return pthread_equal (t, u);
+}
+
int
sys_thread_create (sys_thread_t *thread_ptr, const char *name,
thread_creation_function *func, void *arg)
@@ -323,6 +335,12 @@ sys_thread_self (void)
return (sys_thread_t) GetCurrentThreadId ();
}
+bool
+sys_thread_equal (sys_thread_t t, sys_thread_t u)
+{
+ return t == u;
+}
+
static thread_creation_function *thread_start_address;
/* _beginthread wants a void function, while we are passed a function
diff --git a/src/systhread.h b/src/systhread.h
index 4745d22065..5dbb12dffb 100644
--- a/src/systhread.h
+++ b/src/systhread.h
@@ -100,6 +100,7 @@ extern void sys_cond_broadcast (sys_cond_t *);
extern void sys_cond_destroy (sys_cond_t *);
extern sys_thread_t sys_thread_self (void);
+extern bool sys_thread_equal (sys_thread_t, sys_thread_t);
extern int sys_thread_create (sys_thread_t *, const char *,
thread_creation_function *,
--
2.15.1