Merging Sources

[Tom Brubaker]

Did anybody else have trouble merging the p4 distribution with old sources?
I foolishly thought I could get away with handling this manually, but now
I'm getting in over my head.

I tried merging p4 with p2 using the exact same steps as for p3, but it
halts at the TODO for finding a runnable thread. This makes me think that,
despite the project description, we need to merge with project 3. But since
project 3 is itself a result of having merged some sources, I'm not really
sure how to go about this. Do I need to patch for 2 and then patch for 3?

Can anyone share some enlightenment?

-Tom-

[David Hershey]

The scheduling code is the same for P2 base and P2 solution, so diff
will report no differences. Consequently, nothing gets patched into
your P4 source as far as scheduling goes. To get mine running for the
intermediate submission, I simply copy/pasted that code manually (I
believe you're hitting that TODO in Get_Next_Runnable). If you use P2
scheduling, you will need to either change s_runQueue such that it is no
longer an array, or modify the code to only reference the 0th element.

Keep in mind this information is how I approached my intermediate
submission (i.e. no guarantees further down the line).