[parrot/parrot] 330464: Merge branch 'master' into green_threads
noreply at github.com
noreply at github.com
Sun Oct 30 23:08:17 UTC 2011
Branch: refs/heads/threads
Home: https://github.com/parrot/parrot
Commit: 3304649e3d01942a8c50fb8d667627beb9d0d190
https://github.com/parrot/parrot/commit/3304649e3d01942a8c50fb8d667627beb9d0d190
Author: Stefan Seifert <nine at detonation.org>
Date: 2011-10-27 (Thu, 27 Oct 2011)
Changed paths:
M src/pmc/bytebuffer.pmc
M t/op/stringu.t
Log Message:
-----------
Merge branch 'master' into green_threads
Commit: ef81591ab1f8b8250911614f436db0c96efb6f09
https://github.com/parrot/parrot/commit/ef81591ab1f8b8250911614f436db0c96efb6f09
Author: Stefan Seifert <nine at detonation.org>
Date: 2011-10-27 (Thu, 27 Oct 2011)
Changed paths:
M src/gc/mark_sweep.c
M src/scheduler.c
Log Message:
-----------
Merge branch 'green_threads' of github.com:niner/parrot into green_threads
Commit: c42a812524e6ea654493c65ed1c514641a5dbd11
https://github.com/parrot/parrot/commit/c42a812524e6ea654493c65ed1c514641a5dbd11
Author: Stefan Seifert <nine at detonation.org>
Date: 2011-10-28 (Fri, 28 Oct 2011)
Changed paths:
M include/parrot/interpreter.h
M include/parrot/scheduler_private.h
M src/extend.c
M src/interp/inter_cb.c
M src/ops/core_ops.c
M src/ops/experimental.ops
M src/pmc/pmclist.pmc
M src/pmc/task.pmc
Log Message:
-----------
Merge branch 'green_threads' of git://github.com/parrot/parrot into green_threads
Commit: a781129633c1e13aba59970067aef683fa121dd1
https://github.com/parrot/parrot/commit/a781129633c1e13aba59970067aef683fa121dd1
Author: Stefan Seifert <nine at detonation.org>
Date: 2011-10-28 (Fri, 28 Oct 2011)
Changed paths:
M config/gen/makefiles/root.in
Log Message:
-----------
Add a missing dependency to makefiles/root.in
Commit: 99c76810bc6adffc18b0a4e89ad10caa8aec5743
https://github.com/parrot/parrot/commit/99c76810bc6adffc18b0a4e89ad10caa8aec5743
Author: Stefan Seifert <nine at detonation.org>
Date: 2011-10-28 (Fri, 28 Oct 2011)
Changed paths:
M src/pmc/task.pmc
Log Message:
-----------
Remove unused abort_jump from task.pmc
task.pmc contained a Parrot_jumb_buff that was used for setjmp in invoke
but never actually got longjumped to. Remove it to save some memory.
Commit: 59adfe51b0af5598590ea9c154ddbe84ca680b90
https://github.com/parrot/parrot/commit/59adfe51b0af5598590ea9c154ddbe84ca680b90
Author: Stefan Seifert <nine at detonation.org>
Date: 2011-10-28 (Fri, 28 Oct 2011)
Log Message:
-----------
Merge branch 'green_threads' of git://github.com/parrot/parrot into green_threads
Conflicts:
config/gen/makefiles/root.in
Commit: 4cda54ab11c9034a2bd8da9e5e94e5707636a944
https://github.com/parrot/parrot/commit/4cda54ab11c9034a2bd8da9e5e94e5707636a944
Author: Stefan Seifert <nine at detonation.org>
Date: 2011-10-28 (Fri, 28 Oct 2011)
Changed paths:
M include/parrot/scheduler.h
M src/scheduler.c
Log Message:
-----------
Merge branch 'green_threads' of git://github.com/parrot/parrot into green_threads
Commit: 9764c26631bccf522407f9d83a1277003cf7469c
https://github.com/parrot/parrot/commit/9764c26631bccf522407f9d83a1277003cf7469c
Author: Stefan Seifert <nine at detonation.org>
Date: 2011-10-28 (Fri, 28 Oct 2011)
Changed paths:
M include/parrot/scheduler.h
M src/interp/inter_misc.c
M src/ops/core_ops.c
M src/ops/experimental.ops
M src/pmc/scheduler.pmc
M src/pmc/task.pmc
M src/scheduler.c
Log Message:
-----------
Merge branch 'green_threads' of git://github.com/parrot/parrot into green_threads
Commit: cf956a71b738f0cd99d9598b4a4b93b3e5d9d1b2
https://github.com/parrot/parrot/commit/cf956a71b738f0cd99d9598b4a4b93b3e5d9d1b2
Author: Stefan Seifert <nine at detonation.org>
Date: 2011-10-28 (Fri, 28 Oct 2011)
Changed paths:
M include/parrot/scheduler.h
M include/parrot/scheduler_private.h
M src/interp/inter_create.c
M src/scheduler.c
Log Message:
-----------
Remove obsolete Parrot_cx_runloop_end
Commit: ada4f4768f7869125e6ff5028cc18593f53bfc02
https://github.com/parrot/parrot/commit/ada4f4768f7869125e6ff5028cc18593f53bfc02
Author: Stefan Seifert <nine at detonation.org>
Date: 2011-10-28 (Fri, 28 Oct 2011)
Changed paths:
M src/scheduler.c
Log Message:
-----------
Fix POD in src/scheduler.c
Commit: 2dec391c495dfbf04f4e6a53741ee933bc2c0bb4
https://github.com/parrot/parrot/commit/2dec391c495dfbf04f4e6a53741ee933bc2c0bb4
Author: Stefan Seifert <nine at detonation.org>
Date: 2011-10-29 (Sat, 29 Oct 2011)
Changed paths:
M MANIFEST
M config/gen/makefiles/root.in
A include/parrot/atomic.h
A include/parrot/atomic/fallback.h
A include/parrot/atomic/gcc_pcc.h
A include/parrot/atomic/gcc_x86.h
A include/parrot/atomic/sparc.h
M include/parrot/parrot.h
A include/parrot/thr_none.h
A include/parrot/thr_pthread.h
A include/parrot/thr_windows.h
A include/parrot/thread.h
A src/atomic/gcc_x86.c
A src/atomic/sparc_v9.s
A src/thread.c
Log Message:
-----------
Bring back the OS threading abstractions
Commit: ad7c0a690c4cf7dd011d86c21c8c19a4429e26b9
https://github.com/parrot/parrot/commit/ad7c0a690c4cf7dd011d86c21c8c19a4429e26b9
Author: Stefan Seifert <nine at detonation.org>
Date: 2011-10-29 (Sat, 29 Oct 2011)
Changed paths:
M include/parrot/scheduler_private.h
M src/scheduler.c
Log Message:
-----------
Move preemption_enabled to a scheduler.pmc private flag
Commit: e05858ca4f37f72094979017e9faa4f33d756f13
https://github.com/parrot/parrot/commit/e05858ca4f37f72094979017e9faa4f33d756f13
Author: Stefan Seifert <nine at detonation.org>
Date: 2011-10-30 (Sun, 30 Oct 2011)
Changed paths:
M include/parrot/runcore_api.h
M src/alarm.c
M src/ops/core.ops
M src/ops/core_ops.c
M src/pmc/parrotinterpreter.pmc
M src/pmc/scheduler.pmc
M src/pmc/task.pmc
M src/runcore/main.c
M src/scheduler.c
Log Message:
-----------
Merge branch 'green_threads' of git://github.com/parrot/parrot into green_threads
Commit: b6d2e1ad77dfd9f92484884880a1d724f862f6df
https://github.com/parrot/parrot/commit/b6d2e1ad77dfd9f92484884880a1d724f862f6df
Author: Stefan Seifert <nine at detonation.org>
Date: 2011-10-30 (Sun, 30 Oct 2011)
Changed paths:
M include/parrot/scheduler_private.h
M src/pmc/scheduler.pmc
M src/pmc/task.pmc
M src/scheduler.c
Log Message:
-----------
Move preemption_enabled and scheduling_enabled to scheduler.pmc private flags
Conflicts:
src/scheduler.c
Commit: 0ee9c328c7b77ea02faf965779dc4f732ef32741
https://github.com/parrot/parrot/commit/0ee9c328c7b77ea02faf965779dc4f732ef32741
Author: Stefan Seifert <nine at detonation.org>
Date: 2011-10-30 (Sun, 30 Oct 2011)
Changed paths:
M ChangeLog
R DEPRECATED-branch.pod
M MANIFEST
M compilers/imcc/pbc.c
M frontend/pbc_dump/packdump.c
M src/pmc/integer.pmc
Log Message:
-----------
Merge branch 'master' into green_threads
Commit: 97f9d9775a09eeee9095beb68284a48c4a8750e5
https://github.com/parrot/parrot/commit/97f9d9775a09eeee9095beb68284a48c4a8750e5
Author: Stefan Seifert <nine at detonation.org>
Date: 2011-10-30 (Sun, 30 Oct 2011)
Changed paths:
M ChangeLog
R DEPRECATED-branch.pod
M MANIFEST
M compilers/imcc/pbc.c
M frontend/pbc_dump/packdump.c
M include/parrot/runcore_api.h
M include/parrot/scheduler_private.h
M src/alarm.c
M src/ops/core.ops
M src/ops/core_ops.c
M src/pmc/integer.pmc
M src/pmc/parrotinterpreter.pmc
M src/pmc/task.pmc
M src/runcore/main.c
M src/scheduler.c
Log Message:
-----------
Merge branch 'green_threads' into threads
Conflicts:
include/parrot/scheduler_private.h
src/scheduler.c
Commit: 7c08e97948894b49fe5b520e47097fd567e159f3
https://github.com/parrot/parrot/commit/7c08e97948894b49fe5b520e47097fd567e159f3
Author: Stefan Seifert <nine at detonation.org>
Date: 2011-10-30 (Sun, 30 Oct 2011)
Changed paths:
M include/parrot/thread.h
M src/thread.c
Log Message:
-----------
Resurrect a couple of threading functions
Compare: https://github.com/parrot/parrot/compare/3304649^...7c08e97
More information about the parrot-commits
mailing list