trunk/branch synchronization

4 views
Skip to first unread message

Mark Heily

unread,
Apr 28, 2012, 12:16:21 PM4/28/12
to libk...@googlegroups.com
There have been a lot of bug fixes recently to the stable branch that have not
made their way into the trunk. Here's my basic idea for fixing this:

1. Make a new stable release (v1.1) that includes all the recent bug fixes.
2. Create a new "v2" branch ^/branches/2 based on v1.1
3. Backport all of the "good" code from the trunk to the v2 branch.
4. Delete the current trunk and recreate it from the v2 branch.
5. Rename the current stable branch to ^/branches/1
6. Rename ^/branches/2 to ^/branches/stable

Not all of the code in the trunk will be backported. I'm going to throw away
the attempt to do fine-grained locking at the knote-level. This was a
premature optimization, as I have never done any profiling to demonstrate that
there is significant contention for the kqueue lock. This is something we
could revisit in the future if new information came to light.

Until this is done, there will be a code freeze for the trunk.

- Mark

Reply all
Reply to author
Forward
0 new messages