exposed garbage collector in FS, and tune garbage cycles

Author: INemesisI

cores/esp8266/FS.cpp

@@ -206,6 +206,26 @@ File FS::open(const char* path, const char* mode) {
     return File(_impl->open(path, om, am));
 }
 
+void FS::check(void){
+  if (!_impl) {
+      return;
+  }
+  //_impl->check();
+  return;
+}
+
+uint32_t FS::gc(int size){
+  if (!_impl) {
+      return 0;
+  }
+  return _impl->gc(size);
+}
+
+uint32_t FS::delPages(void){
+  return _impl->delPages();
+}
+
+
 bool FS::exists(const char* path) {
     if (!_impl) {
         return false;

cores/esp8266/FS.h

@@ -106,6 +106,9 @@ class FS
 
     bool begin();
     void end();
+    void check(void);
+    uint32_t gc(int size);
+    uint32_t delPages(void);
 
     bool format();
     bool info(FSInfo& info);

cores/esp8266/FSImpl.h

@@ -71,6 +71,9 @@ class FSImpl {
     virtual DirImplPtr openDir(const char* path) = 0;
     virtual bool rename(const char* pathFrom, const char* pathTo) = 0;
     virtual bool remove(const char* path) = 0;
+    virtual void check(void) = 0;
+    virtual uint32_t gc(int size) = 0;
+    virtual uint32_t delPages(void) = 0;
 
 };
 

cores/esp8266/spiffs/spiffs_config.h

@@ -130,7 +130,7 @@ typedef uint8_t u8_t;
 
 // Define maximum number of gc runs to perform to reach desired free pages.
 #ifndef SPIFFS_GC_MAX_RUNS
-#define SPIFFS_GC_MAX_RUNS              5
+#define SPIFFS_GC_MAX_RUNS              15
 #endif
 
 // Enable/disable statistics on gc. Debug/test purpose only.

cores/esp8266/spiffs_api.cpp

@@ -25,6 +25,23 @@
 
 using namespace fs;
 
+void SPIFFSImpl::check(void){
+  DEBUGV("SPIFFSImpl::check: starting SPIFFS_check_" );
+  SPIFFS_check(&_fs);
+  return;}
+
+
+uint32_t SPIFFSImpl::gc(int size){
+  DEBUGV("SPIFFSImpl::check: starting SPIFFS_GC_" );
+  SPIFFS_gc(&_fs, size);
+  return _fs.stats_p_deleted;
+}
+
+uint32_t SPIFFSImpl::delPages(void){
+  return _fs.stats_p_deleted;
+}
+
+
 FileImplPtr SPIFFSImpl::open(const char* path, OpenMode openMode, AccessMode accessMode)
 {
     if (!isSpiffsFilenameValid(path)) {

cores/esp8266/spiffs_api.h

@@ -58,6 +58,10 @@ class SPIFFSImpl : public FSImpl
         memset(&_fs, 0, sizeof(_fs));
     }
 
+    void check(void) override;
+    uint32_t delPages(void) override; 
+    uint32_t gc(int size) override;    
+
     FileImplPtr open(const char* path, OpenMode openMode, AccessMode accessMode) override;
     bool exists(const char* path) override;
     DirImplPtr openDir(const char* path) override;