share all the needed linux code with OpenBSD in chrome and content

content/browser/zygote_host_linux.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/zygote_host_linux.h"
 
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ skipping 288 matching lines @@
             uma_boundary_value,
             uma_boundary_value + 1, base::Histogram::kUmaTargetedHistogramFlag);
       }
       uma_histogram->Add(uma_sample);
     }
 
     if (pid <= 0)
       return base::kNullProcessHandle;
   }
 
+#if defined(OS_LINUX)

[Mark Mentovai, 2011/10/26 23:24:28]

It’s weird to see this in a _linux file. Can you change it to
!defined(OS_OPENBSD)? Same elsewhere in this file.

[stevenjb, 2011/10/27 16:01:54]

It is even weirder to be including _linux files in openbsd builds, but not
defining OS_LINUX. I recognize this might be a significant undertaking, but
shouldn't we do it one way or the other, i.e. #define OS_LINUX for openbsd
builds and add #if !defined(OS_OPENBSD) where necessary (like we do for
chromeos), or create _openbsd versions of files where required (and don't
include _linux files)?

[Robert Nagy, 2011/10/31 15:38:38]

Done.

   // This is just a starting score for a renderer or extension (the
   // only types of processes that will be started this way).  It will
   // get adjusted as time goes on.  (This is the same value as
   // chrome::kLowestRendererOomScore in chrome/chrome_constants.h, but
   // that's not something we can include here.)
   const int kLowestRendererOomScore = 300;
   AdjustRendererOOMScore(pid, kLowestRendererOomScore);
+#endif
 
   return pid;
 }
 
+#if defined(OS_LINUX)
 void ZygoteHost::AdjustRendererOOMScore(base::ProcessHandle pid, int score) {
   // 1) You can't change the oom_score_adj of a non-dumpable process
   //    (EPERM) unless you're root. Because of this, we can't set the
   //    oom_adj from the browser process.
   //
   // 2) We can't set the oom_score_adj before entering the sandbox
   //    because the zygote is in the sandbox and the zygote is as
   //    critical as the browser process. Its oom_adj value shouldn't
   //    be changed.
   //
@@ skipping 46 matching lines @@
     base::ProcessHandle sandbox_helper_process;
     if (base::LaunchProcess(adj_oom_score_cmdline, base::LaunchOptions(),
                             &sandbox_helper_process)) {
       ProcessWatcher::EnsureProcessGetsReaped(sandbox_helper_process);
     }
   } else if (!using_suid_sandbox_) {
     if (!base::AdjustOOMScore(pid, score))
       PLOG(ERROR) << "Failed to adjust OOM score of renderer with pid " << pid;
   }
 }
+#endif
 
 void ZygoteHost::EnsureProcessTerminated(pid_t process) {
   DCHECK(init_);
   Pickle pickle;
 
   pickle.WriteInt(kCmdReap);
   pickle.WriteInt(process);
 
   if (HANDLE_EINTR(write(control_fd_, pickle.data(), pickle.size())) < 0)
     PLOG(ERROR) << "write";
@@ skipping 37 matching lines @@
       !read_pickle.ReadInt(&iter, &tmp_exit_code)) {
     LOG(WARNING) << "Error parsing GetTerminationStatus response from zygote.";
     return base::TERMINATION_STATUS_NORMAL_TERMINATION;
   }
 
   if (exit_code)
     *exit_code = tmp_exit_code;
 
   return static_cast<base::TerminationStatus>(status);
 }