Skip to content

Commit

Permalink
Tagged
Browse files Browse the repository at this point in the history
  • Loading branch information
@zlatko-michailov
zlatko-michailov committed Jul 4, 2023
1 parent a3c8dd0 commit 563b702
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions bin/tag.conf
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
tag_hi 0
tag_lo 67493
commit 3991906
tag_lo 67510
commit a3c8dd0
16 changes: 8 additions & 8 deletions samples/vmem/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,18 +119,18 @@ int main(int /*argc*/, const char* argv[]) {
abc::vmem_ptr<std::uint8_t, vmem_pool, log_ostream> p2(&pool, abc::vmem_page_pos_start, 12, &log);
abc::vmem_ptr<std::uint8_t, vmem_pool, log_ostream> p3(&pool, abc::vmem_page_pos_start, 34, &log);
abc::vmem_ptr<std::uint8_t, vmem_pool, log_ostream> p4(nullptr);
log.put_any(abc::category::abc::samples, abc::severity::important, __TAG__, "(p1 == p2) = %d", p1 == p2);
log.put_any(abc::category::abc::samples, abc::severity::important, __TAG__, "(p1 == p3) = %d", p1 == p3);
log.put_any(abc::category::abc::samples, abc::severity::important, __TAG__, "(p1 == nullptr) = %d", p1 == nullptr);
log.put_any(abc::category::abc::samples, abc::severity::important, __TAG__, "(p4 == nullptr) = %d", p4 == nullptr);
log.put_any(abc::category::abc::samples, abc::severity::important, 0x107a6, "(p1 == p2) = %d", p1 == p2);
log.put_any(abc::category::abc::samples, abc::severity::important, 0x107a7, "(p1 == p3) = %d", p1 == p3);
log.put_any(abc::category::abc::samples, abc::severity::important, 0x107a8, "(p1 == nullptr) = %d", p1 == nullptr);
log.put_any(abc::category::abc::samples, abc::severity::important, 0x107a9, "(p4 == nullptr) = %d", p4 == nullptr);

// List iterator
abc::vmem_list<int, vmem_pool, log_ostream> list3(&start_page_ptr->list3, &pool, &log);
list3.push_back(42);
list3.push_back(43);
list3.push_back(44);
for (auto itr = list3.begin(); itr != list3.end(); itr++) {
log.put_any(abc::category::abc::samples, abc::severity::important, __TAG__, "%d", *itr);
log.put_any(abc::category::abc::samples, abc::severity::important, 0x107aa, "%d", *itr);
}

// String iterator
Expand All @@ -139,7 +139,7 @@ int main(int /*argc*/, const char* argv[]) {
str1.push_back('y');
str1.push_back('z');
for (vmem_string_iterator itr = str1.begin(); itr != str1.end(); ) {
log.put_any(abc::category::abc::samples, abc::severity::important, __TAG__, "%c", *itr++);
log.put_any(abc::category::abc::samples, abc::severity::important, 0x107ab, "%c", *itr++);
}

// Work with streams over vmem_string.
Expand All @@ -149,13 +149,13 @@ int main(int /*argc*/, const char* argv[]) {
ostrm << "abc" << 12 << "xyz";

for (vmem_string_iterator itr = str2.begin(); itr != str2.end(); itr++) {
log.put_any(abc::category::abc::samples, abc::severity::important, __TAG__, "%c", *itr);
log.put_any(abc::category::abc::samples, abc::severity::important, 0x107ac, "%c", *itr);
}

std::istream istrm(&sb);
std::string stdstr;
istrm >> stdstr;
log.put_any(abc::category::abc::samples, abc::severity::important, __TAG__, "'%s'", stdstr.c_str());
log.put_any(abc::category::abc::samples, abc::severity::important, 0x107ad, "'%s'", stdstr.c_str());

return 0;
}
Expand Down
10 changes: 5 additions & 5 deletions src/x/vmem_iterator.x.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ namespace abc {

template <typename Base, typename Container, typename T, typename Pool, typename Log>
inline vmem_basic_iterator<Base, Container, T, Pool, Log>& vmem_basic_iterator<Base, Container, T, Pool, Log>::operator ++() noexcept {
Base::_log->put_any(category::abc::vmem, severity::abc::debug, __TAG__, "++itr");
Base::_log->put_any(category::abc::vmem, severity::abc::debug, 0x107ae, "++itr");

if (Base::is_valid()) {
*this = Base::_container->next(*this);
Expand All @@ -166,7 +166,7 @@ namespace abc {

template <typename Base, typename Container, typename T, typename Pool, typename Log>
inline vmem_basic_iterator<Base, Container, T, Pool, Log> vmem_basic_iterator<Base, Container, T, Pool, Log>::operator ++(int) noexcept {
Base::_log->put_any(category::abc::vmem, severity::abc::debug, __TAG__, "itr++");
Base::_log->put_any(category::abc::vmem, severity::abc::debug, 0x107af, "itr++");

vmem_basic_iterator<Base, Container, T, Pool, Log> thisCopy = *this;

Expand All @@ -180,7 +180,7 @@ namespace abc {

template <typename Base, typename Container, typename T, typename Pool, typename Log>
inline vmem_basic_iterator<Base, Container, T, Pool, Log>& vmem_basic_iterator<Base, Container, T, Pool, Log>::operator --() noexcept {
Base::_log->put_any(category::abc::vmem, severity::abc::debug, __TAG__, "--itr");
Base::_log->put_any(category::abc::vmem, severity::abc::debug, 0x107b0, "--itr");

if (Base::is_valid()) {
*this = Base::_container->prev(*this);
Expand All @@ -192,7 +192,7 @@ namespace abc {

template <typename Base, typename Container, typename T, typename Pool, typename Log>
inline vmem_basic_iterator<Base, Container, T, Pool, Log> vmem_basic_iterator<Base, Container, T, Pool, Log>::operator --(int) noexcept {
Base::_log->put_any(category::abc::vmem, severity::abc::debug, __TAG__, "itr--");
Base::_log->put_any(category::abc::vmem, severity::abc::debug, 0x107b1, "itr--");

vmem_basic_iterator<Base, Container, T, Pool, Log> thisCopy = *this;

Expand Down Expand Up @@ -247,7 +247,7 @@ namespace abc {
throw exception<std::runtime_error, Log>("vmem_iterator::deref() Dereferencing invalid iterator", 0x10606);
}

Base::_log->put_any(category::abc::vmem, severity::abc::debug, __TAG__, "deref()");
Base::_log->put_any(category::abc::vmem, severity::abc::debug, 0x107b2, "deref()");

return *p;
}
Expand Down
2 changes: 1 addition & 1 deletion src/x/vmem_string.x.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ namespace abc {
, _get_ch(0)
, _put_ch(0) {
if (string == nullptr) {
throw exception<std::logic_error, Log>("vmem_basic_string_streambuf::vmem_basic_string_streambuf(string)", __TAG__, _log);
throw exception<std::logic_error, Log>("vmem_basic_string_streambuf::vmem_basic_string_streambuf(string)", 0x107b3, _log);
}

base::setg(&_get_ch, &_get_ch + 1, &_get_ch + 1);
Expand Down
6 changes: 3 additions & 3 deletions test/vmem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1355,9 +1355,9 @@ namespace abc { namespace test { namespace vmem {

const char* ch = expected;
for (ConstIterator itr = str.cbegin(); itr != str.cend(); itr++, ch++) {
passed = context.are_equal(*itr, *ch, __TAG__, "%c") && passed;
passed = context.are_equal(*itr, *ch, 0x107b4, "%c") && passed;
}
passed = context.are_equal('\0', *ch, __TAG__, "\\x%2.2x") && passed;
passed = context.are_equal('\0', *ch, 0x107b5, "\\x%2.2x") && passed;

return passed;
}
Expand Down Expand Up @@ -1393,7 +1393,7 @@ namespace abc { namespace test { namespace vmem {
for (int* exp = expected; *exp != 0; exp++) {
int actual = -1;
istrm >> actual;
passed = context.are_equal(actual, *exp, __TAG__, "%d") && passed;
passed = context.are_equal(actual, *exp, 0x107b6, "%d") && passed;
}

return passed;
Expand Down

0 comments on commit 563b702

Please sign in to comment.