[parrot/parrot] a54a58: Merge remote-tracking branch 'origin/master' into ...

GitHub noreply at github.com
Sat Sep 15 12:15:00 UTC 2012


  Branch: refs/heads/threads
  Home:   https://github.com/parrot/parrot
  Commit: a54a581d2392a885c70093349382b5da696ec4dd
      https://github.com/parrot/parrot/commit/a54a581d2392a885c70093349382b5da696ec4dd
  Author: Reini Urban <rurban at cpanel.net>
  Date:   2012-09-06 (Thu, 06 Sep 2012)

  Changed paths:
    M .gitignore
    M ChangeLog
    M Configure.pl
    M MANIFEST
    M MANIFEST.SKIP
    M MANIFEST.generated
    M PBC_COMPAT
    M config/auto/arch.pm
    M config/auto/pmc.pm
    M config/auto/sizes.pm
    M config/auto/warnings.pm
    M config/gen/config_pm/config_pir.in
    M config/gen/core_pmcs.pm
    M config/gen/makefiles/root.in
    M config/init/hints.pm
    M config/init/hints/mswin32.pm
    M config/init/hints/vms.pm
    M config/init/manifest.pm
    M examples/library/md5sum.pir
    M examples/pir/io.pir
    M examples/tutorial/40_file_ops.pir
    M frontend/parrot/main.c
    M frontend/pbc_dump/main.c
    M lib/Parrot/Configure/Compiler.pm
    M lib/Parrot/Configure/Messages.pm
    M lib/Parrot/Configure/Utils.pm
    M lib/Parrot/IO/File.pm
    M lib/Parrot/Test.pm
    M runtime/parrot/library/TAP/Parser.pir
    M runtime/parrot/library/osutils.pir
    M runtime/parrot/library/parrotlib.pir
    M src/dynpmc/Defines.in
    M src/dynpmc/Rules.in
    M src/dynpmc/os.pmc
    M src/io/utilities.c
    M src/platform/win32/io.c
    M src/pmc/float.pmc
    M src/pmc/integer.pmc
    A src/pmc/os.pmc
    M t/codingstd/filenames.t
    M t/codingstd/pccmethod_deps.t
    M t/compilers/opsc/02-parse-all-ops.t
    M t/dynoplibs/io.t
    M t/dynpmc/file.t
    M t/dynpmc/gziphandle.t
    R t/dynpmc/os.t
    R t/dynpmc/os_unicode.t
    M t/library/nciutils.t
    M t/native_pbc/integer_1.pbc
    M t/native_pbc/integer_2.pbc
    M t/native_pbc/integer_4.pbc
    M t/native_pbc/number_1.pbc
    M t/native_pbc/number_2.pbc
    M t/native_pbc/number_4.pbc
    M t/native_pbc/string_1.pbc
    M t/native_pbc/string_2.pbc
    M t/native_pbc/string_4.pbc
    A t/native_pbc/testdata/integer.pasm
    M t/oo/methods.t
    M t/perl/Parrot_IO.t
    M t/pmc/filehandle.t
    M t/pmc/nci.t
    A t/pmc/os.t
    A t/pmc/os_unicode.t
    M t/src/extend_vtable.t
    M t/steps/gen/makefiles-01.t
    M tools/dev/dedeprecator.nqp
    M tools/dev/mk_native_pbc
    M tools/dev/pbc_to_exe.winxed
    M tools/release/update_version.pl

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into threads


  Commit: cac1aa648a0ff5ef059678fff9ebee72623c6867
      https://github.com/parrot/parrot/commit/cac1aa648a0ff5ef059678fff9ebee72623c6867
  Author: Whiteknight <wknight8111 at gmail.com>
  Date:   2012-09-15 (Sat, 15 Sep 2012)

  Changed paths:
    M include/parrot/alarm.h
    M include/parrot/thread.h
    M src/alarm.c
    M src/dynpmc/Defines.in
    M src/dynpmc/Rules.in
    M src/pmc/task.pmc
    M src/thread.c

  Log Message:
  -----------
  Merge branch 'threads' of github.com:parrot/parrot into threads


  Commit: 51d178acdf721b2777c361d1c398d084b9a375c9
      https://github.com/parrot/parrot/commit/51d178acdf721b2777c361d1c398d084b9a375c9
  Author: Whiteknight <wknight8111 at gmail.com>
  Date:   2012-09-15 (Sat, 15 Sep 2012)

  Changed paths:
    M include/parrot/call.h
    M src/call/context.c
    M src/pmc/sub.pmc

  Log Message:
  -----------
  If we're using a Proxied CallContext as the outer ctx of a closure scheduled as a Task on a new thread, we need to de-proxy it. Create a dummy empty CallContext to serve in place of the Proxy. This fixes a segfault/assert_fail pointed out by tadzik++, although the behavior of his example is still not 100% as expected


Compare: https://github.com/parrot/parrot/compare/d351afeabff9...51d178acdf72


More information about the parrot-commits mailing list