[Bro-Dev] [Auto] Merge Status
Open Merge Requests === IDComponentReporterAssignee Updated For Version PrioritySummary --- -- -- - -- --- BIT-1093 [1] Bro Jon Siwek Robin Sommer 2013-10-292.2 Normal topic/jsiwek/thread-termination [2] Open Fastpath Commits == Commit ComponentAuthor DateSummary --- --- --- -- 7c7967c [3] bro Jon Siwek2013-10-29 Don't build broccoli ruby bindings by default, use --enable- b2d6ccf [4] bro Jon Siwek2013-10-29 Revert Fix race condition in unit test. b255aed [5] bro Jon Siwek2013-10-28 Fix race condition in unit test. 31c7c1a [6] bro Vlad Grigorescu 2013-10-28 Change percent_lost in capture-loss from a string to a doubl bffe5a6 [7] broccoli Jon Siwek2013-10-29 Don't build ruby bindings by default, use --enable-ruby to d [1] BIT-1093https://bro-tracker.atlassian.net/browse/BIT-1093 [2] thread-termination https://github.com/bro/bro/tree/topic/jsiwek/thread-termination [3] 7c7967c https://github.com/bro/bro/commit/7c7967c1ab6379369575c60825437f701dece5e2 [4] b2d6ccf https://github.com/bro/bro/commit/b2d6ccfb195c0a7f9f92ab2b3a1d693483fa08de [5] b255aed https://github.com/bro/bro/commit/b255aedc26ec09d0eca7c83b94d2b4c7996676e8 [6] 31c7c1a https://github.com/bro/bro/commit/31c7c1a6737ddf8bc9b6537459f617ea57c0b799 [7] bffe5a6 https://github.com/bro/broccoli/commit/bffe5a6d06d3da29e4c17f8d5b1e919848b0c848 ___ bro-dev mailing list bro-dev@bro.org http://mailman.icsi.berkeley.edu/mailman/listinfo/bro-dev
[Bro-Dev] [JIRA] (BIT-1093) topic/jsiwek/thread-termination
[ https://bro-tracker.atlassian.net/browse/BIT-1093?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14500#comment-14500 ] Robin Sommer commented on BIT-1093: --- I looked up when the original {{ ! Killed()}} code got introduced, that was in 743fc1680dc9d4c04f38ca80c7ef4e5b88e8f4cb and the commit message points to BIT-858. Can you take a look and double-check that the problem described there is still addressed with the new version to be sure we don't introduce a regression? (Not immediately sure if we have a test that covers that). topic/jsiwek/thread-termination --- Key: BIT-1093 URL: https://bro-tracker.atlassian.net/browse/BIT-1093 Project: Bro Issue Tracker Issue Type: Problem Components: Bro Affects Versions: git/master Reporter: Jon Siwek Assignee: Robin Sommer Fix For: 2.2 The change in this branch should fix the case where the last remaining done/killed thread never got processed (main thread never received pending messages from it or joined/deleted it) until Bro terminates. Which was problematic if the termination condition depended on processing messages from the last remaining thread. The new code's logic is contrary to what it used to be, but I can't figure out what the old was trying to accomplish and think it could only have caused problems. -- This message was sent by Atlassian JIRA (v6.2-OD-01#6204) ___ bro-dev mailing list bro-dev@bro.org http://mailman.icsi.berkeley.edu/mailman/listinfo/bro-dev
[Bro-Dev] [JIRA] (BIT-1093) topic/jsiwek/thread-termination
[ https://bro-tracker.atlassian.net/browse/BIT-1093?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Robin Sommer updated BIT-1093: -- Status: Reopened (was: Closed) topic/jsiwek/thread-termination --- Key: BIT-1093 URL: https://bro-tracker.atlassian.net/browse/BIT-1093 Project: Bro Issue Tracker Issue Type: Problem Components: Bro Affects Versions: git/master Reporter: Jon Siwek Assignee: Robin Sommer Fix For: 2.2 The change in this branch should fix the case where the last remaining done/killed thread never got processed (main thread never received pending messages from it or joined/deleted it) until Bro terminates. Which was problematic if the termination condition depended on processing messages from the last remaining thread. The new code's logic is contrary to what it used to be, but I can't figure out what the old was trying to accomplish and think it could only have caused problems. -- This message was sent by Atlassian JIRA (v6.2-OD-01#6204) ___ bro-dev mailing list bro-dev@bro.org http://mailman.icsi.berkeley.edu/mailman/listinfo/bro-dev
[Bro-Dev] [JIRA] (BIT-1093) topic/jsiwek/thread-termination
[ https://bro-tracker.atlassian.net/browse/BIT-1093?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14503#comment-14503 ] Jon Siwek commented on BIT-1093: {{testing/btst/scripts/base/frameworks/input/missing-file.bro}} seems to at least be checking part of the problem mentioned in BIT-858. And I don't think that this conflicts with what was addressed there. Here's an abbreviated history of thread termination: 743fc1680dc9d4c04f38ca80c7ef4e5b88e8f4cb - threading::Manager::Process() and threading::Manager::NextTimestamp() both check for {{ ! t-Killed()}} - The assumption is that you're not allowed to read from a dead thread's queue and threads are only cleaned up in threading::Manager::Terminate() 38e1dc9ca47d97508276a2f7192c5353bb8e6837 - threading::Manager::Process() can now also clean up dead threads b947394990720032ac7f374f7c9d1902ed4485b9 - Reading from a dead thread's queue is now supported - {{ ! t-Killed()}} check is removed from threading::Manager::Process() to allow flushing out a dead thread's queue before cleaning it up, but the check still remains in threading::Manager::NextTimestamp() To me, looks like the NextTimestamp code just didn't evolve w/ the rest. topic/jsiwek/thread-termination --- Key: BIT-1093 URL: https://bro-tracker.atlassian.net/browse/BIT-1093 Project: Bro Issue Tracker Issue Type: Problem Components: Bro Affects Versions: git/master Reporter: Jon Siwek Assignee: Robin Sommer Fix For: 2.2 The change in this branch should fix the case where the last remaining done/killed thread never got processed (main thread never received pending messages from it or joined/deleted it) until Bro terminates. Which was problematic if the termination condition depended on processing messages from the last remaining thread. The new code's logic is contrary to what it used to be, but I can't figure out what the old was trying to accomplish and think it could only have caused problems. -- This message was sent by Atlassian JIRA (v6.2-OD-01#6204) ___ bro-dev mailing list bro-dev@bro.org http://mailman.icsi.berkeley.edu/mailman/listinfo/bro-dev