adding fs.h; fixed missing compiler preprocessors

Daniel Kang · Daniel Kang · commit dd50c1dd467f · 2012-02-07T20:55:38.000+09:00
diff --git a/Makefile b/Makefile
@@ -1,9 +1,9 @@
-CXXFLAGS = -std=gnu++0x -g -O0 -I$(LIBUV_PATH)/include -I$(HTTP_PARSER_PATH) -I.
+CXXFLAGS = -std=gnu++0x -g -O0 -I$(LIBUV_PATH)/include -I$(HTTP_PARSER_PATH) -I. -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 
 all: webclient webserver
 
 webclient: webclient.cpp $(LIBUV_PATH)/uv.a $(HTTP_PARSER_PATH)/http_parser.o $(wildcard native/*.h)
-	$(CXX) $(CXXFLAGS) -o webclient webclient.cpp $(LIBUV_PATH)/uv.a $(HTTP_PARSER_PATH)/http_parser.o -lrt -lm -lpthread	
+	$(CXX) $(CXXFLAGS) -o webclient webclient.cpp $(LIBUV_PATH)/uv.a $(HTTP_PARSER_PATH)/http_parser.o -lrt -lm -lpthread
 	
 webserver: webserver.cpp $(LIBUV_PATH)/uv.a $(HTTP_PARSER_PATH)/http_parser.o $(wildcard native/*.h)
 	$(CXX) $(CXXFLAGS) -o webserver webserver.cpp $(LIBUV_PATH)/uv.a $(HTTP_PARSER_PATH)/http_parser.o -lrt -lm -lpthread
diff --git a/native/fs.h b/native/fs.h
@@ -0,0 +1,88 @@
+#ifndef __FS_H__
+#define __FS_H__
+
+#include "base.h"
+#include "callback.h"
+
+namespace native
+{
+    typedef uv_file file;
+
+    // TODO: implement functions that accept loop pointer as extra argument.
+    namespace fs
+    {
+        template<typename callback_t>
+        bool open(const char* path, int flags, int mode, callback_t callback)
+        {
+            auto req = new uv_fs_t;
+            req->data = new callbacks(1);
+            callbacks::store(req->data, 0, callback);
+            return uv_fs_open(uv_default_loop(), req, path, flags, mode, [](uv_fs_t* req){
+                assert(req->fs_type == UV_FS_OPEN);
+
+                if(req->errorno || req->result < 0)
+                {
+                    // TODO: handle error
+                }
+                else
+                {
+                    callbacks::invoke<callback_t>(req->data, 0, req->result);
+                }
+
+                delete reinterpret_cast<callbacks*>(req->data);
+                uv_fs_req_cleanup(req);
+                delete req;
+            })==0;
+        }
+
+        template<typename callback_t>
+        bool read(file f, void* buf, size_t len, off_t offset, callback_t callback)
+        {
+            auto req = new uv_fs_t;
+            req->data = new callbacks(1);
+            callbacks::store(req->data, 0, callback);
+            return uv_fs_read(uv_default_loop(), req, f, buf, len, offset, [](uv_fs_t* req){
+                assert(req->fs_type == UV_FS_READ);
+
+                if(req->errorno)
+                {
+                    // TODO: handle error
+                }
+                else
+                {
+                    callbacks::invoke<callback_t>(req->data, 0, req);
+                }
+
+                delete reinterpret_cast<callbacks*>(req->data);
+                uv_fs_req_cleanup(req);
+                delete req;
+            })==0;
+        }
+
+        template<typename callback_t>
+        bool mkdir(const char* path, int mode, callback_t callback)
+        {
+            auto req = new uv_fs_t;
+            req->data = new callbacks(1);
+            callbacks::store(req->data, 0, callback);
+            return uv_fs_mkdir(uv_default_loop(), req, path, mode, [](uv_fs_t* req){
+                assert(req->fs_type == UV_FS_MKDIR);
+
+                if(req->errorno)
+                {
+                    // TODO: handle error
+                }
+                else
+                {
+                    callbacks::invoke<callback_t>(req->data, 0, req->result);
+                }
+
+                delete reinterpret_cast<callbacks*>(req->data);
+                uv_fs_req_cleanup(req);
+                delete req;
+            })==0;
+        }
+    }
+}
+
+#endif
diff --git a/native/native.h b/native/native.h
@@ -6,5 +6,6 @@
 #include "error.h"
 #include "tcp.h"
 #include "http.h"
+#include "fs.h"
 
 #endif
diff --git a/webclient.cpp b/webclient.cpp
@@ -4,7 +4,20 @@
 #include <native/native.h>
 using namespace native;
 
+#include <fcntl.h>
+
 int main() {
+    fs::open("Makefile", O_RDONLY, 0, [](file f){
+#if 0
+        char buf[10000];
+        fs::read(f, buf, 10000, 0, [](uv_fs_t* req){
+            printf("test\n");
+        });
+#endif
+    });
+
+    return run();
+
     auto client = net::tcp::create();
     client->connect("127.0.0.1", 8080, [=](error e){
         client->write("GET / HTTP/1.1\r\n\r\n", [=](error e){
