fix: use std::shared_ptr instead of std::unique_ptr for shared ressource, use operator[] instead of find_field#11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lemire merged 1 commit into from
Apr 24, 2024
Merged

fix: use std::shared_ptr instead of std::unique_ptr for shared ressource, use operator[] instead of find_field #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/node.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1022,11 +1022,11 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
InitializeNodeWithArgsInternal(argv, exec_argv, errors, flags));
}

static std::unique_ptr<InitializationResultImpl>
static std::shared_ptr<InitializationResultImpl>
InitializeOncePerProcessInternal(const std::vector<std::string>& args,
ProcessInitializationFlags::Flags flags =
ProcessInitializationFlags::kNoFlags) {
auto result = std::make_unique<InitializationResultImpl>();
auto result = std::make_shared<InitializationResultImpl>();
result->args_ = args;

if (!(flags & ProcessInitializationFlags::kNoParseGlobalDebugVariables)) {
Expand DownExpand Up@@ -1068,7 +1068,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
auto positional_args = task_runner::GetPositionalArgs(args);
result->early_return_ = true;
task_runner::RunTask(
&result, per_process::cli_options->run, positional_args);
result, per_process::cli_options->run, positional_args);
return result;
}

Expand DownExpand Up@@ -1231,7 +1231,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
return result;
}

std::unique_ptr<InitializationResult> InitializeOncePerProcess(
std::shared_ptr<InitializationResult> InitializeOncePerProcess(
const std::vector<std::string>& args,
ProcessInitializationFlags::Flags flags) {
return InitializeOncePerProcessInternal(args, flags);
Expand DownExpand Up@@ -1437,7 +1437,7 @@ static ExitCode StartInternal(int argc, char** argv) {
// Hack around with the argv pointer. Used for process.title = "blah".
argv = uv_setup_args(argc, argv);

std::unique_ptr<InitializationResultImpl> result =
std::shared_ptr<InitializationResultImpl> result =
InitializeOncePerProcessInternal(
std::vector<std::string>(argv, argv + argc));
for (const std::string& error : result->errors()) {
Expand Down
4 changes: 2 additions & 2 deletions src/node.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -349,7 +349,7 @@ NODE_DEPRECATED("Use InitializeOncePerProcess() instead",
// including the arguments split into argv/exec_argv, a list of potential
// errors encountered during initialization, and a potential suggested
// exit code.
NODE_EXTERN std::unique_ptr<InitializationResult> InitializeOncePerProcess(
NODE_EXTERN std::shared_ptr<InitializationResult> InitializeOncePerProcess(
const std::vector<std::string>& args,
ProcessInitializationFlags::Flags flags =
ProcessInitializationFlags::kNoFlags);
Expand All@@ -358,7 +358,7 @@ NODE_EXTERN std::unique_ptr<InitializationResult> InitializeOncePerProcess(
NODE_EXTERN void TearDownOncePerProcess();
// Convenience overload for specifying multiple flags without having
// to worry about casts.
inline std::unique_ptr<InitializationResult> InitializeOncePerProcess(
inline std::shared_ptr<InitializationResult> InitializeOncePerProcess(
const std::vector<std::string>& args,
std::initializer_list<ProcessInitializationFlags::Flags> list) {
uint64_t flags_accum = ProcessInitializationFlags::kNoFlags;
Expand Down
28 changes: 14 additions & 14 deletions src/node_task_runner.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ static const char task_file[] = "/bin/sh";
#endif // _WIN32

ProcessRunner::ProcessRunner(
std::unique_ptr<InitializationResultImpl>* result,
std::shared_ptr<InitializationResultImpl>& result,
std::string_view command,
const std::optional<std::string>& positional_args) {
memset(&options_, 0, sizeof(uv_process_options_t));
Expand DownExpand Up@@ -130,9 +130,9 @@ void ProcessRunner::ExitCallback(uv_process_t* handle,

void ProcessRunner::OnExit(int64_t exit_status, int term_signal) {
if (exit_status > 0) {
init_result->get()->exit_code_ = ExitCode::kGenericUserError;
init_result.get()->exit_code_ = ExitCode::kGenericUserError;
} else {
init_result->get()->exit_code_ = ExitCode::kNoFailure;
init_result.get()->exit_code_ = ExitCode::kNoFailure;
}
}

Expand All@@ -144,7 +144,7 @@ void ProcessRunner::Run() {
uv_run(loop_, UV_RUN_DEFAULT);
}

void RunTask(std::unique_ptr<InitializationResultImpl>* result,
void RunTask(std::shared_ptr<InitializationResultImpl>& result,
std::string_view command_id,
const std::optional<std::string>& positional_args) {
std::string_view path = "package.json";
Expand All@@ -153,7 +153,7 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
// No need to exclude BOM since simdjson will skip it.
if (ReadFileSync(&raw_json, path.data()) < 0) {
fprintf(stderr, "Can't read package.json\n");
result->get()->exit_code_ = ExitCode::kGenericUserError;
result.get()->exit_code_ = ExitCode::kGenericUserError;
return;
}

Expand All@@ -165,22 +165,22 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
// If document is not an object, throw an error.
if (error || document.get_object().get(main_object)) {
fprintf(stderr, "Can't parse package.json\n");
result->get()->exit_code_ = ExitCode::kGenericUserError;
result.get()->exit_code_ = ExitCode::kGenericUserError;
return;
}

// If package_json object doesn't have "scripts" field, throw an error.
simdjson::ondemand::object scripts_object;
if (main_object.find_field("scripts").get_object().get(scripts_object)) {
if (main_object["scripts"].get_object().get(scripts_object)) {
fprintf(stderr, "Can't find \"scripts\" field in package.json\n");
result->get()->exit_code_ = ExitCode::kGenericUserError;
result.get()->exit_code_ = ExitCode::kGenericUserError;
return;
}

// If the command_id is not found in the scripts object, throw an error.
std::string_view command;
if (scripts_object.find_field(command_id).get_string().get(command)) {
fprintf(stderr, "Missing script: \"%s\"\n\n", command_id.data());
if (scripts_object[command_id].get_string().get(command)) {
fprintf(stderr, "Missing script: \"%.*s\"\n\n", static_cast<int>(command_id.size()), command_id.data());
fprintf(stderr, "Available scripts are:\n");

// Reset the object to iterate over it again
Expand All@@ -192,12 +192,12 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
if (!field.unescaped_key().get(key_str) && !field.value().get(value) &&
!value.get_string().get(value_str)) {
fprintf(stderr,
" %s: %s\n",
std::string(key_str).c_str(),
std::string(value_str).c_str());
" %.*s: %.*s\n",
static_cast<int>(key_str.size()), key_str.data(),
static_cast<int>(value_str.size()), value_str.data());
}
}
result->get()->exit_code_ = ExitCode::kGenericUserError;
result.get()->exit_code_ = ExitCode::kGenericUserError;
return;
}

Expand Down
6 changes: 3 additions & 3 deletions src/node_task_runner.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ namespace task_runner {

class ProcessRunner {
public:
ProcessRunner(std::unique_ptr<InitializationResultImpl>* result,
ProcessRunner(std::shared_ptr<InitializationResultImpl>& result,
std::string_view command_id,
const std::optional<std::string>& positional_args);
void Run();
Expand All@@ -29,14 +29,14 @@ class ProcessRunner {
uv_process_t process_{};
uv_process_options_t options_{};
uv_stdio_container_t child_stdio[3];
std::unique_ptr<InitializationResultImpl>* init_result;
std::shared_ptr<InitializationResultImpl> init_result;
std::vector<std::string> command_args_{};
std::vector<std::string> env_vars_{};

void OnExit(int64_t exit_status, int term_signal);
};

void RunTask(std::unique_ptr<InitializationResultImpl>* result,
void RunTask(std::shared_ptr<InitializationResultImpl>& result,
std::string_view command_id,
const std::optional<std::string>& positional_args);
std::optional<std::string> GetPositionalArgs(
Expand Down
2 changes: 1 addition & 1 deletion test/embedding/embedtest.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ static int RunNodeInstance(MultiIsolatePlatform* platform,
intmain(int argc, char** argv) {
argv = uv_setup_args(argc, argv);
std::vector<std::string> args(argv, argv + argc);
std::unique_ptr<node::InitializationResult> result =
std::shared_ptr<node::InitializationResult> result =
node::InitializeOncePerProcess(
args,
{node::ProcessInitializationFlags::kNoInitializeV8,
Expand Down
2 changes: 1 addition & 1 deletion tools/snapshot/node_mksnapshot.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ int BuildSnapshot(int argc, char* argv[]) {
return 1;
}

std::unique_ptr<node::InitializationResult> result =
std::shared_ptr<node::InitializationResult> result =
node::InitializeOncePerProcess(
std::vector<std::string>(argv, argv + argc),
node::ProcessInitializationFlags::kGeneratePredictableSnapshot);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix: use std::shared_ptr instead of std::unique_ptr for shared ressource, use operator[] instead of find_field#11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lemire
merged 1 commit into

from

Apr 24, 2024
 Merged


fix: use std::shared_ptr instead of std::unique_ptr for shared ressource, use operator[] instead of find_field
#11
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 5 additions & 5 deletions
src/node.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1022,11 +1022,11 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
 InitializeNodeWithArgsInternal(argv, exec_argv, errors, flags));
}

static std::unique_ptr<InitializationResultImpl>
static std::shared_ptr<InitializationResultImpl>
InitializeOncePerProcessInternal(const std::vector<std::string>& args,
 ProcessInitializationFlags::Flags flags =
 ProcessInitializationFlags::kNoFlags) {
 auto result = std::make_unique<InitializationResultImpl>();
 auto result = std::make_shared<InitializationResultImpl>();
 result->args_ = args;

 if (!(flags & ProcessInitializationFlags::kNoParseGlobalDebugVariables)) {
Expand DownExpand Up@@ -1068,7 +1068,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
 auto positional_args = task_runner::GetPositionalArgs(args);
 result->early_return_ = true;
 task_runner::RunTask(
&result, per_process::cli_options->run, positional_args);
 result, per_process::cli_options->run, positional_args);
 return result;
 }

Expand DownExpand Up@@ -1231,7 +1231,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
 return result;
}

std::unique_ptr<InitializationResult> InitializeOncePerProcess(
std::shared_ptr<InitializationResult> InitializeOncePerProcess(
 const std::vector<std::string>& args,
 ProcessInitializationFlags::Flags flags) {
 return InitializeOncePerProcessInternal(args, flags);
Expand DownExpand Up@@ -1437,7 +1437,7 @@ static ExitCode StartInternal(int argc, char** argv) {
 // Hack around with the argv pointer. Used for process.title = "blah".
 argv = uv_setup_args(argc, argv);

 std::unique_ptr<InitializationResultImpl> result =
 std::shared_ptr<InitializationResultImpl> result =
 InitializeOncePerProcessInternal(
 std::vector<std::string>(argv, argv + argc));
 for (const std::string& error : result->errors()) {
Expand Down

4 changes: 2 additions & 2 deletions
src/node.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -349,7 +349,7 @@ NODE_DEPRECATED("Use InitializeOncePerProcess() instead",
// including the arguments split into argv/exec_argv, a list of potential
// errors encountered during initialization, and a potential suggested
// exit code.
NODE_EXTERN std::unique_ptr<InitializationResult> InitializeOncePerProcess(
NODE_EXTERN std::shared_ptr<InitializationResult> InitializeOncePerProcess(
 const std::vector<std::string>& args,
 ProcessInitializationFlags::Flags flags =
 ProcessInitializationFlags::kNoFlags);
Expand All@@ -358,7 +358,7 @@ NODE_EXTERN std::unique_ptr<InitializationResult> InitializeOncePerProcess(
NODE_EXTERN void TearDownOncePerProcess();
// Convenience overload for specifying multiple flags without having
// to worry about casts.
inline std::unique_ptr<InitializationResult> InitializeOncePerProcess(
inline std::shared_ptr<InitializationResult> InitializeOncePerProcess(
 const std::vector<std::string>& args,
 std::initializer_list<ProcessInitializationFlags::Flags> list) {
 uint64_t flags_accum = ProcessInitializationFlags::kNoFlags;
Expand Down

28 changes: 14 additions & 14 deletions
src/node_task_runner.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ static const char task_file[] = "/bin/sh";
#endif // _WIN32

ProcessRunner::ProcessRunner(
 std::unique_ptr<InitializationResultImpl>* result,
 std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command,
 const std::optional<std::string>& positional_args) {
 memset(&options_, 0, sizeof(uv_process_options_t));
Expand DownExpand Up@@ -130,9 +130,9 @@ void ProcessRunner::ExitCallback(uv_process_t* handle,

void ProcessRunner::OnExit(int64_t exit_status, int term_signal) {
 if (exit_status > 0) {
 init_result->get()->exit_code_ = ExitCode::kGenericUserError;
 init_result.get()->exit_code_ = ExitCode::kGenericUserError;
 } else {
 init_result->get()->exit_code_ = ExitCode::kNoFailure;
 init_result.get()->exit_code_ = ExitCode::kNoFailure;
 }
}

Expand All@@ -144,7 +144,7 @@ void ProcessRunner::Run() {
 uv_run(loop_, UV_RUN_DEFAULT);
}

void RunTask(std::unique_ptr<InitializationResultImpl>* result,
void RunTask(std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command_id,
 const std::optional<std::string>& positional_args) {
 std::string_view path = "package.json";
Expand All@@ -153,7 +153,7 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
 // No need to exclude BOM since simdjson will skip it.
 if (ReadFileSync(&raw_json, path.data()) < 0) {
 fprintf(stderr, "Can't read package.json\n");
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

Expand All@@ -165,22 +165,22 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
 // If document is not an object, throw an error.
 if (error || document.get_object().get(main_object)) {
 fprintf(stderr, "Can't parse package.json\n");
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

 // If package_json object doesn't have "scripts" field, throw an error.
 simdjson::ondemand::object scripts_object;
 if (main_object.find_field("scripts").get_object().get(scripts_object)) {
 if (main_object["scripts"].get_object().get(scripts_object)) {
 fprintf(stderr, "Can't find \"scripts\" field in package.json\n");
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

 // If the command_id is not found in the scripts object, throw an error.
 std::string_view command;
 if (scripts_object.find_field(command_id).get_string().get(command)) {
 fprintf(stderr, "Missing script: \"%s\"\n\n", command_id.data());
 if (scripts_object[command_id].get_string().get(command)) {
 fprintf(stderr, "Missing script: \"%.*s\"\n\n", static_cast<int>(command_id.size()), command_id.data());
 fprintf(stderr, "Available scripts are:\n");

 // Reset the object to iterate over it again
Expand All@@ -192,12 +192,12 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
 if (!field.unescaped_key().get(key_str) && !field.value().get(value) &&
 !value.get_string().get(value_str)) {
 fprintf(stderr,
 " %s: %s\n",
std::string(key_str).c_str(),
std::string(value_str).c_str());
 " %.*s: %.*s\n",
static_cast<int>(key_str.size()), key_str.data(),
static_cast<int>(value_str.size()), value_str.data());
 }
 }
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

Expand Down

6 changes: 3 additions & 3 deletions
src/node_task_runner.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ namespace task_runner {

class ProcessRunner {
 public:
 ProcessRunner(std::unique_ptr<InitializationResultImpl>* result,
 ProcessRunner(std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command_id,
 const std::optional<std::string>& positional_args);
 void Run();
Expand All@@ -29,14 +29,14 @@ class ProcessRunner {
 uv_process_t process_{};
 uv_process_options_t options_{};
 uv_stdio_container_t child_stdio[3];
 std::unique_ptr<InitializationResultImpl>* init_result;
 std::shared_ptr<InitializationResultImpl> init_result;
 std::vector<std::string> command_args_{};
 std::vector<std::string> env_vars_{};

 void OnExit(int64_t exit_status, int term_signal);
};

void RunTask(std::unique_ptr<InitializationResultImpl>* result,
void RunTask(std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command_id,
 const std::optional<std::string>& positional_args);
std::optional<std::string> GetPositionalArgs(
Expand Down

2 changes: 1 addition & 1 deletion
test/embedding/embedtest.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ static int RunNodeInstance(MultiIsolatePlatform* platform,
intmain(int argc, char** argv) {
 argv = uv_setup_args(argc, argv);
 std::vector<std::string> args(argv, argv + argc);
 std::unique_ptr<node::InitializationResult> result =
 std::shared_ptr<node::InitializationResult> result =
node::InitializeOncePerProcess(
 args,
 {node::ProcessInitializationFlags::kNoInitializeV8,
Expand Down

2 changes: 1 addition & 1 deletion
tools/snapshot/node_mksnapshot.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ int BuildSnapshot(int argc, char* argv[]) {
 return 1;
 }

 std::unique_ptr<node::InitializationResult> result =
 std::shared_ptr<node::InitializationResult> result =
 node::InitializeOncePerProcess(
 std::vector<std::string>(argv, argv + argc),
 node::ProcessInitializationFlags::kGeneratePredictableSnapshot);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: use std::shared_ptr instead of std::unique_ptr for shared ressource, use operator[] instead of find_field#11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lemire
merged 1 commit into

from

Apr 24, 2024
 Merged


fix: use std::shared_ptr instead of std::unique_ptr for shared ressource, use operator[] instead of find_field
#11
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 5 additions & 5 deletions
src/node.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1022,11 +1022,11 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
 InitializeNodeWithArgsInternal(argv, exec_argv, errors, flags));
}

static std::unique_ptr<InitializationResultImpl>
static std::shared_ptr<InitializationResultImpl>
InitializeOncePerProcessInternal(const std::vector<std::string>& args,
 ProcessInitializationFlags::Flags flags =
 ProcessInitializationFlags::kNoFlags) {
 auto result = std::make_unique<InitializationResultImpl>();
 auto result = std::make_shared<InitializationResultImpl>();
 result->args_ = args;

 if (!(flags & ProcessInitializationFlags::kNoParseGlobalDebugVariables)) {
Expand DownExpand Up@@ -1068,7 +1068,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
 auto positional_args = task_runner::GetPositionalArgs(args);
 result->early_return_ = true;
 task_runner::RunTask(
&result, per_process::cli_options->run, positional_args);
 result, per_process::cli_options->run, positional_args);
 return result;
 }

Expand DownExpand Up@@ -1231,7 +1231,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
 return result;
}

std::unique_ptr<InitializationResult> InitializeOncePerProcess(
std::shared_ptr<InitializationResult> InitializeOncePerProcess(
 const std::vector<std::string>& args,
 ProcessInitializationFlags::Flags flags) {
 return InitializeOncePerProcessInternal(args, flags);
Expand DownExpand Up@@ -1437,7 +1437,7 @@ static ExitCode StartInternal(int argc, char** argv) {
 // Hack around with the argv pointer. Used for process.title = "blah".
 argv = uv_setup_args(argc, argv);

 std::unique_ptr<InitializationResultImpl> result =
 std::shared_ptr<InitializationResultImpl> result =
 InitializeOncePerProcessInternal(
 std::vector<std::string>(argv, argv + argc));
 for (const std::string& error : result->errors()) {
Expand Down

4 changes: 2 additions & 2 deletions
src/node.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -349,7 +349,7 @@ NODE_DEPRECATED("Use InitializeOncePerProcess() instead",
// including the arguments split into argv/exec_argv, a list of potential
// errors encountered during initialization, and a potential suggested
// exit code.
NODE_EXTERN std::unique_ptr<InitializationResult> InitializeOncePerProcess(
NODE_EXTERN std::shared_ptr<InitializationResult> InitializeOncePerProcess(
 const std::vector<std::string>& args,
 ProcessInitializationFlags::Flags flags =
 ProcessInitializationFlags::kNoFlags);
Expand All@@ -358,7 +358,7 @@ NODE_EXTERN std::unique_ptr<InitializationResult> InitializeOncePerProcess(
NODE_EXTERN void TearDownOncePerProcess();
// Convenience overload for specifying multiple flags without having
// to worry about casts.
inline std::unique_ptr<InitializationResult> InitializeOncePerProcess(
inline std::shared_ptr<InitializationResult> InitializeOncePerProcess(
 const std::vector<std::string>& args,
 std::initializer_list<ProcessInitializationFlags::Flags> list) {
 uint64_t flags_accum = ProcessInitializationFlags::kNoFlags;
Expand Down

28 changes: 14 additions & 14 deletions
src/node_task_runner.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ static const char task_file[] = "/bin/sh";
#endif // _WIN32

ProcessRunner::ProcessRunner(
 std::unique_ptr<InitializationResultImpl>* result,
 std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command,
 const std::optional<std::string>& positional_args) {
 memset(&options_, 0, sizeof(uv_process_options_t));
Expand DownExpand Up@@ -130,9 +130,9 @@ void ProcessRunner::ExitCallback(uv_process_t* handle,

void ProcessRunner::OnExit(int64_t exit_status, int term_signal) {
 if (exit_status > 0) {
 init_result->get()->exit_code_ = ExitCode::kGenericUserError;
 init_result.get()->exit_code_ = ExitCode::kGenericUserError;
 } else {
 init_result->get()->exit_code_ = ExitCode::kNoFailure;
 init_result.get()->exit_code_ = ExitCode::kNoFailure;
 }
}

Expand All@@ -144,7 +144,7 @@ void ProcessRunner::Run() {
 uv_run(loop_, UV_RUN_DEFAULT);
}

void RunTask(std::unique_ptr<InitializationResultImpl>* result,
void RunTask(std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command_id,
 const std::optional<std::string>& positional_args) {
 std::string_view path = "package.json";
Expand All@@ -153,7 +153,7 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
 // No need to exclude BOM since simdjson will skip it.
 if (ReadFileSync(&raw_json, path.data()) < 0) {
 fprintf(stderr, "Can't read package.json\n");
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

Expand All@@ -165,22 +165,22 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
 // If document is not an object, throw an error.
 if (error || document.get_object().get(main_object)) {
 fprintf(stderr, "Can't parse package.json\n");
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

 // If package_json object doesn't have "scripts" field, throw an error.
 simdjson::ondemand::object scripts_object;
 if (main_object.find_field("scripts").get_object().get(scripts_object)) {
 if (main_object["scripts"].get_object().get(scripts_object)) {
 fprintf(stderr, "Can't find \"scripts\" field in package.json\n");
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

 // If the command_id is not found in the scripts object, throw an error.
 std::string_view command;
 if (scripts_object.find_field(command_id).get_string().get(command)) {
 fprintf(stderr, "Missing script: \"%s\"\n\n", command_id.data());
 if (scripts_object[command_id].get_string().get(command)) {
 fprintf(stderr, "Missing script: \"%.*s\"\n\n", static_cast<int>(command_id.size()), command_id.data());
 fprintf(stderr, "Available scripts are:\n");

 // Reset the object to iterate over it again
Expand All@@ -192,12 +192,12 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
 if (!field.unescaped_key().get(key_str) && !field.value().get(value) &&
 !value.get_string().get(value_str)) {
 fprintf(stderr,
 " %s: %s\n",
std::string(key_str).c_str(),
std::string(value_str).c_str());
 " %.*s: %.*s\n",
static_cast<int>(key_str.size()), key_str.data(),
static_cast<int>(value_str.size()), value_str.data());
 }
 }
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

Expand Down

6 changes: 3 additions & 3 deletions
src/node_task_runner.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ namespace task_runner {

class ProcessRunner {
 public:
 ProcessRunner(std::unique_ptr<InitializationResultImpl>* result,
 ProcessRunner(std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command_id,
 const std::optional<std::string>& positional_args);
 void Run();
Expand All@@ -29,14 +29,14 @@ class ProcessRunner {
 uv_process_t process_{};
 uv_process_options_t options_{};
 uv_stdio_container_t child_stdio[3];
 std::unique_ptr<InitializationResultImpl>* init_result;
 std::shared_ptr<InitializationResultImpl> init_result;
 std::vector<std::string> command_args_{};
 std::vector<std::string> env_vars_{};

 void OnExit(int64_t exit_status, int term_signal);
};

void RunTask(std::unique_ptr<InitializationResultImpl>* result,
void RunTask(std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command_id,
 const std::optional<std::string>& positional_args);
std::optional<std::string> GetPositionalArgs(
Expand Down

2 changes: 1 addition & 1 deletion
test/embedding/embedtest.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ static int RunNodeInstance(MultiIsolatePlatform* platform,
intmain(int argc, char** argv) {
 argv = uv_setup_args(argc, argv);
 std::vector<std::string> args(argv, argv + argc);
 std::unique_ptr<node::InitializationResult> result =
 std::shared_ptr<node::InitializationResult> result =
node::InitializeOncePerProcess(
 args,
 {node::ProcessInitializationFlags::kNoInitializeV8,
Expand Down

2 changes: 1 addition & 1 deletion
tools/snapshot/node_mksnapshot.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ int BuildSnapshot(int argc, char* argv[]) {
 return 1;
 }

 std::unique_ptr<node::InitializationResult> result =
 std::shared_ptr<node::InitializationResult> result =
 node::InitializeOncePerProcess(
 std::vector<std::string>(argv, argv + argc),
 node::ProcessInitializationFlags::kGeneratePredictableSnapshot);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: use std::shared_ptr instead of std::unique_ptr for shared ressource, use operator[] instead of find_field#11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lemire
merged 1 commit into

from

Apr 24, 2024
 Merged


fix: use std::shared_ptr instead of std::unique_ptr for shared ressource, use operator[] instead of find_field
#11
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 5 additions & 5 deletions
src/node.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1022,11 +1022,11 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
 InitializeNodeWithArgsInternal(argv, exec_argv, errors, flags));
}

static std::unique_ptr<InitializationResultImpl>
static std::shared_ptr<InitializationResultImpl>
InitializeOncePerProcessInternal(const std::vector<std::string>& args,
 ProcessInitializationFlags::Flags flags =
 ProcessInitializationFlags::kNoFlags) {
 auto result = std::make_unique<InitializationResultImpl>();
 auto result = std::make_shared<InitializationResultImpl>();
 result->args_ = args;

 if (!(flags & ProcessInitializationFlags::kNoParseGlobalDebugVariables)) {
Expand DownExpand Up@@ -1068,7 +1068,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
 auto positional_args = task_runner::GetPositionalArgs(args);
 result->early_return_ = true;
 task_runner::RunTask(
&result, per_process::cli_options->run, positional_args);
 result, per_process::cli_options->run, positional_args);
 return result;
 }

Expand DownExpand Up@@ -1231,7 +1231,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
 return result;
}

std::unique_ptr<InitializationResult> InitializeOncePerProcess(
std::shared_ptr<InitializationResult> InitializeOncePerProcess(
 const std::vector<std::string>& args,
 ProcessInitializationFlags::Flags flags) {
 return InitializeOncePerProcessInternal(args, flags);
Expand DownExpand Up@@ -1437,7 +1437,7 @@ static ExitCode StartInternal(int argc, char** argv) {
 // Hack around with the argv pointer. Used for process.title = "blah".
 argv = uv_setup_args(argc, argv);

 std::unique_ptr<InitializationResultImpl> result =
 std::shared_ptr<InitializationResultImpl> result =
 InitializeOncePerProcessInternal(
 std::vector<std::string>(argv, argv + argc));
 for (const std::string& error : result->errors()) {
Expand Down

4 changes: 2 additions & 2 deletions
src/node.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -349,7 +349,7 @@ NODE_DEPRECATED("Use InitializeOncePerProcess() instead",
// including the arguments split into argv/exec_argv, a list of potential
// errors encountered during initialization, and a potential suggested
// exit code.
NODE_EXTERN std::unique_ptr<InitializationResult> InitializeOncePerProcess(
NODE_EXTERN std::shared_ptr<InitializationResult> InitializeOncePerProcess(
 const std::vector<std::string>& args,
 ProcessInitializationFlags::Flags flags =
 ProcessInitializationFlags::kNoFlags);
Expand All@@ -358,7 +358,7 @@ NODE_EXTERN std::unique_ptr<InitializationResult> InitializeOncePerProcess(
NODE_EXTERN void TearDownOncePerProcess();
// Convenience overload for specifying multiple flags without having
// to worry about casts.
inline std::unique_ptr<InitializationResult> InitializeOncePerProcess(
inline std::shared_ptr<InitializationResult> InitializeOncePerProcess(
 const std::vector<std::string>& args,
 std::initializer_list<ProcessInitializationFlags::Flags> list) {
 uint64_t flags_accum = ProcessInitializationFlags::kNoFlags;
Expand Down

28 changes: 14 additions & 14 deletions
src/node_task_runner.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ static const char task_file[] = "/bin/sh";
#endif // _WIN32

ProcessRunner::ProcessRunner(
 std::unique_ptr<InitializationResultImpl>* result,
 std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command,
 const std::optional<std::string>& positional_args) {
 memset(&options_, 0, sizeof(uv_process_options_t));
Expand DownExpand Up@@ -130,9 +130,9 @@ void ProcessRunner::ExitCallback(uv_process_t* handle,

void ProcessRunner::OnExit(int64_t exit_status, int term_signal) {
 if (exit_status > 0) {
 init_result->get()->exit_code_ = ExitCode::kGenericUserError;
 init_result.get()->exit_code_ = ExitCode::kGenericUserError;
 } else {
 init_result->get()->exit_code_ = ExitCode::kNoFailure;
 init_result.get()->exit_code_ = ExitCode::kNoFailure;
 }
}

Expand All@@ -144,7 +144,7 @@ void ProcessRunner::Run() {
 uv_run(loop_, UV_RUN_DEFAULT);
}

void RunTask(std::unique_ptr<InitializationResultImpl>* result,
void RunTask(std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command_id,
 const std::optional<std::string>& positional_args) {
 std::string_view path = "package.json";
Expand All@@ -153,7 +153,7 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
 // No need to exclude BOM since simdjson will skip it.
 if (ReadFileSync(&raw_json, path.data()) < 0) {
 fprintf(stderr, "Can't read package.json\n");
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

Expand All@@ -165,22 +165,22 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
 // If document is not an object, throw an error.
 if (error || document.get_object().get(main_object)) {
 fprintf(stderr, "Can't parse package.json\n");
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

 // If package_json object doesn't have "scripts" field, throw an error.
 simdjson::ondemand::object scripts_object;
 if (main_object.find_field("scripts").get_object().get(scripts_object)) {
 if (main_object["scripts"].get_object().get(scripts_object)) {
 fprintf(stderr, "Can't find \"scripts\" field in package.json\n");
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

 // If the command_id is not found in the scripts object, throw an error.
 std::string_view command;
 if (scripts_object.find_field(command_id).get_string().get(command)) {
 fprintf(stderr, "Missing script: \"%s\"\n\n", command_id.data());
 if (scripts_object[command_id].get_string().get(command)) {
 fprintf(stderr, "Missing script: \"%.*s\"\n\n", static_cast<int>(command_id.size()), command_id.data());
 fprintf(stderr, "Available scripts are:\n");

 // Reset the object to iterate over it again
Expand All@@ -192,12 +192,12 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
 if (!field.unescaped_key().get(key_str) && !field.value().get(value) &&
 !value.get_string().get(value_str)) {
 fprintf(stderr,
 " %s: %s\n",
std::string(key_str).c_str(),
std::string(value_str).c_str());
 " %.*s: %.*s\n",
static_cast<int>(key_str.size()), key_str.data(),
static_cast<int>(value_str.size()), value_str.data());
 }
 }
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

Expand Down

6 changes: 3 additions & 3 deletions
src/node_task_runner.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ namespace task_runner {

class ProcessRunner {
 public:
 ProcessRunner(std::unique_ptr<InitializationResultImpl>* result,
 ProcessRunner(std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command_id,
 const std::optional<std::string>& positional_args);
 void Run();
Expand All@@ -29,14 +29,14 @@ class ProcessRunner {
 uv_process_t process_{};
 uv_process_options_t options_{};
 uv_stdio_container_t child_stdio[3];
 std::unique_ptr<InitializationResultImpl>* init_result;
 std::shared_ptr<InitializationResultImpl> init_result;
 std::vector<std::string> command_args_{};
 std::vector<std::string> env_vars_{};

 void OnExit(int64_t exit_status, int term_signal);
};

void RunTask(std::unique_ptr<InitializationResultImpl>* result,
void RunTask(std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command_id,
 const std::optional<std::string>& positional_args);
std::optional<std::string> GetPositionalArgs(
Expand Down

2 changes: 1 addition & 1 deletion
test/embedding/embedtest.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ static int RunNodeInstance(MultiIsolatePlatform* platform,
intmain(int argc, char** argv) {
 argv = uv_setup_args(argc, argv);
 std::vector<std::string> args(argv, argv + argc);
 std::unique_ptr<node::InitializationResult> result =
 std::shared_ptr<node::InitializationResult> result =
node::InitializeOncePerProcess(
 args,
 {node::ProcessInitializationFlags::kNoInitializeV8,
Expand Down

2 changes: 1 addition & 1 deletion
tools/snapshot/node_mksnapshot.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ int BuildSnapshot(int argc, char* argv[]) {
 return 1;
 }

 std::unique_ptr<node::InitializationResult> result =
 std::shared_ptr<node::InitializationResult> result =
 node::InitializeOncePerProcess(
 std::vector<std::string>(argv, argv + argc),
 node::ProcessInitializationFlags::kGeneratePredictableSnapshot);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix: use std::shared_ptr instead of std::unique_ptr for shared ressource, use operator[] instead of find_field#11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lemire
merged 1 commit into

from

Apr 24, 2024
 Merged


fix: use std::shared_ptr instead of std::unique_ptr for shared ressource, use operator[] instead of find_field
#11
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 5 additions & 5 deletions
src/node.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1022,11 +1022,11 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
 InitializeNodeWithArgsInternal(argv, exec_argv, errors, flags));
}

static std::unique_ptr<InitializationResultImpl>
static std::shared_ptr<InitializationResultImpl>
InitializeOncePerProcessInternal(const std::vector<std::string>& args,
 ProcessInitializationFlags::Flags flags =
 ProcessInitializationFlags::kNoFlags) {
 auto result = std::make_unique<InitializationResultImpl>();
 auto result = std::make_shared<InitializationResultImpl>();
 result->args_ = args;

 if (!(flags & ProcessInitializationFlags::kNoParseGlobalDebugVariables)) {
Expand DownExpand Up@@ -1068,7 +1068,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
 auto positional_args = task_runner::GetPositionalArgs(args);
 result->early_return_ = true;
 task_runner::RunTask(
&result, per_process::cli_options->run, positional_args);
 result, per_process::cli_options->run, positional_args);
 return result;
 }

Expand DownExpand Up@@ -1231,7 +1231,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
 return result;
}

std::unique_ptr<InitializationResult> InitializeOncePerProcess(
std::shared_ptr<InitializationResult> InitializeOncePerProcess(
 const std::vector<std::string>& args,
 ProcessInitializationFlags::Flags flags) {
 return InitializeOncePerProcessInternal(args, flags);
Expand DownExpand Up@@ -1437,7 +1437,7 @@ static ExitCode StartInternal(int argc, char** argv) {
 // Hack around with the argv pointer. Used for process.title = "blah".
 argv = uv_setup_args(argc, argv);

 std::unique_ptr<InitializationResultImpl> result =
 std::shared_ptr<InitializationResultImpl> result =
 InitializeOncePerProcessInternal(
 std::vector<std::string>(argv, argv + argc));
 for (const std::string& error : result->errors()) {
Expand Down

4 changes: 2 additions & 2 deletions
src/node.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -349,7 +349,7 @@ NODE_DEPRECATED("Use InitializeOncePerProcess() instead",
// including the arguments split into argv/exec_argv, a list of potential
// errors encountered during initialization, and a potential suggested
// exit code.
NODE_EXTERN std::unique_ptr<InitializationResult> InitializeOncePerProcess(
NODE_EXTERN std::shared_ptr<InitializationResult> InitializeOncePerProcess(
 const std::vector<std::string>& args,
 ProcessInitializationFlags::Flags flags =
 ProcessInitializationFlags::kNoFlags);
Expand All@@ -358,7 +358,7 @@ NODE_EXTERN std::unique_ptr<InitializationResult> InitializeOncePerProcess(
NODE_EXTERN void TearDownOncePerProcess();
// Convenience overload for specifying multiple flags without having
// to worry about casts.
inline std::unique_ptr<InitializationResult> InitializeOncePerProcess(
inline std::shared_ptr<InitializationResult> InitializeOncePerProcess(
 const std::vector<std::string>& args,
 std::initializer_list<ProcessInitializationFlags::Flags> list) {
 uint64_t flags_accum = ProcessInitializationFlags::kNoFlags;
Expand Down

28 changes: 14 additions & 14 deletions
src/node_task_runner.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ static const char task_file[] = "/bin/sh";
#endif // _WIN32

ProcessRunner::ProcessRunner(
 std::unique_ptr<InitializationResultImpl>* result,
 std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command,
 const std::optional<std::string>& positional_args) {
 memset(&options_, 0, sizeof(uv_process_options_t));
Expand DownExpand Up@@ -130,9 +130,9 @@ void ProcessRunner::ExitCallback(uv_process_t* handle,

void ProcessRunner::OnExit(int64_t exit_status, int term_signal) {
 if (exit_status > 0) {
 init_result->get()->exit_code_ = ExitCode::kGenericUserError;
 init_result.get()->exit_code_ = ExitCode::kGenericUserError;
 } else {
 init_result->get()->exit_code_ = ExitCode::kNoFailure;
 init_result.get()->exit_code_ = ExitCode::kNoFailure;
 }
}

Expand All@@ -144,7 +144,7 @@ void ProcessRunner::Run() {
 uv_run(loop_, UV_RUN_DEFAULT);
}

void RunTask(std::unique_ptr<InitializationResultImpl>* result,
void RunTask(std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command_id,
 const std::optional<std::string>& positional_args) {
 std::string_view path = "package.json";
Expand All@@ -153,7 +153,7 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
 // No need to exclude BOM since simdjson will skip it.
 if (ReadFileSync(&raw_json, path.data()) < 0) {
 fprintf(stderr, "Can't read package.json\n");
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

Expand All@@ -165,22 +165,22 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
 // If document is not an object, throw an error.
 if (error || document.get_object().get(main_object)) {
 fprintf(stderr, "Can't parse package.json\n");
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

 // If package_json object doesn't have "scripts" field, throw an error.
 simdjson::ondemand::object scripts_object;
 if (main_object.find_field("scripts").get_object().get(scripts_object)) {
 if (main_object["scripts"].get_object().get(scripts_object)) {
 fprintf(stderr, "Can't find \"scripts\" field in package.json\n");
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

 // If the command_id is not found in the scripts object, throw an error.
 std::string_view command;
 if (scripts_object.find_field(command_id).get_string().get(command)) {
 fprintf(stderr, "Missing script: \"%s\"\n\n", command_id.data());
 if (scripts_object[command_id].get_string().get(command)) {
 fprintf(stderr, "Missing script: \"%.*s\"\n\n", static_cast<int>(command_id.size()), command_id.data());
 fprintf(stderr, "Available scripts are:\n");

 // Reset the object to iterate over it again
Expand All@@ -192,12 +192,12 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
 if (!field.unescaped_key().get(key_str) && !field.value().get(value) &&
 !value.get_string().get(value_str)) {
 fprintf(stderr,
 " %s: %s\n",
std::string(key_str).c_str(),
std::string(value_str).c_str());
 " %.*s: %.*s\n",
static_cast<int>(key_str.size()), key_str.data(),
static_cast<int>(value_str.size()), value_str.data());
 }
 }
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

Expand Down

6 changes: 3 additions & 3 deletions
src/node_task_runner.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ namespace task_runner {

class ProcessRunner {
 public:
 ProcessRunner(std::unique_ptr<InitializationResultImpl>* result,
 ProcessRunner(std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command_id,
 const std::optional<std::string>& positional_args);
 void Run();
Expand All@@ -29,14 +29,14 @@ class ProcessRunner {
 uv_process_t process_{};
 uv_process_options_t options_{};
 uv_stdio_container_t child_stdio[3];
 std::unique_ptr<InitializationResultImpl>* init_result;
 std::shared_ptr<InitializationResultImpl> init_result;
 std::vector<std::string> command_args_{};
 std::vector<std::string> env_vars_{};

 void OnExit(int64_t exit_status, int term_signal);
};

void RunTask(std::unique_ptr<InitializationResultImpl>* result,
void RunTask(std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command_id,
 const std::optional<std::string>& positional_args);
std::optional<std::string> GetPositionalArgs(
Expand Down

2 changes: 1 addition & 1 deletion
test/embedding/embedtest.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ static int RunNodeInstance(MultiIsolatePlatform* platform,
intmain(int argc, char** argv) {
 argv = uv_setup_args(argc, argv);
 std::vector<std::string> args(argv, argv + argc);
 std::unique_ptr<node::InitializationResult> result =
 std::shared_ptr<node::InitializationResult> result =
node::InitializeOncePerProcess(
 args,
 {node::ProcessInitializationFlags::kNoInitializeV8,
Expand Down

2 changes: 1 addition & 1 deletion
tools/snapshot/node_mksnapshot.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ int BuildSnapshot(int argc, char* argv[]) {
 return 1;
 }

 std::unique_ptr<node::InitializationResult> result =
 std::shared_ptr<node::InitializationResult> result =
 node::InitializeOncePerProcess(
 std::vector<std::string>(argv, argv + argc),
 node::ProcessInitializationFlags::kGeneratePredictableSnapshot);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: use std::shared_ptr instead of std::unique_ptr for shared ressource, use operator[] instead of find_field#11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lemire
merged 1 commit into

from

Apr 24, 2024
 Merged


fix: use std::shared_ptr instead of std::unique_ptr for shared ressource, use operator[] instead of find_field
#11
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 5 additions & 5 deletions
src/node.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1022,11 +1022,11 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
 InitializeNodeWithArgsInternal(argv, exec_argv, errors, flags));
}

static std::unique_ptr<InitializationResultImpl>
static std::shared_ptr<InitializationResultImpl>
InitializeOncePerProcessInternal(const std::vector<std::string>& args,
 ProcessInitializationFlags::Flags flags =
 ProcessInitializationFlags::kNoFlags) {
 auto result = std::make_unique<InitializationResultImpl>();
 auto result = std::make_shared<InitializationResultImpl>();
 result->args_ = args;

 if (!(flags & ProcessInitializationFlags::kNoParseGlobalDebugVariables)) {
Expand DownExpand Up@@ -1068,7 +1068,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
 auto positional_args = task_runner::GetPositionalArgs(args);
 result->early_return_ = true;
 task_runner::RunTask(
&result, per_process::cli_options->run, positional_args);
 result, per_process::cli_options->run, positional_args);
 return result;
 }

Expand DownExpand Up@@ -1231,7 +1231,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
 return result;
}

std::unique_ptr<InitializationResult> InitializeOncePerProcess(
std::shared_ptr<InitializationResult> InitializeOncePerProcess(
 const std::vector<std::string>& args,
 ProcessInitializationFlags::Flags flags) {
 return InitializeOncePerProcessInternal(args, flags);
Expand DownExpand Up@@ -1437,7 +1437,7 @@ static ExitCode StartInternal(int argc, char** argv) {
 // Hack around with the argv pointer. Used for process.title = "blah".
 argv = uv_setup_args(argc, argv);

 std::unique_ptr<InitializationResultImpl> result =
 std::shared_ptr<InitializationResultImpl> result =
 InitializeOncePerProcessInternal(
 std::vector<std::string>(argv, argv + argc));
 for (const std::string& error : result->errors()) {
Expand Down

4 changes: 2 additions & 2 deletions
src/node.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -349,7 +349,7 @@ NODE_DEPRECATED("Use InitializeOncePerProcess() instead",
// including the arguments split into argv/exec_argv, a list of potential
// errors encountered during initialization, and a potential suggested
// exit code.
NODE_EXTERN std::unique_ptr<InitializationResult> InitializeOncePerProcess(
NODE_EXTERN std::shared_ptr<InitializationResult> InitializeOncePerProcess(
 const std::vector<std::string>& args,
 ProcessInitializationFlags::Flags flags =
 ProcessInitializationFlags::kNoFlags);
Expand All@@ -358,7 +358,7 @@ NODE_EXTERN std::unique_ptr<InitializationResult> InitializeOncePerProcess(
NODE_EXTERN void TearDownOncePerProcess();
// Convenience overload for specifying multiple flags without having
// to worry about casts.
inline std::unique_ptr<InitializationResult> InitializeOncePerProcess(
inline std::shared_ptr<InitializationResult> InitializeOncePerProcess(
 const std::vector<std::string>& args,
 std::initializer_list<ProcessInitializationFlags::Flags> list) {
 uint64_t flags_accum = ProcessInitializationFlags::kNoFlags;
Expand Down

28 changes: 14 additions & 14 deletions
src/node_task_runner.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ static const char task_file[] = "/bin/sh";
#endif // _WIN32

ProcessRunner::ProcessRunner(
 std::unique_ptr<InitializationResultImpl>* result,
 std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command,
 const std::optional<std::string>& positional_args) {
 memset(&options_, 0, sizeof(uv_process_options_t));
Expand DownExpand Up@@ -130,9 +130,9 @@ void ProcessRunner::ExitCallback(uv_process_t* handle,

void ProcessRunner::OnExit(int64_t exit_status, int term_signal) {
 if (exit_status > 0) {
 init_result->get()->exit_code_ = ExitCode::kGenericUserError;
 init_result.get()->exit_code_ = ExitCode::kGenericUserError;
 } else {
 init_result->get()->exit_code_ = ExitCode::kNoFailure;
 init_result.get()->exit_code_ = ExitCode::kNoFailure;
 }
}

Expand All@@ -144,7 +144,7 @@ void ProcessRunner::Run() {
 uv_run(loop_, UV_RUN_DEFAULT);
}

void RunTask(std::unique_ptr<InitializationResultImpl>* result,
void RunTask(std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command_id,
 const std::optional<std::string>& positional_args) {
 std::string_view path = "package.json";
Expand All@@ -153,7 +153,7 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
 // No need to exclude BOM since simdjson will skip it.
 if (ReadFileSync(&raw_json, path.data()) < 0) {
 fprintf(stderr, "Can't read package.json\n");
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

Expand All@@ -165,22 +165,22 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
 // If document is not an object, throw an error.
 if (error || document.get_object().get(main_object)) {
 fprintf(stderr, "Can't parse package.json\n");
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

 // If package_json object doesn't have "scripts" field, throw an error.
 simdjson::ondemand::object scripts_object;
 if (main_object.find_field("scripts").get_object().get(scripts_object)) {
 if (main_object["scripts"].get_object().get(scripts_object)) {
 fprintf(stderr, "Can't find \"scripts\" field in package.json\n");
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

 // If the command_id is not found in the scripts object, throw an error.
 std::string_view command;
 if (scripts_object.find_field(command_id).get_string().get(command)) {
 fprintf(stderr, "Missing script: \"%s\"\n\n", command_id.data());
 if (scripts_object[command_id].get_string().get(command)) {
 fprintf(stderr, "Missing script: \"%.*s\"\n\n", static_cast<int>(command_id.size()), command_id.data());
 fprintf(stderr, "Available scripts are:\n");

 // Reset the object to iterate over it again
Expand All@@ -192,12 +192,12 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
 if (!field.unescaped_key().get(key_str) && !field.value().get(value) &&
 !value.get_string().get(value_str)) {
 fprintf(stderr,
 " %s: %s\n",
std::string(key_str).c_str(),
std::string(value_str).c_str());
 " %.*s: %.*s\n",
static_cast<int>(key_str.size()), key_str.data(),
static_cast<int>(value_str.size()), value_str.data());
 }
 }
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

Expand Down

6 changes: 3 additions & 3 deletions
src/node_task_runner.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ namespace task_runner {

class ProcessRunner {
 public:
 ProcessRunner(std::unique_ptr<InitializationResultImpl>* result,
 ProcessRunner(std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command_id,
 const std::optional<std::string>& positional_args);
 void Run();
Expand All@@ -29,14 +29,14 @@ class ProcessRunner {
 uv_process_t process_{};
 uv_process_options_t options_{};
 uv_stdio_container_t child_stdio[3];
 std::unique_ptr<InitializationResultImpl>* init_result;
 std::shared_ptr<InitializationResultImpl> init_result;
 std::vector<std::string> command_args_{};
 std::vector<std::string> env_vars_{};

 void OnExit(int64_t exit_status, int term_signal);
};

void RunTask(std::unique_ptr<InitializationResultImpl>* result,
void RunTask(std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command_id,
 const std::optional<std::string>& positional_args);
std::optional<std::string> GetPositionalArgs(
Expand Down

2 changes: 1 addition & 1 deletion
test/embedding/embedtest.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ static int RunNodeInstance(MultiIsolatePlatform* platform,
intmain(int argc, char** argv) {
 argv = uv_setup_args(argc, argv);
 std::vector<std::string> args(argv, argv + argc);
 std::unique_ptr<node::InitializationResult> result =
 std::shared_ptr<node::InitializationResult> result =
node::InitializeOncePerProcess(
 args,
 {node::ProcessInitializationFlags::kNoInitializeV8,
Expand Down

2 changes: 1 addition & 1 deletion
tools/snapshot/node_mksnapshot.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ int BuildSnapshot(int argc, char* argv[]) {
 return 1;
 }

 std::unique_ptr<node::InitializationResult> result =
 std::shared_ptr<node::InitializationResult> result =
 node::InitializeOncePerProcess(
 std::vector<std::string>(argv, argv + argc),
 node::ProcessInitializationFlags::kGeneratePredictableSnapshot);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: use std::shared_ptr instead of std::unique_ptr for shared ressource, use operator[] instead of find_field#11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lemire
merged 1 commit into

from

Apr 24, 2024
 Merged


fix: use std::shared_ptr instead of std::unique_ptr for shared ressource, use operator[] instead of find_field
#11
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 5 additions & 5 deletions
src/node.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1022,11 +1022,11 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
 InitializeNodeWithArgsInternal(argv, exec_argv, errors, flags));
}

static std::unique_ptr<InitializationResultImpl>
static std::shared_ptr<InitializationResultImpl>
InitializeOncePerProcessInternal(const std::vector<std::string>& args,
 ProcessInitializationFlags::Flags flags =
 ProcessInitializationFlags::kNoFlags) {
 auto result = std::make_unique<InitializationResultImpl>();
 auto result = std::make_shared<InitializationResultImpl>();
 result->args_ = args;

 if (!(flags & ProcessInitializationFlags::kNoParseGlobalDebugVariables)) {
Expand DownExpand Up@@ -1068,7 +1068,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
 auto positional_args = task_runner::GetPositionalArgs(args);
 result->early_return_ = true;
 task_runner::RunTask(
&result, per_process::cli_options->run, positional_args);
 result, per_process::cli_options->run, positional_args);
 return result;
 }

Expand DownExpand Up@@ -1231,7 +1231,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
 return result;
}

std::unique_ptr<InitializationResult> InitializeOncePerProcess(
std::shared_ptr<InitializationResult> InitializeOncePerProcess(
 const std::vector<std::string>& args,
 ProcessInitializationFlags::Flags flags) {
 return InitializeOncePerProcessInternal(args, flags);
Expand DownExpand Up@@ -1437,7 +1437,7 @@ static ExitCode StartInternal(int argc, char** argv) {
 // Hack around with the argv pointer. Used for process.title = "blah".
 argv = uv_setup_args(argc, argv);

 std::unique_ptr<InitializationResultImpl> result =
 std::shared_ptr<InitializationResultImpl> result =
 InitializeOncePerProcessInternal(
 std::vector<std::string>(argv, argv + argc));
 for (const std::string& error : result->errors()) {
Expand Down

4 changes: 2 additions & 2 deletions
src/node.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -349,7 +349,7 @@ NODE_DEPRECATED("Use InitializeOncePerProcess() instead",
// including the arguments split into argv/exec_argv, a list of potential
// errors encountered during initialization, and a potential suggested
// exit code.
NODE_EXTERN std::unique_ptr<InitializationResult> InitializeOncePerProcess(
NODE_EXTERN std::shared_ptr<InitializationResult> InitializeOncePerProcess(
 const std::vector<std::string>& args,
 ProcessInitializationFlags::Flags flags =
 ProcessInitializationFlags::kNoFlags);
Expand All@@ -358,7 +358,7 @@ NODE_EXTERN std::unique_ptr<InitializationResult> InitializeOncePerProcess(
NODE_EXTERN void TearDownOncePerProcess();
// Convenience overload for specifying multiple flags without having
// to worry about casts.
inline std::unique_ptr<InitializationResult> InitializeOncePerProcess(
inline std::shared_ptr<InitializationResult> InitializeOncePerProcess(
 const std::vector<std::string>& args,
 std::initializer_list<ProcessInitializationFlags::Flags> list) {
 uint64_t flags_accum = ProcessInitializationFlags::kNoFlags;
Expand Down

28 changes: 14 additions & 14 deletions
src/node_task_runner.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ static const char task_file[] = "/bin/sh";
#endif // _WIN32

ProcessRunner::ProcessRunner(
 std::unique_ptr<InitializationResultImpl>* result,
 std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command,
 const std::optional<std::string>& positional_args) {
 memset(&options_, 0, sizeof(uv_process_options_t));
Expand DownExpand Up@@ -130,9 +130,9 @@ void ProcessRunner::ExitCallback(uv_process_t* handle,

void ProcessRunner::OnExit(int64_t exit_status, int term_signal) {
 if (exit_status > 0) {
 init_result->get()->exit_code_ = ExitCode::kGenericUserError;
 init_result.get()->exit_code_ = ExitCode::kGenericUserError;
 } else {
 init_result->get()->exit_code_ = ExitCode::kNoFailure;
 init_result.get()->exit_code_ = ExitCode::kNoFailure;
 }
}

Expand All@@ -144,7 +144,7 @@ void ProcessRunner::Run() {
 uv_run(loop_, UV_RUN_DEFAULT);
}

void RunTask(std::unique_ptr<InitializationResultImpl>* result,
void RunTask(std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command_id,
 const std::optional<std::string>& positional_args) {
 std::string_view path = "package.json";
Expand All@@ -153,7 +153,7 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
 // No need to exclude BOM since simdjson will skip it.
 if (ReadFileSync(&raw_json, path.data()) < 0) {
 fprintf(stderr, "Can't read package.json\n");
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

Expand All@@ -165,22 +165,22 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
 // If document is not an object, throw an error.
 if (error || document.get_object().get(main_object)) {
 fprintf(stderr, "Can't parse package.json\n");
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

 // If package_json object doesn't have "scripts" field, throw an error.
 simdjson::ondemand::object scripts_object;
 if (main_object.find_field("scripts").get_object().get(scripts_object)) {
 if (main_object["scripts"].get_object().get(scripts_object)) {
 fprintf(stderr, "Can't find \"scripts\" field in package.json\n");
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

 // If the command_id is not found in the scripts object, throw an error.
 std::string_view command;
 if (scripts_object.find_field(command_id).get_string().get(command)) {
 fprintf(stderr, "Missing script: \"%s\"\n\n", command_id.data());
 if (scripts_object[command_id].get_string().get(command)) {
 fprintf(stderr, "Missing script: \"%.*s\"\n\n", static_cast<int>(command_id.size()), command_id.data());
 fprintf(stderr, "Available scripts are:\n");

 // Reset the object to iterate over it again
Expand All@@ -192,12 +192,12 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
 if (!field.unescaped_key().get(key_str) && !field.value().get(value) &&
 !value.get_string().get(value_str)) {
 fprintf(stderr,
 " %s: %s\n",
std::string(key_str).c_str(),
std::string(value_str).c_str());
 " %.*s: %.*s\n",
static_cast<int>(key_str.size()), key_str.data(),
static_cast<int>(value_str.size()), value_str.data());
 }
 }
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

Expand Down

6 changes: 3 additions & 3 deletions
src/node_task_runner.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ namespace task_runner {

class ProcessRunner {
 public:
 ProcessRunner(std::unique_ptr<InitializationResultImpl>* result,
 ProcessRunner(std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command_id,
 const std::optional<std::string>& positional_args);
 void Run();
Expand All@@ -29,14 +29,14 @@ class ProcessRunner {
 uv_process_t process_{};
 uv_process_options_t options_{};
 uv_stdio_container_t child_stdio[3];
 std::unique_ptr<InitializationResultImpl>* init_result;
 std::shared_ptr<InitializationResultImpl> init_result;
 std::vector<std::string> command_args_{};
 std::vector<std::string> env_vars_{};

 void OnExit(int64_t exit_status, int term_signal);
};

void RunTask(std::unique_ptr<InitializationResultImpl>* result,
void RunTask(std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command_id,
 const std::optional<std::string>& positional_args);
std::optional<std::string> GetPositionalArgs(
Expand Down

2 changes: 1 addition & 1 deletion
test/embedding/embedtest.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ static int RunNodeInstance(MultiIsolatePlatform* platform,
intmain(int argc, char** argv) {
 argv = uv_setup_args(argc, argv);
 std::vector<std::string> args(argv, argv + argc);
 std::unique_ptr<node::InitializationResult> result =
 std::shared_ptr<node::InitializationResult> result =
node::InitializeOncePerProcess(
 args,
 {node::ProcessInitializationFlags::kNoInitializeV8,
Expand Down

2 changes: 1 addition & 1 deletion
tools/snapshot/node_mksnapshot.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ int BuildSnapshot(int argc, char* argv[]) {
 return 1;
 }

 std::unique_ptr<node::InitializationResult> result =
 std::shared_ptr<node::InitializationResult> result =
 node::InitializeOncePerProcess(
 std::vector<std::string>(argv, argv + argc),
 node::ProcessInitializationFlags::kGeneratePredictableSnapshot);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix: use std::shared_ptr instead of std::unique_ptr for shared ressource, use operator[] instead of find_field#11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lemire
merged 1 commit into

from

Apr 24, 2024
 Merged


fix: use std::shared_ptr instead of std::unique_ptr for shared ressource, use operator[] instead of find_field
#11
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 5 additions & 5 deletions
src/node.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1022,11 +1022,11 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
 InitializeNodeWithArgsInternal(argv, exec_argv, errors, flags));
}

static std::unique_ptr<InitializationResultImpl>
static std::shared_ptr<InitializationResultImpl>
InitializeOncePerProcessInternal(const std::vector<std::string>& args,
 ProcessInitializationFlags::Flags flags =
 ProcessInitializationFlags::kNoFlags) {
 auto result = std::make_unique<InitializationResultImpl>();
 auto result = std::make_shared<InitializationResultImpl>();
 result->args_ = args;

 if (!(flags & ProcessInitializationFlags::kNoParseGlobalDebugVariables)) {
Expand DownExpand Up@@ -1068,7 +1068,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
 auto positional_args = task_runner::GetPositionalArgs(args);
 result->early_return_ = true;
 task_runner::RunTask(
&result, per_process::cli_options->run, positional_args);
 result, per_process::cli_options->run, positional_args);
 return result;
 }

Expand DownExpand Up@@ -1231,7 +1231,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
 return result;
}

std::unique_ptr<InitializationResult> InitializeOncePerProcess(
std::shared_ptr<InitializationResult> InitializeOncePerProcess(
 const std::vector<std::string>& args,
 ProcessInitializationFlags::Flags flags) {
 return InitializeOncePerProcessInternal(args, flags);
Expand DownExpand Up@@ -1437,7 +1437,7 @@ static ExitCode StartInternal(int argc, char** argv) {
 // Hack around with the argv pointer. Used for process.title = "blah".
 argv = uv_setup_args(argc, argv);

 std::unique_ptr<InitializationResultImpl> result =
 std::shared_ptr<InitializationResultImpl> result =
 InitializeOncePerProcessInternal(
 std::vector<std::string>(argv, argv + argc));
 for (const std::string& error : result->errors()) {
Expand Down

4 changes: 2 additions & 2 deletions
src/node.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -349,7 +349,7 @@ NODE_DEPRECATED("Use InitializeOncePerProcess() instead",
// including the arguments split into argv/exec_argv, a list of potential
// errors encountered during initialization, and a potential suggested
// exit code.
NODE_EXTERN std::unique_ptr<InitializationResult> InitializeOncePerProcess(
NODE_EXTERN std::shared_ptr<InitializationResult> InitializeOncePerProcess(
 const std::vector<std::string>& args,
 ProcessInitializationFlags::Flags flags =
 ProcessInitializationFlags::kNoFlags);
Expand All@@ -358,7 +358,7 @@ NODE_EXTERN std::unique_ptr<InitializationResult> InitializeOncePerProcess(
NODE_EXTERN void TearDownOncePerProcess();
// Convenience overload for specifying multiple flags without having
// to worry about casts.
inline std::unique_ptr<InitializationResult> InitializeOncePerProcess(
inline std::shared_ptr<InitializationResult> InitializeOncePerProcess(
 const std::vector<std::string>& args,
 std::initializer_list<ProcessInitializationFlags::Flags> list) {
 uint64_t flags_accum = ProcessInitializationFlags::kNoFlags;
Expand Down

28 changes: 14 additions & 14 deletions
src/node_task_runner.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ static const char task_file[] = "/bin/sh";
#endif // _WIN32

ProcessRunner::ProcessRunner(
 std::unique_ptr<InitializationResultImpl>* result,
 std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command,
 const std::optional<std::string>& positional_args) {
 memset(&options_, 0, sizeof(uv_process_options_t));
Expand DownExpand Up@@ -130,9 +130,9 @@ void ProcessRunner::ExitCallback(uv_process_t* handle,

void ProcessRunner::OnExit(int64_t exit_status, int term_signal) {
 if (exit_status > 0) {
 init_result->get()->exit_code_ = ExitCode::kGenericUserError;
 init_result.get()->exit_code_ = ExitCode::kGenericUserError;
 } else {
 init_result->get()->exit_code_ = ExitCode::kNoFailure;
 init_result.get()->exit_code_ = ExitCode::kNoFailure;
 }
}

Expand All@@ -144,7 +144,7 @@ void ProcessRunner::Run() {
 uv_run(loop_, UV_RUN_DEFAULT);
}

void RunTask(std::unique_ptr<InitializationResultImpl>* result,
void RunTask(std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command_id,
 const std::optional<std::string>& positional_args) {
 std::string_view path = "package.json";
Expand All@@ -153,7 +153,7 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
 // No need to exclude BOM since simdjson will skip it.
 if (ReadFileSync(&raw_json, path.data()) < 0) {
 fprintf(stderr, "Can't read package.json\n");
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

Expand All@@ -165,22 +165,22 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
 // If document is not an object, throw an error.
 if (error || document.get_object().get(main_object)) {
 fprintf(stderr, "Can't parse package.json\n");
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

 // If package_json object doesn't have "scripts" field, throw an error.
 simdjson::ondemand::object scripts_object;
 if (main_object.find_field("scripts").get_object().get(scripts_object)) {
 if (main_object["scripts"].get_object().get(scripts_object)) {
 fprintf(stderr, "Can't find \"scripts\" field in package.json\n");
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

 // If the command_id is not found in the scripts object, throw an error.
 std::string_view command;
 if (scripts_object.find_field(command_id).get_string().get(command)) {
 fprintf(stderr, "Missing script: \"%s\"\n\n", command_id.data());
 if (scripts_object[command_id].get_string().get(command)) {
 fprintf(stderr, "Missing script: \"%.*s\"\n\n", static_cast<int>(command_id.size()), command_id.data());
 fprintf(stderr, "Available scripts are:\n");

 // Reset the object to iterate over it again
Expand All@@ -192,12 +192,12 @@ void RunTask(std::unique_ptr<InitializationResultImpl>* result,
 if (!field.unescaped_key().get(key_str) && !field.value().get(value) &&
 !value.get_string().get(value_str)) {
 fprintf(stderr,
 " %s: %s\n",
std::string(key_str).c_str(),
std::string(value_str).c_str());
 " %.*s: %.*s\n",
static_cast<int>(key_str.size()), key_str.data(),
static_cast<int>(value_str.size()), value_str.data());
 }
 }
 result->get()->exit_code_ = ExitCode::kGenericUserError;
 result.get()->exit_code_ = ExitCode::kGenericUserError;
 return;
 }

Expand Down

6 changes: 3 additions & 3 deletions
src/node_task_runner.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ namespace task_runner {

class ProcessRunner {
 public:
 ProcessRunner(std::unique_ptr<InitializationResultImpl>* result,
 ProcessRunner(std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command_id,
 const std::optional<std::string>& positional_args);
 void Run();
Expand All@@ -29,14 +29,14 @@ class ProcessRunner {
 uv_process_t process_{};
 uv_process_options_t options_{};
 uv_stdio_container_t child_stdio[3];
 std::unique_ptr<InitializationResultImpl>* init_result;
 std::shared_ptr<InitializationResultImpl> init_result;
 std::vector<std::string> command_args_{};
 std::vector<std::string> env_vars_{};

 void OnExit(int64_t exit_status, int term_signal);
};

void RunTask(std::unique_ptr<InitializationResultImpl>* result,
void RunTask(std::shared_ptr<InitializationResultImpl>& result,
 std::string_view command_id,
 const std::optional<std::string>& positional_args);
std::optional<std::string> GetPositionalArgs(
Expand Down

2 changes: 1 addition & 1 deletion
test/embedding/embedtest.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ static int RunNodeInstance(MultiIsolatePlatform* platform,
intmain(int argc, char** argv) {
 argv = uv_setup_args(argc, argv);
 std::vector<std::string> args(argv, argv + argc);
 std::unique_ptr<node::InitializationResult> result =
 std::shared_ptr<node::InitializationResult> result =
node::InitializeOncePerProcess(
 args,
 {node::ProcessInitializationFlags::kNoInitializeV8,
Expand Down

2 changes: 1 addition & 1 deletion
tools/snapshot/node_mksnapshot.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ int BuildSnapshot(int argc, char* argv[]) {
 return 1;
 }

 std::unique_ptr<node::InitializationResult> result =
 std::shared_ptr<node::InitializationResult> result =
 node::InitializeOncePerProcess(
 std::vector<std::string>(argv, argv + argc),
 node::ProcessInitializationFlags::kGeneratePredictableSnapshot);
Expand Down