Add new to_c_array() method to get a char** back.
This commit is contained in:
parent
ad7e5c8c27
commit
a6bf45fab9
7 changed files with 97 additions and 8 deletions
|
@ -122,6 +122,11 @@ void EnvBase::set_nolock (EnvBase& obj, std::string_view name, std::string_view
|
||||||
obj.set_implem(name, value, m);
|
obj.set_implem(name, value, m);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
EnvBase::size_type EnvBase::size_nolock(const EnvBase& obj) noexcept {
|
||||||
|
EmptyMutex m;
|
||||||
|
return obj.size_implem(m);
|
||||||
|
}
|
||||||
|
|
||||||
void EnvBase::clear() noexcept {
|
void EnvBase::clear() noexcept {
|
||||||
StdMutex m(this->mutex());
|
StdMutex m(this->mutex());
|
||||||
call_noexcept([this,&m](){this->clear_implem(m);}, to_string_view(__func__));
|
call_noexcept([this,&m](){this->clear_implem(m);}, to_string_view(__func__));
|
||||||
|
@ -134,6 +139,11 @@ void EnvBase::clear_nolock (EnvBase& obj) noexcept {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<char*[]> EnvBase::to_c_array() const {
|
||||||
|
StdMutex m(this->mutex());
|
||||||
|
return this->to_c_array_implem(m);
|
||||||
|
}
|
||||||
|
|
||||||
void EnvBase::set_all_into (EnvBase& other) const {
|
void EnvBase::set_all_into (EnvBase& other) const {
|
||||||
const bool tg = this->is_global();
|
const bool tg = this->is_global();
|
||||||
const bool og = other.is_global();
|
const bool og = other.is_global();
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
namespace duck {
|
namespace duck {
|
||||||
class EnvBase;
|
class EnvBase;
|
||||||
|
@ -74,6 +75,7 @@ namespace duck {
|
||||||
size_type size() const noexcept;
|
size_type size() const noexcept;
|
||||||
bool empty() const noexcept;
|
bool empty() const noexcept;
|
||||||
void clear() noexcept;
|
void clear() noexcept;
|
||||||
|
std::unique_ptr<char*[]> to_c_array() const;
|
||||||
|
|
||||||
virtual std::mutex& mutex() const noexcept = 0;
|
virtual std::mutex& mutex() const noexcept = 0;
|
||||||
|
|
||||||
|
@ -83,14 +85,17 @@ namespace duck {
|
||||||
virtual void clear_implem(Mutex& m) = 0;
|
virtual void clear_implem(Mutex& m) = 0;
|
||||||
static void clear_nolock (EnvBase& obj) noexcept;
|
static void clear_nolock (EnvBase& obj) noexcept;
|
||||||
|
|
||||||
virtual std::optional<std::string_view> get_implem (std::string_view name, Mutex& m) const = 0;
|
|
||||||
virtual std::string_view get_implem (std::string_view name, std::string_view def, Mutex& m) const = 0;
|
|
||||||
virtual void set_implem (std::string_view name, std::string_view value, Mutex& m) = 0;
|
virtual void set_implem (std::string_view name, std::string_view value, Mutex& m) = 0;
|
||||||
static void set_nolock (EnvBase& obj, std::string_view name, std::string_view value);
|
static void set_nolock (EnvBase& obj, std::string_view name, std::string_view value);
|
||||||
|
|
||||||
|
virtual size_type size_implem(Mutex& m) const noexcept = 0;
|
||||||
|
static size_type size_nolock(const EnvBase& obj) noexcept;
|
||||||
|
|
||||||
virtual void unset_implem (std::string_view name, Mutex& m) = 0;
|
virtual void unset_implem (std::string_view name, Mutex& m) = 0;
|
||||||
virtual bool is_set_implem (std::string_view name, Mutex& m) const = 0;
|
virtual bool is_set_implem (std::string_view name, Mutex& m) const = 0;
|
||||||
virtual size_type size_implem(Mutex& m) const = 0;
|
virtual std::optional<std::string_view> get_implem (std::string_view name, Mutex& m) const = 0;
|
||||||
|
virtual std::string_view get_implem (std::string_view name, std::string_view def, Mutex& m) const = 0;
|
||||||
|
virtual std::unique_ptr<char*[]> to_c_array_implem (Mutex& m) const = 0;
|
||||||
|
|
||||||
virtual bool is_global() const noexcept = 0;
|
virtual bool is_global() const noexcept = 0;
|
||||||
virtual uint32_t class_identifier() const noexcept = 0;
|
virtual uint32_t class_identifier() const noexcept = 0;
|
||||||
|
@ -119,5 +124,4 @@ namespace duck {
|
||||||
return (*m_env)[m_name];
|
return (*m_env)[m_name];
|
||||||
}
|
}
|
||||||
} //namespace detail
|
} //namespace detail
|
||||||
|
|
||||||
} //namespace duck
|
} //namespace duck
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
#include "safe_print.hpp"
|
#include "safe_print.hpp"
|
||||||
#include "string_view_cat.hpp"
|
#include "string_view_cat.hpp"
|
||||||
#include "StringCRC32.hpp"
|
#include "StringCRC32.hpp"
|
||||||
|
#include "env_to_c_array.hpp"
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
|
@ -125,7 +126,7 @@ bool EnvFake::is_set_implem (std::string_view name, Mutex& m) const {
|
||||||
return run_if_found(m_map, name, [](auto&)noexcept{return true;});
|
return run_if_found(m_map, name, [](auto&)noexcept{return true;});
|
||||||
}
|
}
|
||||||
|
|
||||||
auto EnvFake::size_implem (Mutex& m) const -> size_type {
|
auto EnvFake::size_implem (Mutex& m) const noexcept -> size_type {
|
||||||
std::lock_guard<Mutex> lock(m);
|
std::lock_guard<Mutex> lock(m);
|
||||||
return m_map.size();
|
return m_map.size();
|
||||||
}
|
}
|
||||||
|
@ -173,4 +174,9 @@ EnvFake& EnvFake::operator= (const EnvBase& other) {
|
||||||
uint32_t EnvFake::class_identifier() const noexcept {
|
uint32_t EnvFake::class_identifier() const noexcept {
|
||||||
return duckcore::StringCRC32(__func__);
|
return duckcore::StringCRC32(__func__);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<char*[]> EnvFake::to_c_array_implem (Mutex& m) const {
|
||||||
|
std::scoped_lock<Mutex> lock(m);
|
||||||
|
return env_to_c_array(*this, EnvBase::size_nolock(*this));
|
||||||
|
}
|
||||||
} //namespace duck
|
} //namespace duck
|
||||||
|
|
|
@ -48,7 +48,8 @@ namespace duck {
|
||||||
virtual void set_implem (std::string_view name, std::string_view value, Mutex& m) override;
|
virtual void set_implem (std::string_view name, std::string_view value, Mutex& m) override;
|
||||||
virtual void unset_implem (std::string_view name, Mutex& m) override;
|
virtual void unset_implem (std::string_view name, Mutex& m) override;
|
||||||
virtual bool is_set_implem (std::string_view name, Mutex& m) const override;
|
virtual bool is_set_implem (std::string_view name, Mutex& m) const override;
|
||||||
virtual size_type size_implem (Mutex& m) const override;
|
virtual size_type size_implem (Mutex& m) const noexcept override;
|
||||||
|
virtual std::unique_ptr<char*[]> to_c_array_implem (Mutex& m) const override;
|
||||||
|
|
||||||
virtual bool is_global() const noexcept override { return false; }
|
virtual bool is_global() const noexcept override { return false; }
|
||||||
virtual uint32_t class_identifier() const noexcept override;
|
virtual uint32_t class_identifier() const noexcept override;
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
#include "string_view_cat.hpp"
|
#include "string_view_cat.hpp"
|
||||||
#include "safe_print.hpp"
|
#include "safe_print.hpp"
|
||||||
#include "StringCRC32.hpp"
|
#include "StringCRC32.hpp"
|
||||||
|
#include "env_to_c_array.hpp"
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
|
@ -276,7 +277,7 @@ bool EnvReal::is_set_implem (std::string_view name, Mutex& m) const {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
auto EnvReal::size_implem (Mutex& m) const -> size_type {
|
auto EnvReal::size_implem (Mutex& m) const noexcept -> size_type {
|
||||||
std::lock_guard<Mutex> lock(m);
|
std::lock_guard<Mutex> lock(m);
|
||||||
|
|
||||||
assert(environ);
|
assert(environ);
|
||||||
|
@ -347,4 +348,9 @@ void EnvReal::set_all_into_implem (EnvBase& other) const {
|
||||||
uint32_t EnvReal::class_identifier() const noexcept {
|
uint32_t EnvReal::class_identifier() const noexcept {
|
||||||
return duckcore::StringCRC32(__func__);
|
return duckcore::StringCRC32(__func__);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<char*[]> EnvReal::to_c_array_implem (Mutex& m) const {
|
||||||
|
std::scoped_lock<Mutex> lock(m);
|
||||||
|
return env_to_c_array(*this, EnvBase::size_nolock(*this));
|
||||||
|
}
|
||||||
} //namespace duck
|
} //namespace duck
|
||||||
|
|
|
@ -69,7 +69,8 @@ namespace duck {
|
||||||
virtual void set_implem (std::string_view name, std::string_view value, Mutex& m) override;
|
virtual void set_implem (std::string_view name, std::string_view value, Mutex& m) override;
|
||||||
virtual void unset_implem (std::string_view name, Mutex& m) override;
|
virtual void unset_implem (std::string_view name, Mutex& m) override;
|
||||||
virtual bool is_set_implem (std::string_view name, Mutex& m) const override;
|
virtual bool is_set_implem (std::string_view name, Mutex& m) const override;
|
||||||
virtual size_type size_implem(Mutex& m) const override;
|
virtual size_type size_implem(Mutex& m) const noexcept override;
|
||||||
|
virtual std::unique_ptr<char*[]> to_c_array_implem (Mutex& m) const override;
|
||||||
|
|
||||||
virtual bool is_global() const noexcept override { return true; }
|
virtual bool is_global() const noexcept override { return true; }
|
||||||
virtual uint32_t class_identifier() const noexcept override;
|
virtual uint32_t class_identifier() const noexcept override;
|
||||||
|
|
61
src/env_to_c_array.hpp
Normal file
61
src/env_to_c_array.hpp
Normal file
|
@ -0,0 +1,61 @@
|
||||||
|
/* Copyright 2020, Michele Santullo
|
||||||
|
* This file is part of user-gcc.
|
||||||
|
*
|
||||||
|
* User-gcc is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* User-gcc is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with user-gcc. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "env_base.hpp"
|
||||||
|
#include <numeric>
|
||||||
|
#include <mutex>
|
||||||
|
#include <memory>
|
||||||
|
#include <cassert>
|
||||||
|
|
||||||
|
namespace duck {
|
||||||
|
template <typename E>
|
||||||
|
inline std::unique_ptr<char*[]> env_to_c_array (const E& env, typename E::size_type count) {
|
||||||
|
using std::pair;
|
||||||
|
using std::string_view;
|
||||||
|
typedef typename E::size_type size_type;
|
||||||
|
|
||||||
|
const size_type all_str_size = std::accumulate(
|
||||||
|
env.begin(),
|
||||||
|
env.end(),
|
||||||
|
size_type{0},
|
||||||
|
[](size_type s, const pair<string_view, string_view>& itm) {
|
||||||
|
return s + itm.first.size() + itm.second.size() + 1 + 1;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
auto buff = std::make_unique<char*[]>(count + 1 + (all_str_size + sizeof(char*) - 1) / sizeof(char*));
|
||||||
|
size_type z = 0;
|
||||||
|
char* curr_str = reinterpret_cast<char*>(buff.get() + count + 1);
|
||||||
|
for (const auto& itm : env) {
|
||||||
|
std::copy(itm.first.begin(), itm.first.end(), curr_str);
|
||||||
|
curr_str[itm.first.size()] = '=';
|
||||||
|
std::copy(itm.second.begin(), itm.second.end(), curr_str + itm.first.size() + 1);
|
||||||
|
const std::size_t curr_size = itm.first.size() + itm.second.size() + 1 + 1;
|
||||||
|
curr_str[curr_size - 1] = '\0';
|
||||||
|
assert(z < count);
|
||||||
|
buff[z] = curr_str;
|
||||||
|
|
||||||
|
curr_str += curr_size;
|
||||||
|
++z;
|
||||||
|
}
|
||||||
|
|
||||||
|
buff[count] = nullptr;
|
||||||
|
return buff;
|
||||||
|
}
|
||||||
|
} //namespace duck
|
Loading…
Reference in a new issue