Changeset 65

Timestamp:

05/02/05 23:59:15 (4 years ago)

Author:

pragma

Message:

Last commit for today: minimal code changes, and little tweaks to improve servlet generation. (still lots of TODOs)

Files:

• trunk/dsp/servlet/DSPServlet.d (modified) (2 diffs)
• trunk/dsp/servlet/ServletRegistry.d (modified) (1 diff)

trunk/dsp/servlet/DSPServlet.d

@@ -47 +47 @@
-extern(C) alias void function(IDSPRequest request,IDSPResponse response) ServiceHandle;
-
+/* 
+    <p>
+        DSPServlet: dll-per-file implementation 
+    </p><p>
+        The size of the dlls is directly related to the size of the libraries contributed to its 
+        compilation.  Presently, the libs are floating arount 100kb in size each, due to the inclusion
+        of phobos and mango.  Possibly loading those libs as dlls could reduce the size, as would recompiling
+        them for a release or reduced-capability set.
+    </p><p>
+        dll-per-file is not just for a development time practice, as it is very tunable. The QueuedCache
+        can be used to good effect to expire infrequently used libs that needn't be loaded all the time.
+    </p>
+*/
+
-class DSPServlet : Servlet{
-    Library[char[]] libs;
@@ -159 +173 @@
-    }   
-}
+
+/+
+/* 
+    <p>
+        all-in-one implementation 
+    </p><p>
+        The tradeoff for one dll per application is a smaller total runtime footprint at the cost of 
+        more ram up-front and the inability to cache or unload pieces of the application.  There may
+        be situations where this mode is preferred, as it side-steps the limitations imposed by 
+        wielding so many libs at once.
+    </p><p>
+        Developers may find that all-in-one works best for deployment only, and that it may be too
+        slow to recompile changes within even modestly sized applications.
+    </p>
+    
+    TODO: needs compiler/generator support to work
+    TODO: may best rely on 'build' to get the job done
+*/
+class DSPAllInOneServlet : Servlet{
+    Library lib;
+    ServletHandle handle;
+    
+    private static Logger logger;
+
+    static this (){
+        logger = Logger.getLogger ("dsp.servlets");
+    }   
+
+    public this(){
+    }
+    
+    public ~this(){
+        if(lib && lib.isLoaded) lib.unload();
+    }
+    
+    Library getLibrary(DSPServletContext context,FilePath path){
+        //TODO: make concurrent
+        //TODO: add check for file existence
+        //TODO: add check for library date and its validity vs the source file
+        if(!lib){
+            RequestConfig cfg;
+            
+            // configuration
+            
+            cfg.pwd = context.getBasePath() ~ "\\";
+            cfg.pwd = cfg.pwd.replace("/","\\");
+            cfg.ext = path.getExtension();
+            
+            //HACK: filepath leaves prefixed '/' character on
+            cfg.name = path.getName()[1..$];
+            
+            cfg.modulePath = path.getPath();
+            cfg.requestModule = cfg.modulePath ~ cfg.name;
+            cfg.dspSourceFilename = cfg.pwd ~ cfg.name ~ "." ~ cfg.ext;
+
+            cfg.tempDirectory = cfg.pwd ~ context.getConfiguration.get("temp-directory");
+            cfg.cacheDirectory = cfg.pwd ~ context.getConfiguration.get("cache-directory");
+
+            cfg.dSourceFilename = cfg.tempDirectory ~ cfg.name ~ ".d";
+            cfg.destServletFilename = cfg.cacheDirectory ~ cfg.name ~ ".dll";
+
+            cfg.runtimeDirectory = context.getConfiguration.get("runtime-directory");
+
+            // debug
+            printf("%.*s\n",cfg.toString());
+
+            // build the servlet library
+            ServletCompiler compiler = new ServletCompiler();
+            compiler.CompileServlet(cfg);
+
+            // keep the library for later
+            lib = new Library(cfg.destServletFilename);
+            libs[path.toString()] = lib;
+        }
+        return lib;
+    }
+    
+    void service (IServletRequest request, IServletResponse response){
+        FilePath path = new FilePath(request.getPathInfo);
+        
+        if(path.getExtension == "dsp"){
+            IDSPRequest dspRequest = cast(IDSPRequest)request;
+            IDSPResponse dspResponse = cast(IDSPResponse)response;
+            DSPServletContext context = cast(DSPServletContext)request.getContext();
+
+            assert(dspRequest);
+            assert(dspResponse);
+            assert(context);
+
+            // bind to the needed dll on the fly
+            
+            Library lib = getLibrary(context,path);
+            if(lib){
+                ServiceHandle handle = cast(ServiceHandle)lib.getSymbol("service");
+
+                // run the service handle
+                if(handle){
+                    handle(dspRequest,dspResponse);
+                }
+                else{
+                    throw new DSPException("servlet library does not have a valid service handle");
+                }
+
+                dspResponse.getWriter.put("<h2>This is a test for DSP servlets</h2>");
+
+                if(dspResponse.isExceptionSet){
+                    throw new DSPException("servlet: " ~ dspResponse.getException());
+                }
+            }
+            else{
+                throw new DSPException("could not load library");
+            }
+        }
+        else{
+            //TODO: use configuration and handling rules 
+            //TODO: provide a directory listing if the file doesn't exist
+            logger.info ("request for file: " ~ request.getUri.getPath ~ " (" ~ request.getPathInfo ~ ")");
+            response.copyFile (request.getContext, request.getPathInfo);        
+        }
+    }
+
+    void init (ServletConfig config)
+    {
+        //TODO: is this needed?
+    }   
+}
++/

trunk/dsp/servlet/ServletRegistry.d

@@ -41 +41 @@
-    static /*synchronized*/ void doService(IDSPRequest request,IDSPResponse response){
-        //TODO: enable use of nested servlets
-"default"
+request.getPathInfo()
-        
-        if(name in registry){