From 6176e134ca6231dd833109436117d3fee054c47f Mon Sep 17 00:00:00 2001 From: olgeni <olgeni@FreeBSD.org> Date: Sat, 19 Mar 2005 11:24:22 +0000 Subject: Fix yield/1 bug in kernel/src/rpc.erl with code from R10B-4. (from the erlang-questions mailing list) Obtained from: Bjorn Gustavsson <bjorn(at)erix.ericsson.se> --- lang/erlang/Makefile | 1 + lang/erlang/files/patch-lib_kernel_src_rpc.erl | 28 ++++++++++++++++++++++++ lang/erlang14/Makefile | 1 + lang/erlang14/files/patch-lib_kernel_src_rpc.erl | 28 ++++++++++++++++++++++++ 4 files changed, 58 insertions(+) create mode 100644 lang/erlang/files/patch-lib_kernel_src_rpc.erl create mode 100644 lang/erlang14/files/patch-lib_kernel_src_rpc.erl diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index 68f4eea11beb..1c0445cfc89d 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -7,6 +7,7 @@ PORTNAME= erlang PORTVERSION= r10b3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= lang parallel MASTER_SITES= http://www.erlang.org/download/ \ diff --git a/lang/erlang/files/patch-lib_kernel_src_rpc.erl b/lang/erlang/files/patch-lib_kernel_src_rpc.erl new file mode 100644 index 000000000000..7a94e2a96574 --- /dev/null +++ b/lang/erlang/files/patch-lib_kernel_src_rpc.erl @@ -0,0 +1,28 @@ + +$FreeBSD$ + +--- lib/kernel/src/rpc.erl.orig ++++ lib/kernel/src/rpc.erl +@@ -495,16 +495,16 @@ + ReplyTo ! {self(), {promise_reply, R}} %% self() is key + end). + +-yield(Key) when pid(Key) -> +- {value, R} = do_yield(Key, infinite), ++yield(Key) when is_pid(Key) -> ++ {value,R} = do_yield(Key, infinity), + R. + +-nb_yield(Key, infinite) when pid(Key) -> +- do_yield(Key, infinite); +-nb_yield(Key, Timeout) when pid(Key), integer(Timeout), Timeout >= 0 -> ++nb_yield(Key, infinity=Inf) when is_pid(Key) -> ++ do_yield(Key, Inf); ++nb_yield(Key, Timeout) when is_pid(Key), is_integer(Timeout), Timeout >= 0 -> + do_yield(Key, Timeout). + +-nb_yield(Key) when pid(Key) -> ++nb_yield(Key) when is_pid(Key) -> + do_yield(Key, 0). + + do_yield(Key, Timeout) -> diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile index 68f4eea11beb..1c0445cfc89d 100644 --- a/lang/erlang14/Makefile +++ b/lang/erlang14/Makefile @@ -7,6 +7,7 @@ PORTNAME= erlang PORTVERSION= r10b3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= lang parallel MASTER_SITES= http://www.erlang.org/download/ \ diff --git a/lang/erlang14/files/patch-lib_kernel_src_rpc.erl b/lang/erlang14/files/patch-lib_kernel_src_rpc.erl new file mode 100644 index 000000000000..7a94e2a96574 --- /dev/null +++ b/lang/erlang14/files/patch-lib_kernel_src_rpc.erl @@ -0,0 +1,28 @@ + +$FreeBSD$ + +--- lib/kernel/src/rpc.erl.orig ++++ lib/kernel/src/rpc.erl +@@ -495,16 +495,16 @@ + ReplyTo ! {self(), {promise_reply, R}} %% self() is key + end). + +-yield(Key) when pid(Key) -> +- {value, R} = do_yield(Key, infinite), ++yield(Key) when is_pid(Key) -> ++ {value,R} = do_yield(Key, infinity), + R. + +-nb_yield(Key, infinite) when pid(Key) -> +- do_yield(Key, infinite); +-nb_yield(Key, Timeout) when pid(Key), integer(Timeout), Timeout >= 0 -> ++nb_yield(Key, infinity=Inf) when is_pid(Key) -> ++ do_yield(Key, Inf); ++nb_yield(Key, Timeout) when is_pid(Key), is_integer(Timeout), Timeout >= 0 -> + do_yield(Key, Timeout). + +-nb_yield(Key) when pid(Key) -> ++nb_yield(Key) when is_pid(Key) -> + do_yield(Key, 0). + + do_yield(Key, Timeout) -> -- cgit i-1.3.8'>dependabot/npm_and_yarn/devel/electron6/files/ini-1.3.8</option> <option value='dependabot/npm_and_yarn/devel/electron6/files/lodash-4.17.19'>dependabot/npm_and_yarn/devel/electron6/files/lodash-4.17.19</option> <option value='dependabot/npm_and_yarn/devel/electron6/files/lodash.merge-4.6.2'>dependabot/npm_and_yarn/devel/electron6/files/lodash.merge-4.6.2</option> <option value='dependabot/npm_and_yarn/devel/electron6/files/node-fetch-2.6.1'>dependabot/npm_and_yarn/devel/electron6/files/node-fetch-2.6.1</option> <option value='dependabot/npm_and_yarn/devel/electron6/files/serve-10.1.2'>dependabot/npm_and_yarn/devel/electron6/files/serve-10.1.2</option> <option value='gnome-3.22'>gnome-3.22</option> <option value='gnome-3.24' selected='selected'>gnome-3.24</option> <option value='gnome-3.26'>gnome-3.26</option> <option value='gnome-3.28'>gnome-3.28</option> <option value='gnome-3.32'>gnome-3.32</option> <option value='gnome-3.36'>gnome-3.36</option> <option value='gstreamer'>gstreamer</option> <option value='gstreamer-1.16'>gstreamer-1.16</option> <option value='gstreamer0.10-removal'>gstreamer0.10-removal</option> <option value='main'>main</option> <option value='master'>master</option> <option value='mate-1.16'>mate-1.16</option> <option value='mate-1.18'>mate-1.18</option> <option value='mate-1.20'>mate-1.20</option> <option value='mate-1.22'>mate-1.22</option> </select> <input type='submit' value='switch'/></form></td></tr> <tr><td class='sub'>FreeBSD GNOME current development ports (https://github.com/freebsd/freebsd-ports-gnome)</td><td class='sub right'></td></tr></table> <table class='tabs'><tr><td> <a href='/~lantw44/cgit/cgit.cgi/freebsd-ports-gnome/about/?h=gnome-3.24'>about</a><a href='/~lantw44/cgit/cgit.cgi/freebsd-ports-gnome/?h=gnome-3.24'>summary</a><a href='/~lantw44/cgit/cgit.cgi/freebsd-ports-gnome/refs/?h=gnome-3.24&id=c158e26686ba6abe21f8b5b50d323ba3aa1b06cb'>refs</a><a class='active' href='/~lantw44/cgit/cgit.cgi/freebsd-ports-gnome/log/devel/swig30?h=gnome-3.24'>log</a><a href='/~lantw44/cgit/cgit.cgi/freebsd-ports-gnome/tree/devel/swig30?h=gnome-3.24&id=c158e26686ba6abe21f8b5b50d323ba3aa1b06cb'>tree</a><a href='/~lantw44/cgit/cgit.cgi/freebsd-ports-gnome/commit/devel/swig30?h=gnome-3.24&id=c158e26686ba6abe21f8b5b50d323ba3aa1b06cb'>commit</a><a href='/~lantw44/cgit/cgit.cgi/freebsd-ports-gnome/diff/devel/swig30?h=gnome-3.24&id=c158e26686ba6abe21f8b5b50d323ba3aa1b06cb'>diff</a><a href='/~lantw44/cgit/cgit.cgi/freebsd-ports-gnome/stats/devel/swig30?h=gnome-3.24'>stats</a></td><td class='form'><form class='right' method='get' action='/~lantw44/cgit/cgit.cgi/freebsd-ports-gnome/log/devel/swig30'> <input type='hidden' name='h' value='gnome-3.24'/><input type='hidden' name='id' value='c158e26686ba6abe21f8b5b50d323ba3aa1b06cb'/><select name='qt'> <option value='grep'>log msg</option> <option value='author'>author</option> <option value='committer'>committer</option> <option value='range'>range</option> </select> <input class='txt' type='search' size='10' name='q' value=''/> <input type='submit' value='search'/> </form> </td></tr></table> <div class='path'>path: <a href='/~lantw44/cgit/cgit.cgi/freebsd-ports-gnome/log/?h=gnome-3.24&id=c158e26686ba6abe21f8b5b50d323ba3aa1b06cb'>root</a>/<a href='/~lantw44/cgit/cgit.cgi/freebsd-ports-gnome/log/devel?h=gnome-3.24&id=c158e26686ba6abe21f8b5b50d323ba3aa1b06cb'>devel</a>/<a href='/~lantw44/cgit/cgit.cgi/freebsd-ports-gnome/log/devel/swig30?h=gnome-3.24&id=c158e26686ba6abe21f8b5b50d323ba3aa1b06cb'>swig30</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/~lantw44/cgit/cgit.cgi/freebsd-ports-gnome/log/devel/swig30?h=gnome-3.24&id=c158e26686ba6abe21f8b5b50d323ba3aa1b06cb&showmsg=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Age</th><th class='left'>Files</th><th class='left'>Lines</th></tr> <tr><td class='commitgraph'>* </td><td><a href='/~lantw44/cgit/cgit.cgi/freebsd-ports-gnome/commit/devel/swig30?h=gnome-3.24&id=d83ce2d2de7512571b59cf91e80bcc8c5aa65681'>- Cleanup Makefile</a></td><td>sunpoet</td><td><span title='2014-07-08 13:44:31 +0800'>2014-07-08</span></td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+0</span></td></tr>