CELS: now program works ok with rep&storing methods:

Arc.exe create a -mrep:8m -dmrep 2 git-svn-id: https://freearc.svn.sourceforge.net/svnroot/freearc@455 3a4f7f31-9599-433d-91b1-573e8b61252c
abandonware · Jul 26, 2009 · 90e7bdb · 90e7bdb
1 parent 97b9e48
commit 90e7bdb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 26 deletions.
diff --git a/Compression.hs b/Compression.hs
@@ -239,23 +239,6 @@ compressionDeleteTempCompressors = filter (/="tempfile")
 ----- (De)compression of data stream                                                           -----
 ----------------------------------------------------------------------------------------------------
 
-{-
-compress   method callback      - óïàêîâàòü äàííûå
-decompress method callback      - ðàñïàêîâàòü äàííûå
-
-  method :: CompressionMethod - àëãîðèòì óïàêîâêè
-  callback "read" buf size - ïðî÷èòàòü âõîäíûå äàííûå â áóôåð `buf` äëèíîé `size`
-                             Âîçâðàùàåò 0   - êîíåö äàííûõ
-                                        <0  - ïðåðâàòü (ðàñ)ïàêîâêó (îøèáêà èëè áîëüøå äàííûõ íå íóæíî)
-                                        >0  - êîë-âî ïðî÷èòàííûõ áàéò
-  callback "write" buf size - çàïèñàòü âûõîäíûå äàííûå
-                              Âîçâðàùàåò <0  - ïðåðâàòü (ðàñ)ïàêîâêó (îøèáêà èëè áîëüøå äàííûõ íå íóæíî)
-                                         >=0 - âñ¸ îê
-                              Ïðè âîçâðàùåíèè èç ýòîé ôóíêöèè äàííûå äîëæíû áûòü "èñïîëüçîâàíû", ïîòîìó ÷òî
-                                (ðàñ)ïàêîâùèê ìîæåò íà÷àòü çàïèñü íîâûõ äàííûõ íà òî æå ìåñòî
-Âõîäíûå è âûõîäíûå áóôåðà âûäåëÿþòñÿ è îñâîáîæäàþòñÿ (ðàñ)ïàêîâùèêîì
--}
-
 -- |Ïðîöåäóðû óïàêîâêè äëÿ ðàçëè÷íûõ àëãîðèòìîâ ñæàòèÿ.
 freearcCompress   num method | isFakeMethod method =  eat_data
 freearcCompress   num method                       =  CompressionLib.compress method
@@ -264,7 +247,6 @@ freearcCompress   num method                       =  CompressionLib.compress me
 freearcDecompress num method | isFakeMethod method =  impossible_to_decompress   -- ýòè òèïû ñæàòûõ äàííûõ íå ïîäëåæàò ðàñïàêîâêå
 freearcDecompress num method                       =  CompressionLib.decompress method
 
-{-# NOINLINE eat_data #-}
 -- |×èòàåì âñ¸, íå ïèøåì íè÷åãî, à CRC ñ÷èòàåòñÿ â äðóãîì ìåñòå ;)
 eat_data callback = do
   allocaBytes aBUFFER_SIZE $ \buf -> do  -- èñïîëüçóåì `alloca`, ÷òîáû àâòîìàòè÷åñêè îñâîáîäèòü âûäåëåííûé áóôåð ïðè âûõîäå

diff --git a/Compression/CELS.cpp b/Compression/CELS.cpp
@@ -120,8 +120,8 @@ int CELS_Call (TABI_ELEMENT* params)
   char *service = p._str("service");
 
   // ==== AUTO-SERVICE ======================================
-  // Ignore zero parameter to some Set* services
-  if (strequ (service, "SetCompressionMem") || strequ (service, "SetDecompressionMem") || strequ (service, "SetDictionary") || strequ (service, "SetBlockSize"))
+  // Ignore zero mem parameter to Set* services
+  if (start_with (service, "Set") && isupper(service[3]))
     if (p._int("mem",1)==0)
       return p._return(p._str("method"));
   if (start_with (service, "Limit"))                 return p._return(p._str("method"));   // to do: get & set
@@ -135,9 +135,15 @@ int CELS_Call (TABI_ELEMENT* params)
   // Find appropriate method to service this call
   for (int i=0; i<methodsCount; i++)
   {
-    int x = methodsTable[i](params);
-    if (x!=FREEARC_ERRCODE_NOT_IMPLEMENTED)
-      return x;
+    try
+    {
+      int x = methodsTable[i](params);
+      if (x!=FREEARC_ERRCODE_NOT_IMPLEMENTED)
+        return x;
+    }
+    catch (...)
+    {
+    }
   }
   return FREEARC_ERRCODE_NOT_IMPLEMENTED;
 }

diff --git a/Compression/CELS.h b/Compression/CELS.h
@@ -199,7 +199,7 @@ int CELS_Call (TABI_ELEMENT* params);
 
 #define QUASIWRITE(size)                                                   \
 {                                                                          \
-    callback(TABI_DYNAMAP("request","quasiwrite") ("size",size));          \
+    callback(TABI_DYNAMAP("request","quasiwrite") ("bytes",size));         \
 }
 
 #define ReturnErrorCode(x)                                                 \

diff --git a/Compression/REP/cels-rep.cpp b/Compression/REP/cels-rep.cpp
@@ -141,6 +141,6 @@ int rep_server (TABI_ELEMENT* params)
 }
 
 // Register REP method in CELS
-//int rep_register = CELS_Register(rep_server);
+int rep_register = CELS_Register(rep_server);
 
 }
diff --git a/Compression/makefile b/Compression/makefile
@@ -15,5 +15,5 @@ $(TEMPDIR)/Common.o: Common.cpp Common.h Compression.h makefile
 $(TEMPDIR)/CompressionLibrary.o: CompressionLibrary.cpp Common.h Compression.h makefile
 	$(GCC) -c $(CFLAGS) -o $*.o $<
 
-$(TEMPDIR)/CELS.o: CELS.cpp CELS.h Common.h makefile
+$(TEMPDIR)/CELS.o: CELS.cpp CELS.h _TABI/tabi.h Common.h makefile
 	$(GCC) -c $(CFLAGS) -fexceptions -o $*.o $<