file locking

src/lib/sys.cpp

@@ -6,7 +6,8 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <execinfo.h>
-
+#include <fcntl.h>
+#include <sys/file.h>
 #include "sys.h"
 
 String shell_exec(String cmd)
@@ -91,33 +92,48 @@ bool file_exists(String path)
 
 String file_get_contents(String file_name)
 {
-	try
+	/*std::ifstream ifs(file_name);
-	{
+	printf("stream file desc %i\n", ifs.filedesc());
-		std::ifstream ifs(file_name);
+	String content(
-		String content(
+		(std::istreambuf_iterator<char>(ifs) ),
-			(std::istreambuf_iterator<char>(ifs) ),
+		(std::istreambuf_iterator<char>()    ) );*/
-			(std::istreambuf_iterator<char>()    ) );
+	char buf[512];
-		return(content);
+	String content;
-	}
+	s32 fd = open(file_name.c_str(), O_RDONLY);
-	catch(std::exception e)
+	if(fd == -1)
 	{
+		printf("(!) Could not read %s\n", file_name.c_str());
 		return("");
 	}
+	flock(fd, LOCK_SH);
+	s64 bytes_read = 0;
+	//s64 size = lseek(fd, 0, SEEK_END);
+	//lseek(fd, 0, SEEK_SET);
+	//content.reserve(size+1);
+
+	while((bytes_read = read(fd, buf, 512)) > 0)
+	{
+		content.append(buf, bytes_read);
+	}
+
+	flock(fd, LOCK_UN);
+	close(fd);
+	return(content);
 }
 
 bool file_put_contents(String file_name, String content)
 {
-	try
+	s32 fd = open(file_name.c_str(), O_WRONLY | O_CREAT | O_TRUNC);
-	{
+	if(fd == -1)
-		std::ofstream out(file_name);
-		out << content;
-		out.close();
-		return(true);
-	}
-	catch(std::exception e)
 	{
+		printf("(!) Could not write %s\n", file_name.c_str());
 		return(false);
 	}
+	flock(fd, LOCK_EX);
+	write(fd, content.data(), content.length());
+	flock(fd, LOCK_UN);
+	close(fd);
+	return(true);
 }
 
 String get_cwd()

test/fileio.uce

@@ -0,0 +1,22 @@
+
+
+RENDER()
+{
+	DTree t;
+
+	<>
+		<link rel="stylesheet" href='style.css'></link>
+		<h1>
+			<a href="index.uce">UCE Test</a>:
+			FileI/O
+		</h1>
+
+		File IO:
+
+		<pre style="white-space: pre-wrap"><?= file_get_contents("fileio.uce") ?></pre>
+
+		Params
+		<pre><?= var_dump(context->params) ?></pre>
+	</>
+
+}

test/index.uce

@@ -23,6 +23,7 @@ RENDER()
 			<li><a href="json.uce">JSON</a></li>
 			<li><a href="memcached.uce">Memcached</a></li>
 			<li><a href="mysql.uce">MySQL Connector</a></li>
+			<li><a href="fileio.uce">File I/O</a></li>
 		</ul>
 		<pre><?
 			echo("Worker PID: "+std::to_string(my_pid)+"\n");

test/post-multipart.uce

@@ -2,7 +2,7 @@
 void show_form()
 {
 
-	<form action="?" method="post" enctype="multipart/form-data">
+	<><form action="?" method="post" enctype="multipart/form-data">
 		<div>
 			<label>Some text:</label>
 			<input type="text" name="fühld" value="<?= context->post["fühld"] ?>"/>
@@ -14,7 +14,7 @@ void show_form()
 		<div>
 			<input type="submit" value="Submit Form"/>
 		</div>
-	</form>
+	</form></>
 
 }
 

todo.txt

@@ -1,6 +1,7 @@
 Library
 =================================
 - sha1 / md5 / meow
+- fold StringList into DTree _OR_ make better StringList
 
 
 Bugs
@@ -10,19 +11,27 @@ Bugs
 
 Framework
 =================================
-- Locks for file i/o
-- Locks for compiler
 - Check: File Upload
 - Proxy mode
 - WebSockets
-- Persistent code / Cron / Tick?
+- Resident code / Cron / Tick?
-- Fork
+- Automated Test Suite
-- Multithreading
+
-- Optionally store compiled units alongside source
+
+Performance
+=================================
+- Arena Allocator
+- Array implementation
 
 
 Nice to Have
 =================================
 - pseudorandom
 - XML components
+- Optionally store compiled units alongside source
+
+
+Finally
+=================================
+- DO WE DO OUR OWN LANGUAGE OR DO WE KEEP USING C?!?