Mathis/sharp
1
0
Fork 0
mirror of https://github.com/lovell/sharp.git synced 2025-07-09 18:40:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use std::atomic for counters

Browse Source
This commit is contained in:
Lovell Fuller 2023-09-30 14:01:04 +01:00
parent 265d70111a
commit 70ac6905c7
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common.cc
View File

@ -166,10 +166,10 @@ namespace sharp {
} }
// How many tasks are in the queue? // How many tasks are in the queue?
volatile int counterQueue = 0; std::atomic<int> counterQueue{0};
// How many tasks are being processed? // How many tasks are being processed?
volatile int counterProcess = 0; std::atomic<int> counterProcess{0};
// Filename extension checkers // Filename extension checkers
static bool EndsWith(std::string const &str, std::string const &end) { static bool EndsWith(std::string const &str, std::string const &end) {

5
src/common.h
View File

@ -7,6 +7,7 @@
#include <string> #include <string>
#include <tuple> #include <tuple>
#include <vector> #include <vector>
#include <atomic>
#include <napi.h> #include <napi.h>
#include <vips/vips8> #include <vips/vips8>
@ -161,10 +162,10 @@ namespace sharp {
}; };
// How many tasks are in the queue? // How many tasks are in the queue?
extern volatile int counterQueue; extern std::atomic<int> counterQueue;
// How many tasks are being processed? // How many tasks are being processed?
extern volatile int counterProcess; extern std::atomic<int> counterProcess;
// Filename extension checkers // Filename extension checkers
bool IsJpeg(std::string const &str); bool IsJpeg(std::string const &str);

4
src/metadata.cc
View File

@ -18,7 +18,7 @@ class MetadataWorker : public Napi::AsyncWorker {
void Execute() { void Execute() {
// Decrement queued task counter // Decrement queued task counter
g_atomic_int_dec_and_test(&sharp::counterQueue); sharp::counterQueue--;
vips::VImage image; vips::VImage image;
sharp::ImageType imageType = sharp::ImageType::UNKNOWN; sharp::ImageType imageType = sharp::ImageType::UNKNOWN;
@ -281,7 +281,7 @@ Napi::Value metadata(const Napi::CallbackInfo& info) {
worker->Queue(); worker->Queue();
// Increment queued task counter // Increment queued task counter
g_atomic_int_inc(&sharp::counterQueue); sharp::counterQueue++;
return info.Env().Undefined(); return info.Env().Undefined();
} }

11
src/pipeline.cc
View File

@ -44,9 +44,9 @@ class PipelineWorker : public Napi::AsyncWorker {
// libuv worker // libuv worker
void Execute() { void Execute() {
// Decrement queued task counter // Decrement queued task counter
g_atomic_int_dec_and_test(&sharp::counterQueue); sharp::counterQueue--;
// Increment processing task counter // Increment processing task counter
g_atomic_int_inc(&sharp::counterProcess); sharp::counterProcess++;
try { try {
// Open input // Open input
@ -1289,8 +1289,8 @@ class PipelineWorker : public Napi::AsyncWorker {
delete baton; delete baton;
// Decrement processing task counter // Decrement processing task counter
g_atomic_int_dec_and_test(&sharp::counterProcess); sharp::counterProcess--;
Napi::Number queueLength = Napi::Number::New(env, static_cast<double>(sharp::counterQueue)); Napi::Number queueLength = Napi::Number::New(env, static_cast<int>(sharp::counterQueue));
queueListener.MakeCallback(Receiver().Value(), { queueLength }); queueListener.MakeCallback(Receiver().Value(), { queueLength });
} }
@ -1707,8 +1707,7 @@ Napi::Value pipeline(const Napi::CallbackInfo& info) {
worker->Queue(); worker->Queue();
// Increment queued task counter // Increment queued task counter
g_atomic_int_inc(&sharp::counterQueue); Napi::Number queueLength = Napi::Number::New(info.Env(), static_cast<int>(++sharp::counterQueue));
Napi::Number queueLength = Napi::Number::New(info.Env(), static_cast<double>(sharp::counterQueue));
queueListener.MakeCallback(info.This(), { queueLength }); queueListener.MakeCallback(info.This(), { queueLength });
return info.Env().Undefined(); return info.Env().Undefined();

4
src/stats.cc
View File

@ -30,7 +30,7 @@ class StatsWorker : public Napi::AsyncWorker {
void Execute() { void Execute() {
// Decrement queued task counter // Decrement queued task counter
g_atomic_int_dec_and_test(&sharp::counterQueue); sharp::counterQueue--;
vips::VImage image; vips::VImage image;
sharp::ImageType imageType = sharp::ImageType::UNKNOWN; sharp::ImageType imageType = sharp::ImageType::UNKNOWN;
@ -177,7 +177,7 @@ Napi::Value stats(const Napi::CallbackInfo& info) {
worker->Queue(); worker->Queue();
// Increment queued task counter // Increment queued task counter
g_atomic_int_inc(&sharp::counterQueue); sharp::counterQueue++;
return info.Env().Undefined(); return info.Env().Undefined();
} }

4
src/utilities.cc
View File

@ -70,8 +70,8 @@ Napi::Value concurrency(const Napi::CallbackInfo& info) {
*/ */
Napi::Value counters(const Napi::CallbackInfo& info) { Napi::Value counters(const Napi::CallbackInfo& info) {
Napi::Object counters = Napi::Object::New(info.Env()); Napi::Object counters = Napi::Object::New(info.Env());
counters.Set("queue", sharp::counterQueue); counters.Set("queue", static_cast<int>(sharp::counterQueue));
counters.Set("process", sharp::counterProcess); counters.Set("process", static_cast<int>(sharp::counterProcess));
return counters; return counters;
} }