Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nonidem2.0 -- merge non-idempotent branch once it is fixed #96

Open
wants to merge 17 commits into
base: master
Choose a base branch
from

Conversation

rrnewton
Copy link
Member

I think we can actually ignore #93, and do the merge here on the 2.0 line. This thing has gotten lousy with merges. It might be worth rebasing (or reformulating just the core patch to the scheduler module in a less invasive way).

However, before any of that ... we need to get it working! As written in the DEVLOG below, I'm currently seeing a bunch of lovelocks / timeouts:

      v3b: [Failed]
    ERROR: <<timeout>>

aturon and others added 16 commits October 19, 2013 09:24
Conflicts:
	haskell/lvish/Control/LVish.hs
	haskell/lvish/Control/LVish/Sched.hs
	haskell/lvish/Data/LVar/IVar.hs
	haskell/lvish/Data/LVar/PureMap.hs
	haskell/lvish/Data/LVar/SLMap.hs
	haskell/lvish/lvish.cabal
	haskell/lvish/tests/LVishAndIVar.hs
It is still controlled by a dynamic flag, however.
Conflicts:
	haskell/lvish/Control/LVish/Sched.hs
Still seeing problematic failures on v9f for instance.
Conflicts:
	haskell/lvish/Control/LVish/Basics.hs
	haskell/lvish/Control/LVish/Sched.hs
	haskell/lvish/Control/LVish/SchedQueue.hs
	haskell/lvish/lvish.cabal
	haskell/lvish/tests/SkipListTests.hs
Conflicts:
	haskell/DEVLOG.md
	haskell/lvish/Control/LVish/Sched.hs
	haskell/lvish/Control/LVish/SchedQueue.hs
	haskell/lvish/lvish.cabal
Conflicts:
	haskell/DEVLOG.md
	haskell/lvish/Control/LVish/Sched.hs
	haskell/lvish/lvish.cabal
	haskell/lvish/tests/ArrayTests.hs
Conflicts:
	haskell/lvish/Control/LVish.hs
	haskell/lvish/Control/LVish/DeepFrz.hs
	haskell/lvish/Data/LVar/Generic/Internal.hs
	haskell/lvish/Data/LVar/IStructure.hs
	haskell/lvish/Data/LVar/IVar.hs
	haskell/lvish/Data/LVar/Internal/Pure.hs
	haskell/lvish/tests/ArrayTests.hs
This is a PAINFUL merge because git failed to track the moved files here.
A simple refactor on the upstream has made this more difficult.  This is in
addition to the file renames that happened on the nonidem branch in the first place.

After manually fixing things up, this rev builds and can run tests.  But there are significant timeout failures!!!

Conflicts:
	haskell/lvish/Control/LVish.hs
	haskell/lvish/Control/LVish/Basics.hs
	haskell/lvish/Control/LVish/DeepFrz.hs
	haskell/lvish/Control/LVish/Internal.hs
	haskell/lvish/Control/LVish/Logical.hs
	haskell/lvish/Control/LVish/Sched.hs
	haskell/lvish/Control/LVish/SchedIdempotent.hs
	haskell/lvish/Control/LVish/Unsafe.hs
	haskell/lvish/Data/LVar/Counter.hs
	haskell/lvish/Data/LVar/CycGraph.hs
	haskell/lvish/Data/LVar/Generic/Internal.hs
	haskell/lvish/Data/LVar/IStructure.hs
	haskell/lvish/Data/LVar/IVar.hs
	haskell/lvish/Data/LVar/Internal/Pure.hs
	haskell/lvish/Data/LVar/LayeredSatMap.hs
	haskell/lvish/Data/LVar/NatArray.hs
	haskell/lvish/Data/LVar/PNCounter.hs
	haskell/lvish/Data/LVar/Pair.hs
	haskell/lvish/Data/LVar/PureMap.hs
	haskell/lvish/Data/LVar/PureMap/Unsafe.hs
	haskell/lvish/Data/LVar/PureSet.hs
	haskell/lvish/Data/LVar/SLMap.hs
	haskell/lvish/Data/LVar/SLSet.hs
	haskell/lvish/Data/LVar/SatMap.hs
	haskell/lvish/Experimental/BitArray.hs
	haskell/lvish/Internal/Control/LVish/SchedIdempotent.hs
	haskell/lvish/lvish.cabal
	haskell/lvish/tests/ArrayTests.hs
	haskell/lvish/tests/LVishAndIVar.hs
	haskell/lvish/tests/SNZITests.hs
	haskell/lvish/tests/SkipListTests.hs
@rrnewton rrnewton changed the title Nonidem2.0 Nonidem2.0 -- merge non-idempotent branch once its fixed Oct 26, 2014
Conflicts:
	haskell/DEVLOG.md
@rrnewton rrnewton changed the title Nonidem2.0 -- merge non-idempotent branch once its fixed Nonidem2.0 -- merge non-idempotent branch once it is fixed Oct 26, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants