[Lldb-commits] [lldb] r154609 - in /lldb/branches/lldb-platform-work: ./ examples/darwin/heap_find/ include/lldb/Target/ source/Expression/ source/Plugins/Process/FreeBSD/ source/Plugins/Process/Linux/ source/Plugins/Process/POSIX/ source/Plugins/Proc

[Viktor Kutuzov]

Hi Johnny,

I was able to build without any errors with your changes on FreeBSD9, but there are few little moments:
1. the 'virtual uint32_t UpdateThreadListIfNeeded()' method should be removed in ProcessPOSIX.h/.cpp
2. in the ProcessPOSIX::UpdateThreadList/ProcessFreeBSD::UpdateThreadList methods - those methods must return true if the new list was actually updated in comparision with the old one. The merged code breaks this behaviour and the methods always return true now (please look at "return new_thread_list.GetSize(false) > 0;"). The other (previous) version had a correct behaviour.

Thanks.
Viktor.

-----Original Message-----
From: lldb-commits-bounces at cs.uiuc.edu [mailto:lldb-commits-bounces at cs.uiuc.edu] On Behalf Of Johnny Chen
Sent: Thursday, April 12, 2012 1:09 PM
To: lldb-commits at cs.uiuc.edu
Subject: [Lldb-commits] [lldb] r154609 - in /lldb/branches/lldb-platform-work: ./ examples/darwin/heap_find/ include/lldb/Target/ source/Expression/ source/Plugins/Process/FreeBSD/ source/Plugins/Process/Linux/ source/Plugins/Process/POSIX/ source/Plugins/Proce...

Author: johnny
Date: Thu Apr 12 15:08:46 2012
New Revision: 154609

URL: http://llvm.org/viewvc/llvm-project?rev=154609&view=rev
Log:
Merge goodies from ToT, and resolved some conflicts:

1. source/Plugins/Process/POSIX/ProcessPOSIX.cpp
2. source/Plugins/Process/POSIX/ProcessPOSIX.h
3. source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp

FreeBSD folks: if I resolved the conflicts wrong, please let me know.  Thanks!

svn merge -r 154573:154603 https://johnny@llvm.org/svn/llvm-project/lldb/trunk .

Modified:
    lldb/branches/lldb-platform-work/   (props changed)
    lldb/branches/lldb-platform-work/examples/darwin/heap_find/heap.py
    lldb/branches/lldb-platform-work/examples/darwin/heap_find/heap_find.cpp
    lldb/branches/lldb-platform-work/include/lldb/Target/Process.h
    lldb/branches/lldb-platform-work/source/Expression/ClangExpressionDeclMap.cpp
    lldb/branches/lldb-platform-work/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
    lldb/branches/lldb-platform-work/source/Plugins/Process/Linux/ProcessLinux.cpp
    lldb/branches/lldb-platform-work/source/Plugins/Process/Linux/ProcessLinux.h
    lldb/branches/lldb-platform-work/source/Plugins/Process/POSIX/ProcessPOSIX.cpp
    lldb/branches/lldb-platform-work/source/Plugins/Process/POSIX/ProcessPOSIX.h
    lldb/branches/lldb-platform-work/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
    lldb/branches/lldb-platform-work/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h
    lldb/branches/lldb-platform-work/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
    lldb/branches/lldb-platform-work/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
    lldb/branches/lldb-platform-work/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
    lldb/branches/lldb-platform-work/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
    lldb/branches/lldb-platform-work/source/Target/Process.cpp