Skip to content

Macos compile issues fixed! #97

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
merged 4 commits into from
Sep 26, 2022
Merged

Macos compile issues fixed! #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b58f3f6
compile issue fixed!
ZahidZafar Sep 26, 2022
c2bd511
destructor changes
ZahidZafar Sep 26, 2022
3789929
changes
ZahidZafar Sep 26, 2022
04b4d31
compile issue fixed on macos
Sep 26, 2022
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
8 changes: 0 additions & 8 deletions src/countly.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ Countly::Countly() {
views_module = nullptr;
logger.reset(new cly::LoggerModule());
configuration.reset(new cly::CountlyConfiguration("", ""));

#if !defined(_WIN32) && !defined(COUNTLY_USE_CUSTOM_HTTP)
curl_global_init(CURL_GLOBAL_ALL);
#endif
}

Countly::~Countly() {
Expand All @@ -34,10 +30,6 @@ Countly::~Countly() {
crash_module.reset();
views_module.reset();
logger.reset();

#if !defined(_WIN32) && !defined(COUNTLY_USE_CUSTOM_HTTP)
curl_global_cleanup();
#endif
}

std::unique_ptr<Countly> _sharedInstance;
Expand Down
19 changes: 17 additions & 2 deletions src/request_module.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,17 +78,32 @@ RequestModule::RequestModule(std::shared_ptr<CountlyConfiguration> config, std::
impl.reset(new RequestModuleImpl(config, logger, requestBuilder));

impl->_logger->log(LogLevel::DEBUG, cly::utils::format_string("[RequestModule] Initialized"));

#if !defined(_WIN32) && !defined(COUNTLY_USE_CUSTOM_HTTP)
curl_global_init(CURL_GLOBAL_ALL);
#endif
}

RequestModule::~RequestModule() { impl.reset(); }
RequestModule::~RequestModule() {
impl.reset();
#if !defined(_WIN32) && !defined(COUNTLY_USE_CUSTOM_HTTP)
curl_global_cleanup();
#endif
}

static size_t countly_curl_write_callback(void *data, size_t byte_size, size_t n_bytes, std::string *body) {
size_t data_size = byte_size * n_bytes;
body->append((const char *)data, data_size);
return data_size;
}

void RequestModule::addRequestToQueue(const std::map<std::string, std::string> &data) {
if (impl->_configuration->requestQueueThreshold <= impl->request_queue.size()) {
impl->_logger->log(LogLevel::WARNING, cly::utils::format_string("[RequestModule] addRequestToQueue: Request Queue is full. Dropping the oldest request."));
impl->request_queue.pop_front();
}

std::string &request = impl->_requestBuilder->buildRequest(data);
const std::string &request = impl->_requestBuilder->buildRequest(data);
impl->request_queue.push_back(request);
}

Expand Down