aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Adding support for 64-bit Windows modules to ms_symbol_server_converter.ivan.penkov@gmail.com2014-04-1012-684/+872
| | | | | | | | | | | | | | | | As part of that: - Updated MSSymbolServerConverter to also download the executable files from the symbol server and pass them to the PDBSourceLineWriter as it is required for successful conversion of symbols for 64-bit modules. - Added a .gyp file and target for the ms_symbol_server_converter library. - Updated PDBSourceLineWriter to allow executable files to be in locations different from the locations of the PDB files. - Minor style issue: * #define guards. * No space before ')' and after '('. R=mark@chromium.org, wfh@chromium.org Review URL: https://breakpad.appspot.com/1434002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1309 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Moving directory 'build' one level up as it collides with a file named ↵ivan.penkov@gmail.com2014-04-1016-10/+1456
| | | | | | | | | | 'BUILD' which happens to be in that same location in the Google source depot. R=chrisha@chromium.org, mark@chromium.org Review URL: https://breakpad.appspot.com/1504002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1308 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Increase Breakpad's signal handler stack size.rmcilroy@chromium.org2014-04-091-1/+1
| | | | | | | | | | | | Some unittests fail on Android (both on Arm and Arm64) without this stack size increase. BUG=354405,335641 R=mark@chromium.org Review URL: https://breakpad.appspot.com/1484002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1307 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Fix aarch64 ucontext layout on Androidrmcilroy@chromium.org2014-04-094-9/+23
| | | | | | | | | BUG=354405,335641 R=mark@chromium.org Review URL: https://breakpad.appspot.com/1444002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1306 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Add Arm64 support to breakpad unittests.rmcilroy@chromium.org2014-04-084-12/+10
| | | | | | | | | BUG=354405,335641 R=mark@chromium.org Review URL: https://breakpad.appspot.com/1424002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1305 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Move build configuration to root of repository.chrisha@chromium.org2014-04-0316-1487/+19
| | | | | | | | | | | This is in preparation for creating GYP build files for each platform. BUG=https://code.google.com/p/google-breakpad/issues/detail?id=575 R=mark@chromium.org Review URL: https://breakpad.appspot.com/1414002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1304 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Fix ElfCoreDumpTest.ValidCoreFile unit test.benchan@chromium.org2014-04-031-2/+5
| | | | | | | | | | | | | | | | | | | The ElfCoreDumpTest.ValidCoreFile unit test assumed that the number of NT_FPREGSET / NT_PRXFPREG notes in the core dump file equals to the number of threads of the crashed process. This assumption isn't always true as the kernel skips filling the NT_FPREGSET / NT_PRXFPREG note of a thread if the FPU state isn't available. The kernel indicates the availability of NT_FPREGSET / NT_PRXFPREG via the pr_fpvalid field of the NT_PRSTATUS note. This CL modifies the ElfCoreDumpTest.ValidCoreFile unit test to verify the number of NT_FPREGSET and NT_PRXFPREG notes based on the pr_fpvalid field of the NT_PRSTATUS notes. BUG=577 TEST=Run unit tests on x86 and x86_64 Linux platform. R=vapier@chromium.org Review URL: https://breakpad.appspot.com/1404002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1303 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Add Arm64 version of breakpad_getcontext for Android.rmcilroy@chromium.org2014-04-036-25/+140
| | | | | | | | | | | | This CL adds breakpad_getcontext support for Arm64 to Android. The assembly is based on getcontext.S in glibc. BUG=354405,335641 R=mark@chromium.org Review URL: https://breakpad.appspot.com/1384002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1302 4c0a9323-5329-0410-9bdc-e9ce6186880e
* First cut at adding arm64 Linux / Android support to Breakpad.rmcilroy@chromium.org2014-04-0216-19/+118
| | | | | | | | | | | | | | This is an initial attempt to add Arm64 (aarch64) support to Breakpad for Linux / Android platforms. This CL adds the Arm64 data structures, but does not yet implement the Android getcontext support or CPUFillFromThreadInfo / CPUFillFromUContext. BUG=354405,335641 R=mark@chromium.org Review URL: https://breakpad.appspot.com/1354002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1301 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Remove some unecessary Android system header definitions.rmcilroy@chromium.org2014-04-023-58/+6
| | | | | | | | | | | Newer NDKs include some additional headers needed by Breakpad, so we can remove these redefinitions. BUG=358831,335641,354405 R=mark@chromium.org Review URL: https://breakpad.appspot.com/1374002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1300 4c0a9323-5329-0410-9bdc-e9ce6186880e
* fix races in CrashGenerator::CreateChildCrashvapier@chromium.org2014-04-023-22/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current CreateChildCrash logic is racy when it comes to creating a crash dump for two reasons: The main thread that calls kill() on a different thread is guaranteed the signal will be *queued* when it returns, but not *delivered*. If the kernel doesn't automatically schedule the receiving thread, but instead lets the main thread run to the exit() call, then the signal never triggers a coredump and the whole process simply exits. The main thread is using kill() to try to deliver a signal to a specific thread, but that function is for sending signals to a process. That means the kernel is free to deliver the signal to any thread in the process and not just the one requested. This manifests itself as the pr_pid in the coredump not being the one expected. Instead, we must use tkill() with the tid (which we already took care of gathering) to deliver to a specific thread. These are a lot easier to see on a UMP system as contention is heavier. BUG=chromium:207918 TEST=`dumper_unittest` still passes, and doesn't flake out in a UMP system TEST=`linux_client_unittest` still passes R=benchan@chromium.org Review URL: https://breakpad.appspot.com/1304005 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1299 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Terminating FileID path when at maximum length. (Coverity)thestig@chromium.org2014-04-012-5/+4
| | | | | | | | | | | | | | If FileID was constructed with a path that was >= PATH_MAX then path_ was not terminated resulting in a possible buffer overrun when reading. BUG=573 A=cmumford@chromium.org Original code review: https://breakpad.appspot.com/1324002/ R=cmumford@chromium.org Review URL: https://breakpad.appspot.com/1334002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1295 4c0a9323-5329-0410-9bdc-e9ce6186880e
* GoogleCrashdumpUploader would leak instances of LibcurlWrapper (Coverity)thestig@chromium.org2014-04-012-2/+3
| | | | | | | | | | | | | | The GoogleCrashdumpUploader would create, but never destroy it's instance of LibcurlWrapper. BUG=574 A=cmumford@chromium.org Original code review: https://breakpad.appspot.com/1314002/ R=cmumford@chromium.org Review URL: https://breakpad.appspot.com/1344002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1294 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Make ARM64 detection consistent in chromium.mark@chromium.org2014-04-014-7/+7
| | | | | | | | | | | | | | This is to uniform ARM64 detection code in chromium. Use only __aarch64__ and don't look for __arm64__ at all. Patch by Primiano Tucci <primiano@chromium.org> BUG=chromium:354405, chromium:358092 Review URL: https://breakpad.appspot.com/1304002/ git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1293 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Ignore warning 4702 to avoid unreachable code error onwfh@chromium.org2014-03-261-1/+3
| | | | | | | | | | | | | | VS2013 stl when compiling with _HAS_EXCEPTIONS=0 See also https://crbug.com/346399 for background. BUG=540 R=mark@chromium.org, thestig@chromium.org TEST=update gyp to HEAD, generate MSVS2013 build files, verify breakpad compiles in Release. Review URL: https://breakpad.appspot.com/1284002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1292 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Check in new Windows binaries.wfh@chromium.org2014-03-262-0/+0
| | | | | | | | | | | | These binaries include recent changes to pdb_source_line_writer for emitting STACK CFI lines for 64bit PDBs. They were built using the GYP build files, MSVS 2013 and DIA SDK 12.0. R=mark@chromium.org, siggi@chromium.org Review URL: https://breakpad.appspot.com/1294002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1291 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Add support for Win64 stack unwind data as STACK CFIwfh@chromium.org2014-03-246-1/+4769
| | | | | | | | | | | | | | | | This is a copy of https://breakpad.appspot.com/1264002/ where code review took place. See https://bugzilla.mozilla.org/show_bug.cgi?id=548035 and https://code.google.com/p/chromium/issues/detail?id=115922 Credit to Mikhail I. Izmestev <izmmishao5@gmail.com> for original patch in https://breakpad.appspot.com/345002/ BUG=572 TEST=Run dump_syms_unittest after compiling dump_syms_regtest.cc with x64 toolchain R=mark@chromium.org Review URL: https://breakpad.appspot.com/1274002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1290 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Fix crash in Windows CrashGenerationServer from r1274.thestig@chromium.org2014-03-191-1/+1
| | | | | | | | R=cdn@chromium.org, mark@chromium.org Review URL: https://breakpad.appspot.com/1254002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1289 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Fix a bug in BreakpadController that prevented multiple report uploads per ↵ivan.penkov@gmail.com2014-03-191-4/+8
| | | | | | | | | | | | call to sendStoredCrashReports. Submitting this patch on behalf of Asher Segel-Brown. R=blundell@chromium.org, mark@chromium.org, qsr@chromium.org Review URL: https://breakpad.appspot.com/1234002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1288 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Trim unintentional whitespace and fix style nitsthestig@chromium.org2014-03-181-9/+9
| | | | | | | | | | Original review: https://breakpad.appspot.com/1204002/ A=mdempsky@chromium.org R=mdempsky@chromium.org Review URL: https://breakpad.appspot.com/1244002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1287 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Fixing compiler warnings:ivan.penkov@gmail.com2014-02-285-9/+9
| | | | | | | | | | | | - Building Breakpad in Xcode with arm64 architecture. - iOS Patches provided by: Ian Hickson and Greg Vance. R=mark@chromium.org Review URL: https://breakpad.appspot.com/1184003 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1286 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Initialize file descriptors to -1, not 0, in MachoWalker.mark@chromium.org2014-02-261-2/+2
| | | | | | | | R=ivan.penkov@gmail.com Review URL: https://breakpad.appspot.com/1174002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1284 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Update GTM and enable -Wundef and strict C++11 flags.dmaclach2014-02-266-101/+51
| | | | git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1283 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Fixup breakpad compile for Xcode 5.1 iOS releasedmaclach2014-02-244-9/+9
| | | | | | | | (https://breakpad.appspot.com/1154002/) git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1282 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Fix up ~14 warnings about 'Implicit conversion loses integer precision' on iOS.dmaclach2014-02-187-25/+29
| | | | git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1281 4c0a9323-5329-0410-9bdc-e9ce6186880e
* When the Breakpad.h header gets compiled by standard C compilersdmaclach2014-02-183-6/+15
| | | | | | | | | | (instead of C++) it gets upset about the default argument. Instead of using a default argument I split the function up into two separate functions. git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1280 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Make Linux ExceptionHandler::HandleSignal publicted.mielczarek@gmail.com2014-02-051-1/+3
| | | | | | A=Jed Davis <jld@mozilla.com> R=ted at https://breakpad.appspot.com/1114003/ git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1279 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Create a new tool to upload Mac system library symbols.rsesek@chromium.org2014-02-036-0/+815
| | | | | | | | R=andybons@chromium.org, mark@chromium.org Review URL: https://breakpad.appspot.com/1124002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1278 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Support statically-linked libcurl for HTTP uploads in Linuxmattdr.breakpad@gmail.com2014-01-291-1/+11
| | | | | | | | https://breakpad.appspot.com/1064002/ git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1277 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Windows: Fix 64-bit compitation of crash_generation_app.thestig@chromium.org2014-01-211-7/+1
| | | | | | | | | BUG=560 R=mark@chromium.org Review URL: https://breakpad.appspot.com/1104002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1276 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Fix missing semi-colons from r1267.thestig@chromium.org2014-01-171-3/+3
| | | | | | | | R=mark@chromium.org Review URL: https://breakpad.appspot.com/1094002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1275 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Refactor the Windows MinidumpGenerator interface to get rid of the overloads ↵cdn@chromium.org2014-01-175-260/+262
| | | | | | | | | | | | | | when generating dumps. All required params are now passed to the constructor and the various options are set through new methods. BUG=N/A TEST=Existing minidump generation tests R=mark@chromium.org Review URL: https://breakpad.appspot.com/1074002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1274 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Fix VS project generation for the crash generation app.cdn@chromium.org2014-01-171-0/+3
| | | | | | | | | | BUG=N/A TEST=N/A R=mark@chromium.org Review URL: https://breakpad.appspot.com/1084002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1273 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Submitting on bahalf of Michele Aiello.ivan.penkov@gmail.com2014-01-131-2/+3
| | | | | | | | | | | Fix Xcode 5.1 compilation issues. Moving a couple of variable under #ifdef to avoid build warnings. R=blundell@chromium.org, mark@chromium.org Review URL: https://breakpad.appspot.com/1054002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1272 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Add -[BreakpadController setParametersToAddAtUploadTime:] for iOS.blundell@chromium.org2014-01-134-9/+33
| | | | | | | | | | | | | | This provides the ability to add server parameters to a crash report when the report is uploaded. Patch by KiYun Roe <kiyun@chromium.org> BUG=558 R=blundell@chromium.org Review URL: https://breakpad.appspot.com/974002/ git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1271 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Don't do work inside assert(). Ever.mark@chromium.org2014-01-102-32/+26
| | | | | | | | | | | | | | | The Mac crash key manipulation code was intended to be thread-safe through the provision of a mutex. The mutex operations were done inside an assert(). assert() is a no-op in NDEBUG (release) builds. Therefore, in release builds, these operations were occurring without being protected by any mutex at all, and were nowhere near thread-safe. BUG=chromium:331268 R=rsesek@chromium.org Review URL: https://breakpad.appspot.com/1034002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1270 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Fix #include order from r1268.mark@chromium.org2014-01-101-2/+2
| | | | | | | | R=ted.mielczarek@gmail.com Review URL: https://breakpad.appspot.com/1044002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1269 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Fix compilation with macos-target=10.9ted.mielczarek@gmail.com2014-01-031-0/+2
| | | | | | A=Nomis101, R=ted at https://bugzilla.mozilla.org/show_bug.cgi?id=952623 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1268 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Windows: Fix remaining level 4 warnings.thestig@chromium.org2013-12-182-4/+6
| | | | | | | | R=mark@chromium.org Review URL: https://breakpad.appspot.com/954002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1267 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Use a proper ignore_result() to fix a ftruncate warn_unused_result warning ↵thestig@chromium.org2013-12-182-1/+19
| | | | | | | | | | | with GCC 4.8. BUG=492 R=mark@chromium.org Review URL: https://breakpad.appspot.com/944003 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1266 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Switch scoped_ptr.h to a compatible google3 implementation.thestig@chromium.org2013-12-181-209/+278
| | | | | | | | | | | | | | | This is Chromium's base/memory/scoped_ptr.h at r98718, which split off from the google3 version at a later point than Breakpad's copy. It is a drop in replacement and the only changes are: - removal of WARN_UNUSED_RESULT. - moving it into the google_breakpad namespace. BUG=534 R=mark@chromium.org Review URL: https://breakpad.appspot.com/964002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1265 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Fix warnings from the Windows build.thestig@chromium.org2013-12-171-2/+10
| | | | | | | | | | | These warnings are fatal in my GYP-generated debug build. The warnings can be seen on Linux/Mac with -Wshorten-64-to-32. R=mark@chromium.org Review URL: https://breakpad.appspot.com/944002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1264 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Run svn propdel svn:executable on source code files.thestig@chromium.org2013-12-174-0/+0
| | | | | | Review URL: https://breakpad.appspot.com/934002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1263 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Fix error r1258.thestig@chromium.org2013-12-171-12/+14
| | | | | | | | | BUG=556 R=cdn@chromium.org, mark@chromium.org Review URL: https://breakpad.appspot.com/904004 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1262 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Making the Mac build of crash_report work again after the last SVN sync. ↵ivan.penkov@gmail.com2013-12-172-1/+27
| | | | | | | | | This includes correction of a method definition signature and adding missing code files to the project. I'm commiting this on behalf of Thomas Schweitzer. Review URL: https://breakpad.appspot.com/914002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1261 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Fix gcc vs clang cpuid.h discrepency.thestig@chromium.org2013-12-141-1/+4
| | | | | | | | | | For r1254, gcc defines bit_FXSAVE while clang defines bit_FXSR. R=mark@chromium.org Review URL: https://breakpad.appspot.com/924002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1260 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Misc Android-related fixes.digit@chromium.org2013-12-132-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - src/common/android/testing/mkdtemp.h: Fixes a compilation error when using the (recent) NDK r9b, see comments in the source file for details. - android/test-driver, Makefile.am, Makefile.in: Autotools 1.12 changed the way tests are run during "make check" so add a new "custom test driver" to run tests on Android, and modify Makefile.am / Makefile.in accordingly. Otherwise, 'make check' tried to run the tests on the host. - android/test-shell.sh: Allow several tests to run in parallel on the device, by creating a custom test directory for each test process. This allows running "make check -j8" reliably. - src/common/linux/file_id_unittest.cc: Disable the SelfStrip test on Android, since it assumes a 'strip' executable is available on the target system where the test runs. BUG=NONE R=mark@chromium.org, ted.mielczarek@gmail.com TEST=android/run-checks.sh --ndk-dir=/path/to/android-ndk-r9b Review URL: https://breakpad.appspot.com/904003 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1259 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Expose the ability to supply additional user streams in the windows dump ↵cdn@chromium.org2013-12-122-5/+57
| | | | | | | | | | | generator. BUG=N/A R=mark@chromium.org Review URL: https://breakpad.appspot.com/894002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1258 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Remove usage of gDebugLog and DEBUGLOG from Mac and iOS client code.altse@chromium.org2013-12-125-89/+5
| | | | | | | | | | The inconsistent and duplicated references to gDebugLog caused problems building on iOS and the current logging implementation had little utility because it was never activated in debug builds. git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1257 4c0a9323-5329-0410-9bdc-e9ce6186880e
* Add -[BreakpadController resetConfiguration] for iOS.blundell@chromium.org2013-12-122-4/+15
| | | | | | | | | | | | | | Add a resetConfiguration method to BreakpadController for iOS. The new method resets the controller configuration to its initial value, which is the infoDictionary of the bundle of the application. Patch by KiYun Roe <kiyun@chromium.org> BUG=554 Review URL: https://breakpad.appspot.com/904002/ git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1256 4c0a9323-5329-0410-9bdc-e9ce6186880e