summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAmlal El Mahrouss <amlal@nekernel.org>2025-08-02 01:29:15 +0100
committerAmlal El Mahrouss <amlal@nekernel.org>2025-08-02 01:29:15 +0100
commit678f457a9797ae064634f8ba2a83b156f2892871 (patch)
tree31e5d6625e16dd5842022e5d99de4dd51ea55277
parent4dbb5cc1283eed26cb9b66600fe9bb594aad8ef3 (diff)
refactor! breaking API changes of SOCL, also reworked must_pass helpers, and added one for the fix parser.
Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
Diffstat
-rw-r--r--dev/examples/cgi/cgi.cc25
-rw-r--r--dev/examples/fix/fix.cc15
-rw-r--r--dev/examples/tracked_ptr/tracked_ptr.cc1
-rw-r--r--dev/lib/except/error.hpp1
-rw-r--r--dev/lib/fix/network.hpp7
-rw-r--r--dev/lib/fix/parser.hpp37
-rw-r--r--dev/lib/memory/tracked_ptr.hpp9
-rw-r--r--dev/lib/utility/cgi.hpp29
-rw-r--r--dev/lib/utility/embfs.hpp1
-rw-r--r--dev/tests/fix_basic/fix_test.cc4
10 files changed, 77 insertions, 52 deletions
diff --git a/dev/examples/cgi/cgi.cc b/dev/examples/cgi/cgi.cc
index b4c0b34..2cb8f3a 100644
--- a/dev/examples/cgi/cgi.cc
+++ b/dev/examples/cgi/cgi.cc
@@ -1,4 +1,4 @@
-/*
+/*
cgi example
written by Amlal El Mahrouss.
licensed under the MIT license
@@ -9,12 +9,12 @@
#include <sstream>
#include <string>
-const std::string g_not_found = R"(
+const std::string error_html = R"(
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
- <title>error | snu-lib</title>
+ <title>Error | SOCL</title>
<style>
body {
font-family: monospace;
@@ -62,7 +62,7 @@ const std::string g_not_found = R"(
<tr><td colspan="3"><hr></td></tr>
</table>
- <address>snu's Common Gateway Server.</address>
+ <address>SOCL's Common Gateway Server.</address>
</body>
</html>
)";
@@ -71,21 +71,12 @@ const std::string g_not_found = R"(
/* @brief this stub loads a 'index.html' or returns an error message if not found. */
int main(int argc, char** argv)
{
- // ... let's assume we serve data.
+ snu::cgi::basic_writer<> writer;
- snu::cgi::cgi_writer writer;
- std::stringstream ss_file;
+ std::stringstream ss_file;
+ ss_file << error_html;
- std::ifstream fp("index.html");
-
- if (fp.good())
- ss_file << fp.rdbuf();
- else
- ss_file << g_not_found;
-
- fp.close();
-
- writer.eval_html(ss_file);
+ writer.html(ss_file);
return 0;
}
diff --git a/dev/examples/fix/fix.cc b/dev/examples/fix/fix.cc
index 86838bb..dfe4be9 100644
--- a/dev/examples/fix/fix.cc
+++ b/dev/examples/fix/fix.cc
@@ -15,16 +15,19 @@ int main(int argc, char** argv)
{
constexpr auto default_fix = "8=FIX.4.2|9=65|35=A|49=SERVER|56=CLIENT|34=177|52=20090107-18:15:16|98=0|108=30|10=062|";
- snu::fix::visitor<char> visitor;
- snu::fix::range_data<char> fix = visitor.visit(default_fix);
+ snu::fix::basic_visitor<char> basic_visitor;
+ snu::fix::range_data<char> fix = basic_visitor.visit(default_fix);
- std::cout << "magic: " << fix.magic_ << std::endl;
- std::cout << "is_valid: " << std::boolalpha << fix.is_valid() << std::endl;
+ std::cout << "magic=" << fix.magic_ << std::endl;
+ std::cout << "magic_len=" << fix.magic_len_ << std::endl;
+ std::cout << "is_valid=" << std::boolalpha << fix.is_valid() << std::endl;
+
+ snu::fix::must_pass(fix);
for (auto fields : fix.body_)
{
- std::cout << "key: " << fields.first;
- std::cout << ", value: " << fields.second << std::endl;
+ std::cout << "key=" << fields.first;
+ std::cout << ":value=" << fields.second << std::endl;
}
return 0;
diff --git a/dev/examples/tracked_ptr/tracked_ptr.cc b/dev/examples/tracked_ptr/tracked_ptr.cc
index 5ce6f61..61073a6 100644
--- a/dev/examples/tracked_ptr/tracked_ptr.cc
+++ b/dev/examples/tracked_ptr/tracked_ptr.cc
@@ -45,7 +45,6 @@ int main(int argc, char** argv)
summon_leak_tracked_ptr();
std::cout << "total=" << ptr.manager().allocator().deallocated_count_ << std::endl;
-
std::cout << "leak-detected=" << std::boolalpha << (ptr.manager().allocator().allocated_count_ > ptr.manager().allocator().deallocated_count_) << std::endl;
snu::memory::must_pass(ptr);
diff --git a/dev/lib/except/error.hpp b/dev/lib/except/error.hpp
index 1a07ef0..9e16ad0 100644
--- a/dev/lib/except/error.hpp
+++ b/dev/lib/except/error.hpp
@@ -14,6 +14,7 @@ namespace snu::except
using runtime_error = std::runtime_error;
using fix_error = runtime_error;
using math_error = runtime_error;
+ using cgi_error = runtime_error;
} // namespace snu::except
#endif // _SNU_ERR_HPP \ No newline at end of file
diff --git a/dev/lib/fix/network.hpp b/dev/lib/fix/network.hpp
index 48234e6..e663869 100644
--- a/dev/lib/fix/network.hpp
+++ b/dev/lib/fix/network.hpp
@@ -28,8 +28,9 @@ namespace snu::fix
delivery_modem& operator=(const delivery_modem&) = default;
delivery_modem(const delivery_modem&) = default;
+ public:
static constexpr auto local_address = "127.0.0.1";
- static constexpr auto backlog_cnt = 18U;
+ static constexpr auto backlog_count = 18U;
public:
delivery_socket_type fd_{};
@@ -63,7 +64,7 @@ namespace snu::fix
}
template <int32_t AF, int32_t Kind, int32_t IPProto, int32_t Port>
- bool construct(const char* addr = local_address, const bool& is_server = false) noexcept
+ bool construct(const char* addr = delivery_modem::local_address, const bool& is_server = false) noexcept
{
static_assert(AF != 0, "AF is zero");
static_assert(Kind != 0, "Kind is zero");
@@ -87,7 +88,7 @@ namespace snu::fix
return ret == 0;
}
- ::listen(fd_, backlog_cnt);
+ ::listen(fd_, delivery_modem::backlog_count);
return true;
}
diff --git a/dev/lib/fix/parser.hpp b/dev/lib/fix/parser.hpp
index e007906..5e3bc3b 100644
--- a/dev/lib/fix/parser.hpp
+++ b/dev/lib/fix/parser.hpp
@@ -14,10 +14,14 @@
#include <string>
#include <vector>
+#include <sys/types.h>
+#include <unistd.h>
+#include <signal.h>
+
namespace snu::fix
{
template <typename char_type>
- struct visitor;
+ struct basic_visitor;
template <typename char_type>
struct range;
@@ -86,6 +90,7 @@ namespace snu::fix
class range_data final
{
public:
+ std::size_t magic_len_;
std::basic_string<char_type> magic_;
std::size_t body_len_;
std::vector<std::pair<std::basic_string<char_type>, std::basic_string<char_type>>> body_;
@@ -127,20 +132,20 @@ namespace snu::fix
}
};
- /// @brief visitor object which returns a fix::range_data instance.
+ /// @brief basic_visitor object which returns a fix::range_data instance.
template <typename char_type>
- class visitor final
+ class basic_visitor final
{
public:
static constexpr const char_type soh = '|';
static constexpr const char_type eq = '=';
static constexpr uint32_t base = 10U;
- explicit visitor() = default;
- ~visitor() = default;
+ explicit basic_visitor() = default;
+ ~basic_visitor() = default;
- visitor& operator=(const visitor&) = default;
- visitor(const visitor&) = default;
+ basic_visitor& operator=(const basic_visitor&) = default;
+ basic_visitor(const basic_visitor&) = default;
range<char_type> operator()(const std::basic_string<char_type>& in)
{
@@ -162,18 +167,19 @@ namespace snu::fix
{
for (auto& ch : in)
{
- if (ch != visitor::soh)
+ if (ch != basic_visitor::soh)
{
in_tmp += ch;
continue;
}
- std::basic_string<char_type> key = in_tmp.substr(0, in_tmp.find(visitor::eq));
- std::basic_string<char_type> val = in_tmp.substr(in_tmp.find(visitor::eq) + 1);
+ std::basic_string<char_type> key = in_tmp.substr(0, in_tmp.find(basic_visitor::eq));
+ std::basic_string<char_type> val = in_tmp.substr(in_tmp.find(basic_visitor::eq) + 1);
if (ret.magic_.empty())
{
- ret.magic_ = val;
+ ret.magic_ = val;
+ ret.magic_len_ = ret.magic_.size();
}
else
{
@@ -194,6 +200,15 @@ namespace snu::fix
return ret;
}
};
+
+ template <typename char_type = char>
+ inline void must_pass(range_data<char_type>& range)
+ {
+ if (!range.is_valid())
+ {
+ ::kill(::getpid(), SIGTRAP);
+ }
+ }
} // namespace snu::fix
#endif // ifndef _SNU_FIX_PARSER_HPP
diff --git a/dev/lib/memory/tracked_ptr.hpp b/dev/lib/memory/tracked_ptr.hpp
index 1ff4cca..61ad685 100644
--- a/dev/lib/memory/tracked_ptr.hpp
+++ b/dev/lib/memory/tracked_ptr.hpp
@@ -12,6 +12,10 @@
#include <memory>
#include <atomic>
+#include <sys/types.h>
+#include <unistd.h>
+#include <signal.h>
+
namespace snu::memory
{
template <typename T>
@@ -211,6 +215,9 @@ namespace snu::memory
template <typename T>
inline void must_pass(tracked_ptr<T>& ptr) noexcept
{
- assert(ptr.manager().allocator().allocated_count_ < ptr.manager().allocator().deallocated_count_);
+ if (ptr.manager().allocator().allocated_count_ < ptr.manager().allocator().deallocated_count_)
+ {
+ ::kill(::getpid(), SIGTRAP);
+ }
}
} // namespace snu::memory \ No newline at end of file
diff --git a/dev/lib/utility/cgi.hpp b/dev/lib/utility/cgi.hpp
index 068adf1..bae31b8 100644
--- a/dev/lib/utility/cgi.hpp
+++ b/dev/lib/utility/cgi.hpp
@@ -16,12 +16,14 @@ namespace snu
namespace cgi
{
/// @brief CGI Writer class, writes to stdout; as CGI expects.
- class writer final
+ template <typename char_type = char>
+ class basic_writer
{
- writer& eval_(const std::string& mime, const std::stringstream& ss) noexcept
+ private:
+ basic_writer& eval_(const std::basic_string<char>& mime, const std::basic_stringstream<char_type>& ss) noexcept
{
std::printf("Content-Type: %s\r\n", mime.c_str());
- std::printf("Server: %s\r\n", "snu-cpp-library");
+ std::printf("Server: %s\r\n", "socl-cgi-system");
std::printf("Content-Length: %ld\r\n\r\n", ss.str().size());
std::printf("%s", ss.str().c_str());
@@ -29,29 +31,34 @@ namespace snu
}
public:
- explicit writer() = default;
- ~writer() = default;
+ explicit basic_writer() = default;
+ ~basic_writer() = default;
- writer& operator=(const writer&) = default;
- writer(const writer&) = default;
+ basic_writer& operator=(const basic_writer&) = default;
+ basic_writer(const basic_writer&) = default;
public:
- writer& eval_html(const std::stringstream& ss_html)
+ basic_writer& binary(const std::basic_stringstream<char_type>& ss_html)
+ {
+ return this->eval_("application/octet-stream", ss_html);
+ }
+
+ basic_writer& html(const std::basic_stringstream<char_type>& ss_html)
{
return this->eval_("text/html", ss_html);
}
- writer& eval_xml(const std::stringstream& ss_html)
+ basic_writer& xml(const std::basic_stringstream<char_type>& ss_html)
{
return this->eval_("application/xml", ss_html);
}
- writer& eval_json(const std::stringstream& ss_html)
+ basic_writer& json(const std::basic_stringstream<char_type>& ss_html)
{
return this->eval_("application/json", ss_html);
}
- writer& eval_js(const std::stringstream& ss_html)
+ basic_writer& js(const std::basic_stringstream<char_type>& ss_html)
{
return this->eval_("text/javascript", ss_html);
}
diff --git a/dev/lib/utility/embfs.hpp b/dev/lib/utility/embfs.hpp
index cb08eb9..7d73d62 100644
--- a/dev/lib/utility/embfs.hpp
+++ b/dev/lib/utility/embfs.hpp
@@ -23,6 +23,7 @@ namespace snu::embfs
inline constexpr const size_t _superblock_name_len = 16;
inline constexpr const size_t _superblock_reserve_len = 462;
+
inline constexpr const size_t _inode_name_len = 128;
inline constexpr const size_t _inode_arr_len = 12;
inline constexpr const size_t _inode_lookup_len = 8;
diff --git a/dev/tests/fix_basic/fix_test.cc b/dev/tests/fix_basic/fix_test.cc
index 7d6d7bd..960c4a1 100644
--- a/dev/tests/fix_basic/fix_test.cc
+++ b/dev/tests/fix_basic/fix_test.cc
@@ -10,8 +10,8 @@
TEST(FIXTest, BasicFIXUsage)
{
- snu::fix::visitor<char> visitor;
- snu::fix::range_data<char> fix = visitor.visit("8=FIX.4.2|9=65|35=A|49=SERVER|56=CLIENT|34=177|52=20090107-18:15:16|98=0|108=30|10=062|");
+ snu::fix::basic_visitor<char> basic_visitor;
+ snu::fix::range_data<char> fix = basic_visitor.visit("8=FIX.4.2|9=65|35=A|49=SERVER|56=CLIENT|34=177|52=20090107-18:15:16|98=0|108=30|10=062|");
EXPECT_EQ(fix.magic_, "FIX.4.2");
EXPECT_TRUE(fix.is_valid());
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-12 22:30:52 +0000