Branch: refs/heads/master
  Home:   https://github.com/tarantool/tarantool
  Commit: 132cb94bf1cf20c8bff4f8fe35a788c94943128e
      
https://github.com/tarantool/tarantool/commit/132cb94bf1cf20c8bff4f8fe35a788c94943128e
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    M src/lua/init.cc
    M test/box/fiber.result
    M test/box/fiber.test

  Log Message:
  -----------
  A fix and a test case for gh-131

Fix a hang on box.fiber.resume() of an attached fiber which gets
cancelled.
When the child fiber got cancelled before detach, the parent
never was woken up, and would hang forever.
Wake up the parent, and, in the parent, do not try to access
a dead fiber.


  Commit: b18c90c0889993e77683443a959b5226b82361c2
      
https://github.com/tarantool/tarantool/commit/b18c90c0889993e77683443a959b5226b82361c2
  Author: Konstantin Osipov <[email protected]>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    M src/lua/fiber.cc
    M test/box/fiber.result
    M test/box/fiber.test.lua

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/stable'

Conflicts:
        src/lua/init.cc
        test/box/fiber.result
        test/box/fiber.test


Compare: 
https://github.com/tarantool/tarantool/compare/ed5c90de059c...b18c90c08899
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help   : https://help.launchpad.net/ListHelp

Reply via email to