arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-27 18:02:17 +03:00
Code Activity

host emulation: improve udp, persistent spiffs (#5605)

Browse Source
This commit is contained in:
david gauchard
2019-01-15 22:56:54 +01:00
committed by GitHub
parent 8a64a1236f
commit 6bd26a3b4a
16 changed files with 266 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
tests/host/common/spiffs_mock.cpp
View File

@ -27,8 +27,6 @@
#include <fcntl.h>
#include <unistd.h>
#define SPIFFS_FILE_NAME "spiffs.bin"
extern "C"
{
static uint32_t s_phys_addr = 0;
@ -40,87 +38,98 @@ extern "C"
FS SPIFFS(nullptr);
SpiffsMock::SpiffsMock(size_t fs_size, size_t fs_block, size_t fs_page, bool storage)
SpiffsMock::SpiffsMock(ssize_t fs_size, size_t fs_block, size_t fs_page, const String& storage)
{
m_storage = storage;
if ((m_overwrite = (fs_size < 0)))
fs_size = -fs_size;
fprintf(stderr, "SPIFFS: %zd bytes\n", fs_size);
m_storage = storage;
m_fs = new uint8_t[m_fs_size = fs_size];
memset(&m_fs[0], 0xff, m_fs_size);
m_fs.resize(fs_size, 0xff);
s_phys_addr = 0;
s_phys_size = static_cast<uint32_t>(fs_size);
s_phys_page = static_cast<uint32_t>(fs_page);
s_phys_block = static_cast<uint32_t>(fs_block);
s_phys_data = &m_fs[0];
s_phys_data = m_fs.data();
reset();
}
void SpiffsMock::reset()
{
SPIFFS = FS(FSImplPtr(new SPIFFSImpl(0, s_phys_size, s_phys_page, s_phys_block, 5)));
if (m_storage)
load();
load();
}
SpiffsMock::~SpiffsMock()
{
if (m_storage)
save();
save();
s_phys_addr = 0;
s_phys_size = 0;
s_phys_page = 0;
s_phys_block = 0;
s_phys_data = nullptr;
delete [] m_fs;
m_fs = nullptr;
m_fs_size = 0;
m_fs.resize(0);
SPIFFS = FS(FSImplPtr(nullptr));
}
void SpiffsMock::load ()
{
if (!m_fs_size)
if (!m_fs.size() || !m_storage.length())
return;
const char* fname = getenv("SPIFFS_PATH");
if (!fname)
fname = DEFAULT_SPIFFS_FILE_NAME;
int fs = ::open(SPIFFS_FILE_NAME, O_RDONLY);
int fs = ::open(m_storage.c_str(), O_RDONLY);
if (fs == -1)
{
fprintf(stderr, "SPIFFS: loading '%s': %s\n", fname, strerror(errno));
fprintf(stderr, "SPIFFS: loading '%s': %s\n", m_storage.c_str(), strerror(errno));
return;
}
fprintf(stderr, "SPIFFS: loading %zi bytes from '%s'\n", m_fs_size, fname);
if (::read(fs, &m_fs[0], m_fs_size) != (ssize_t)m_fs_size)
fprintf(stderr, "SPIFFS: reading %zi bytes: %s\n", m_fs_size, strerror(errno));
off_t flen = lseek(fs, 0, SEEK_END);
if (flen == (off_t)-1)
{
fprintf(stderr, "SPIFFS: checking size of '%s': %s\n", m_storage.c_str(), strerror(errno));
return;
}
lseek(fs, 0, SEEK_SET);
if (flen != (off_t)m_fs.size())
{
fprintf(stderr, "SPIFFS: size of '%s': %d does not match requested size %zd\n", m_storage.c_str(), (int)flen, m_fs.size());
if (!m_overwrite)
{
fprintf(stderr, "SPIFFS: aborting at user request\n");
exit(1);
}
fprintf(stderr, "SPIFFS: continuing without loading at user request, '%s' will be overwritten\n", m_storage.c_str());
}
else
{
fprintf(stderr, "SPIFFS: loading %zi bytes from '%s'\n", m_fs.size(), m_storage.c_str());
ssize_t r = ::read(fs, m_fs.data(), m_fs.size());
if (r != (ssize_t)m_fs.size())
fprintf(stderr, "SPIFFS: reading %zi bytes: returned %zd: %s\n", m_fs.size(), r, strerror(errno));
}
::close(fs);
}
void SpiffsMock::save ()
{
if (!m_fs_size)
if (!m_fs.size() || !m_storage.length())
return;
const char* fname = getenv("SPIFFS_PATH");
if (!fname)
fname = DEFAULT_SPIFFS_FILE_NAME;
int fs = ::open(SPIFFS_FILE_NAME, O_CREAT | O_TRUNC | O_WRONLY, 0644);
int fs = ::open(m_storage.c_str(), O_CREAT | O_TRUNC | O_WRONLY, 0644);
if (fs == -1)
{
fprintf(stderr, "SPIFFS: saving '%s': %s\n", fname, strerror(errno));
fprintf(stderr, "SPIFFS: saving '%s': %s\n", m_storage.c_str(), strerror(errno));
return;
}
fprintf(stderr, "SPIFFS: saving %zi bytes to '%s'\n", m_fs_size, fname);
fprintf(stderr, "SPIFFS: saving %zi bytes to '%s'\n", m_fs.size(), m_storage.c_str());
// this can be a valgrind error, I don't understand how it happens
//for (size_t i = 0; i < m_fs_size; i++) printf("\r%zd:%d ", i, (int)m_fs[i]);
if (::write(fs, &m_fs[0], m_fs_size) != (ssize_t)m_fs_size)
fprintf(stderr, "SPIFFS: writing %zi bytes: %s\n", m_fs_size, strerror(errno));
if (::write(fs, m_fs.data(), m_fs.size()) != (ssize_t)m_fs.size())
fprintf(stderr, "SPIFFS: writing %zi bytes: %s\n", m_fs.size(), strerror(errno));
if (::close(fs) == -1)
fprintf(stderr, "SPIFFS: closing %s: %s\n", fname, strerror(errno));
fprintf(stderr, "SPIFFS: closing %s: %s\n", m_storage.c_str(), strerror(errno));
}
int32_t spiffs_hal_read(uint32_t addr, uint32_t size, uint8_t *dst) {