Allow disabling upload rate-limiting

handler/handler_main.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 55 matching lines @@
 void Usage(const base::FilePath& me) {
   fprintf(stderr,
 "Usage: %" PRFilePath " [OPTION]...\n"
 "Crashpad's exception handler server.\n"
 "\n"
 "      --annotation=KEY=VALUE  set a process annotation in each crash report\n"
 "      --database=PATH         store the crash report database at PATH\n"
 #if defined(OS_MACOSX)
 "      --handshake-fd=FD       establish communication with the client over FD\n"
 "      --mach-service=SERVICE  register SERVICE with the bootstrap server\n"
+#elif defined(OS_WIN)
+"      --handshake-handle=HANDLE\n"
+"                              create a new pipe and send its name via HANDLE\n"
+#endif  // OS_MACOSX
+"      --no-rate-limit         don't rate limit crash uploads\n"
+#if defined(OS_MACOSX)
 "      --reset-own-crash-exception-port-to-system-default\n"
 "                              reset the server's exception handler to default\n"
 #elif defined(OS_WIN)
-"      --handshake-handle=HANDLE\n"
-"                              create a new pipe and send its name via HANDLE\n"
 "      --pipe-name=PIPE        communicate with the client over PIPE\n"
 #endif  // OS_MACOSX
 "      --url=URL               send crash reports to this Breakpad server URL,\n"
 "                              only if uploads are enabled for the database\n"
 "      --help                  display this help and exit\n"
 "      --version               output version information and exit\n",
           me.value().c_str());
   ToolSupport::UsageTail(me);
 }
 
@@ skipping 30 matching lines @@
   const base::FilePath me(argv0.BaseName());
 
   enum OptionFlags {
     // Long options without short equivalents.
     kOptionLastChar = 255,
     kOptionAnnotation,
     kOptionDatabase,
 #if defined(OS_MACOSX)
     kOptionHandshakeFD,
     kOptionMachService,
+#elif defined(OS_WIN)
+    kOptionHandshakeHandle,
+#endif  // OS_MACOSX
+    kOptionNoRateLimit,
+#if defined(OS_MACOSX)
     kOptionResetOwnCrashExceptionPortToSystemDefault,
 #elif defined(OS_WIN)
-    kOptionHandshakeHandle,
     kOptionPipeName,
 #endif  // OS_MACOSX
     kOptionURL,
 
     // Standard options.
     kOptionHelp = -2,
     kOptionVersion = -3,
   };
 
   struct {
     std::map<std::string, std::string> annotations;
     std::string url;
     const char* database;
 #if defined(OS_MACOSX)
     int handshake_fd;
     std::string mach_service;
     bool reset_own_crash_exception_port_to_system_default;
 #elif defined(OS_WIN)
     HANDLE handshake_handle;
     std::string pipe_name;
 #endif  // OS_MACOSX
+    bool rate_limit;
   } options = {};
 #if defined(OS_MACOSX)
   options.handshake_fd = -1;
 #elif defined(OS_WIN)
   options.handshake_handle = INVALID_HANDLE_VALUE;
 #endif
+  options.rate_limit = true;
 
   const option long_options[] = {
       {"annotation", required_argument, nullptr, kOptionAnnotation},
       {"database", required_argument, nullptr, kOptionDatabase},
 #if defined(OS_MACOSX)
       {"handshake-fd", required_argument, nullptr, kOptionHandshakeFD},
       {"mach-service", required_argument, nullptr, kOptionMachService},
       {"reset-own-crash-exception-port-to-system-default",
        no_argument,
        nullptr,
        kOptionResetOwnCrashExceptionPortToSystemDefault},
 #elif defined(OS_WIN)
       {"handshake-handle", required_argument, nullptr, kOptionHandshakeHandle},
       {"pipe-name", required_argument, nullptr, kOptionPipeName},
 #endif  // OS_MACOSX
       {"url", required_argument, nullptr, kOptionURL},
+      {"no-rate-limit", no_argument, nullptr, kOptionNoRateLimit},

[Mark Mentovai, 2016/01/06 17:51:50]

Do the ugly dance with this one too.

[scottmg, 2016/01/06 17:55:37]

Done.

       {"help", no_argument, nullptr, kOptionHelp},
       {"version", no_argument, nullptr, kOptionVersion},
       {nullptr, 0, nullptr, 0},
   };
 
   int opt;
   while ((opt = getopt_long(argc, argv, "", long_options, nullptr)) != -1) {
     switch (opt) {
       case kOptionAnnotation: {
         std::string key;
@@ skipping 20 matching lines @@
           ToolSupport::UsageHint(me,
                                  "--handshake-fd requires a file descriptor");
           return EXIT_FAILURE;
         }
         break;
       }
       case kOptionMachService: {
         options.mach_service = optarg;
         break;
       }
-      case kOptionResetOwnCrashExceptionPortToSystemDefault: {
-        options.reset_own_crash_exception_port_to_system_default = true;
-        break;
-      }
 #elif defined(OS_WIN)
       case kOptionHandshakeHandle: {
         // Use unsigned int, because the handle was presented by the client in
         // 0x%x format.
         unsigned int handle_uint;
         if (!StringToNumber(optarg, &handle_uint) ||
             (options.handshake_handle = IntToHandle(handle_uint)) ==
                 INVALID_HANDLE_VALUE) {
           ToolSupport::UsageHint(me, "--handshake-handle requires a HANDLE");
           return EXIT_FAILURE;
         }
         break;
       }
+#endif  // OS_MACOSX
+      case kOptionNoRateLimit: {
+        options.rate_limit = false;
+        break;
+      }
+#if defined(OS_MACOSX)
+      case kOptionResetOwnCrashExceptionPortToSystemDefault: {
+        options.reset_own_crash_exception_port_to_system_default = true;
+        break;
+      }
+#elif defined(OS_WIN)
       case kOptionPipeName: {
         options.pipe_name = optarg;
         break;
       }
 #endif  // OS_MACOSX
       case kOptionURL: {
         options.url = optarg;
         break;
       }
       case kOptionHelp: {
@@ skipping 120 matching lines @@
   }
 #endif  // OS_MACOSX
 
   scoped_ptr<CrashReportDatabase> database(CrashReportDatabase::Initialize(
       base::FilePath(ToolSupport::CommandLineArgumentToFilePathStringType(
           options.database))));
   if (!database) {
     return EXIT_FAILURE;
   }
 
-  CrashReportUploadThread upload_thread(database.get(), options.url);
+  // TODO(scottmg): options.rate_limit should be removed when we have a
+  // configurable database setting to control upload limiting.
+  // https://bugs.chromium.org/p/crashpad/issues/detail?id=23

[Mark Mentovai, 2016/01/06 17:51:50]

Short links, https://crashpad.chromium.org/bug/23

[scottmg, 2016/01/06 17:55:37]

Ah, I can never remember what the shorter version is. I tried
bugs.chromium.org/crashpad/23 and crashpad.chromium.org/bugs/23 and then gave
up. :)

Done.

+  CrashReportUploadThread upload_thread(
+      database.get(), options.url, options.rate_limit);
   upload_thread.Start();
 
   PruneCrashReportThread prune_thread(database.get(),
                                       PruneCondition::GetDefault());
   prune_thread.Start();
 
   CrashReportExceptionHandler exception_handler(
       database.get(), &upload_thread, &options.annotations);
 
   exception_handler_server.Run(&exception_handler);
 
   upload_thread.Stop();
   prune_thread.Stop();
 
   return EXIT_SUCCESS;
 }
 
 }  // namespace crashpad