Apple-2-HW/aiie
1
0
Fork 0
mirror of https://github.com/JorjBauer/aiie.git synced 2024-11-26 11:49:19 +00:00
Code Issues Projects Releases Wiki Activity

mutex locking support

Browse Source
This commit is contained in:
Jorj Bauer 2020-07-02 22:03:29 -04:00
parent db64a16479
commit 602dc8c707
1 changed files with 49 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
teensy/teensy-filemanager.cpp
View File

@ -3,20 +3,18 @@
#include <SdFat.h> #include <SdFat.h>
#include "teensy-filemanager.h" #include "teensy-filemanager.h"
#include <string.h> // strcpy #include <string.h> // strcpy
#include <TeensyThreads.h>
Threads::Mutex fslock;
// FIXME: globals are yucky.
SdFatSdio sd;
File file;
int8_t rawFd;
File rawFile;
TeensyFileManager::TeensyFileManager() TeensyFileManager::TeensyFileManager()
{ {
numCached = 0; numCached = 0;
enabled = sd.begin(); // FIXME: used to have 'enabled = sd.begin()' here, but we weren't
// using the enabled flag, so I've removed it to save the RAM for
// now; but eventually we need better error handling here
sd.begin();
} }
TeensyFileManager::~TeensyFileManager() TeensyFileManager::~TeensyFileManager()
@ -25,9 +23,9 @@ TeensyFileManager::~TeensyFileManager()
int8_t TeensyFileManager::openFile(const char *name) int8_t TeensyFileManager::openFile(const char *name)
{ {
if (rawFd != -1) { if (cacheFd != -1) {
rawFile.close(); cacheFile.close();
rawFd = -1; cacheFd = -1;
} }
// See if there's a hole to re-use... // See if there's a hole to re-use...
@ -56,9 +54,11 @@ int8_t TeensyFileManager::openFile(const char *name)
void TeensyFileManager::closeFile(int8_t fd) void TeensyFileManager::closeFile(int8_t fd)
{ {
if (rawFd != -1) { if (cacheFd != -1) {
rawFile.close(); fslock.lock();
rawFd = -1; cacheFile.close();
fslock.unlock();
cacheFd = -1;
} }
// invalid fd provided? // invalid fd provided?
@ -152,31 +152,27 @@ int8_t TeensyFileManager::readDir(const char *where, const char *suffix, char *o
bool TeensyFileManager::_prepCache(int8_t fd) bool TeensyFileManager::_prepCache(int8_t fd)
{ {
if (rawFd == -1 || if (cacheFd == -1 ||
rawFd != fd) { cacheFd != fd) {
// Not our cached file, or we have no cached file // Not our cached file, or we have no cached file
if (rawFd != -1) { if (cacheFd != -1) {
// Close the old one if we had one // Close the old one if we had one
Serial.print("closing old cache file "); fslock.lock();
Serial.println(rawFd); cacheFile.close();
rawFile.close(); fslock.unlock();
rawFd = -1; cacheFd = -1;
} }
Serial.println("opening new cache file");
// Open the new one // Open the new one
rawFile = sd.open(cachedNames[fd], O_RDWR | O_CREAT); fslock.lock();
if (!rawFile) { cacheFile = sd.open(cachedNames[fd], O_RDWR | O_CREAT);
Serial.print("_prepCache: failed to open "); if (!cacheFile.isOpen()) {
Serial.println(cachedNames[fd]); fslock.unlock();
return false; return false;
} }
rawFd = fd; // cache is live fslock.unlock();
Serial.print("New cache file is "); cacheFd = fd; // cache is live
Serial.println(fd);
} else {
// Serial.println("reopning same cache");
} }
return true; // FIXME error handling return true; // FIXME error handling
@ -203,14 +199,12 @@ bool TeensyFileManager::setSeekPosition(int8_t fd, uint32_t pos)
void TeensyFileManager::seekToEnd(int8_t fd) void TeensyFileManager::seekToEnd(int8_t fd)
{ {
File f = sd.open(cachedNames[fd], FILE_READ); FatFile f = sd.open(cachedNames[fd], FILE_READ);
if (!f) { if (!f.isOpen()) {
Serial.println("failed to open");
return; return;
} }
fileSeekPositions[fd] = f.fileSize(); fileSeekPositions[fd] = f.fileSize();
f.close(); f.close();
} }
@ -218,12 +212,10 @@ int TeensyFileManager::write(int8_t fd, const void *buf, int nbyte)
{ {
// open, seek, write, close. // open, seek, write, close.
if (fd < 0 || fd >= numCached) { if (fd < 0 || fd >= numCached) {
Serial.println("failed write - invalid fd");
return -1; return -1;
} }
if (cachedNames[fd][0] == 0) { if (cachedNames[fd][0] == 0) {
Serial.println("failed write - no cache name");
return -1; return -1;
} }
@ -231,44 +223,50 @@ int TeensyFileManager::write(int8_t fd, const void *buf, int nbyte)
uint32_t pos = fileSeekPositions[fd]; uint32_t pos = fileSeekPositions[fd];
if (!rawFile.seek(pos)) { fslock.lock();
if (!cacheFile.seekSet(pos)) {
fslock.unlock();
return -1; return -1;
} }
if (rawFile.write(buf, nbyte) != nbyte) { if (cacheFile.write(buf, nbyte) != nbyte) {
fslock.unlock();
return -1; return -1;
} }
fileSeekPositions[fd] += nbyte; fileSeekPositions[fd] += nbyte;
rawFile.close(); cacheFile.close();
fslock.unlock();
return nbyte; return nbyte;
}; };
int TeensyFileManager::read(int8_t fd, void *buf, int nbyte) int TeensyFileManager::read(int8_t fd, void *buf, int nbyte)
{ {
// open, seek, read, close. // open, seek, read, close.
if (fd < 0 || fd >= numCached) if (fd < 0 || fd >= numCached) {
return -1; return -1;
}
if (cachedNames[fd][0] == 0) if (cachedNames[fd][0] == 0) {
return -1; return -1;
}
_prepCache(fd); _prepCache(fd);
uint32_t pos = fileSeekPositions[fd]; uint32_t pos = fileSeekPositions[fd];
fslock.lock();
if (!cacheFile.seekSet(pos)) {
fslock.unlock();
return -1;
}
fileSeekPositions[fd] += nbyte;
if (!rawFile.seek(pos)) { if (cacheFile.read(buf, nbyte) != nbyte) {
Serial.print("readByte: seek failed to byte "); fslock.unlock();
Serial.println(pos);
return -1; return -1;
} }
if (rawFile.read(buf, nbyte) != nbyte) fslock.unlock();
return -1;
fileSeekPositions[fd] += nbyte;
rawFile.close();
return nbyte; return nbyte;
}; };