Snap for 11486370 from 9d5f2c65a926384abf9f3a351e989d93fca75d50 to 24Q2-release
Change-Id: If527cfcb2a856d6e963a6574b75155d58e5c5013
diff --git a/fs_mgr/libsnapshot/libsnapshot_cow/writer_v3.cpp b/fs_mgr/libsnapshot/libsnapshot_cow/writer_v3.cpp
index 1e3fee7..30c5135 100644
--- a/fs_mgr/libsnapshot/libsnapshot_cow/writer_v3.cpp
+++ b/fs_mgr/libsnapshot/libsnapshot_cow/writer_v3.cpp
@@ -121,7 +121,6 @@
return false;
}
- LOG(INFO) << "Compression factor: " << header_.max_compression_size;
num_compress_threads_ = std::max(int(options_.num_compress_threads), 1);
auto parts = android::base::Split(options_.compression, ",");
if (parts.size() > 2) {
diff --git a/fs_mgr/libsnapshot/snapshot.cpp b/fs_mgr/libsnapshot/snapshot.cpp
index ba5fb88..cbe8285 100644
--- a/fs_mgr/libsnapshot/snapshot.cpp
+++ b/fs_mgr/libsnapshot/snapshot.cpp
@@ -3242,6 +3242,8 @@
// Older OTAs don't set an explicit compression type, so default to gz.
compression_algorithm = "gz";
}
+ LOG(INFO) << "using compression algorithm: " << compression_algorithm
+ << ", max compressible block size: " << compression_factor;
}
PartitionCowCreator cow_creator{
diff --git a/init/first_stage_console.cpp b/init/first_stage_console.cpp
index 0076764..f6f9329 100644
--- a/init/first_stage_console.cpp
+++ b/init/first_stage_console.cpp
@@ -16,6 +16,7 @@
#include "first_stage_console.h"
+#include <spawn.h>
#include <stdio.h>
#include <sys/stat.h>
#include <sys/sysmacros.h>
@@ -65,20 +66,20 @@
return true;
}
-static void RunScript() {
- LOG(INFO) << "Attempting to run /first_stage.sh...";
- pid_t pid = fork();
- if (pid != 0) {
- int status;
- waitpid(pid, &status, 0);
- LOG(INFO) << "/first_stage.sh exited with status " << status;
- return;
- }
- const char* path = "/system/bin/sh";
- const char* args[] = {path, "/first_stage.sh", nullptr};
- int rv = execv(path, const_cast<char**>(args));
- LOG(ERROR) << "unable to execv /first_stage.sh, returned " << rv << " errno " << errno;
- _exit(127);
+static pid_t SpawnImage(const char* file) {
+ const char* argv[] = {file, NULL};
+ const char* envp[] = {NULL};
+
+ char* const* argvp = const_cast<char* const*>(argv);
+ char* const* envpp = const_cast<char* const*>(envp);
+
+ pid_t pid;
+ errno = posix_spawn(&pid, argv[0], NULL, NULL, argvp, envpp);
+ if (!errno) return pid;
+
+ PLOG(ERROR) << "Failed to spawn '" << file << "'";
+
+ return (pid_t)0;
}
namespace android {
@@ -94,19 +95,21 @@
sigaction(SIGCHLD, &chld_act, nullptr);
pid_t pid = fork();
if (pid != 0) {
- int status;
- waitpid(pid, &status, 0);
- LOG(ERROR) << "console shell exited with status " << status;
+ wait(NULL);
+ LOG(ERROR) << "console shell exited";
return;
}
if (console) console = SetupConsole();
- RunScript();
+
+ LOG(INFO) << "Attempting to run /first_stage.sh...";
+ if (SpawnImage("/first_stage.sh")) {
+ wait(NULL);
+ LOG(INFO) << "/first_stage.sh exited";
+ }
+
if (console) {
- const char* path = "/system/bin/sh";
- const char* args[] = {path, nullptr};
- int rv = execv(path, const_cast<char**>(args));
- LOG(ERROR) << "unable to execv, returned " << rv << " errno " << errno;
+ if (SpawnImage("/system/bin/sh")) wait(NULL);
}
_exit(127);
}
diff --git a/libutils/binder/RefBase_test.cpp b/libutils/binder/RefBase_test.cpp
index d675598..65d40a2 100644
--- a/libutils/binder/RefBase_test.cpp
+++ b/libutils/binder/RefBase_test.cpp
@@ -300,8 +300,8 @@
std::atomic<int>* mDeleteCount;
};
-static sp<Bar> buffer;
-static std::atomic<bool> bufferFull(false);
+[[clang::no_destroy]] static constinit sp<Bar> buffer;
+static constinit std::atomic<bool> bufferFull(false);
// Wait until bufferFull has value val.
static inline void waitFor(bool val) {
@@ -380,8 +380,8 @@
} // Otherwise this is slow and probably pointless on a uniprocessor.
}
-static wp<Bar> wpBuffer;
-static std::atomic<bool> wpBufferFull(false);
+[[clang::no_destroy]] static constinit wp<Bar> wpBuffer;
+static constinit std::atomic<bool> wpBufferFull(false);
// Wait until wpBufferFull has value val.
static inline void wpWaitFor(bool val) {
diff --git a/libutils/binder/include/utils/RefBase.h b/libutils/binder/include/utils/RefBase.h
index 5e3fa7d..f03e1be 100644
--- a/libutils/binder/include/utils/RefBase.h
+++ b/libutils/binder/include/utils/RefBase.h
@@ -404,7 +404,7 @@
public:
typedef typename RefBase::weakref_type weakref_type;
- inline wp() : m_ptr(nullptr), m_refs(nullptr) { }
+ inline constexpr wp() : m_ptr(nullptr), m_refs(nullptr) { }
// if nullptr, returns nullptr
//
diff --git a/libutils/binder/include/utils/StrongPointer.h b/libutils/binder/include/utils/StrongPointer.h
index 43c00c9..fb9b8e8 100644
--- a/libutils/binder/include/utils/StrongPointer.h
+++ b/libutils/binder/include/utils/StrongPointer.h
@@ -30,7 +30,7 @@
template<typename T>
class sp {
public:
- inline sp() : m_ptr(nullptr) { }
+ inline constexpr sp() : m_ptr(nullptr) { }
// The old way of using sp<> was like this. This is bad because it relies
// on implicit conversion to sp<>, which we would like to remove (if an