fix some warnings

diff --git a/src/Backend/constraint.h b/src/Backend/constraint.h
index 2f61d72a41e31d86acd1ca814a7eb3df43ff38e5..1333b6cbab052c2390402bef123975f75080eb37 100644 (file)
--- a/src/Backend/constraint.h
+++ b/src/Backend/constraint.h
@@ -49,7 +49,7 @@ struct Node {
        Edge edges[];
 };
 
        Edge edges[];
 };
 

-#define DEFAULT_CNF_ARRAY_SIZE 256
+#define DEFAULT_CNF_ARRAY_SIZE 64

 #define LOAD_FACTOR 0.25
 
 struct CNF {
 #define LOAD_FACTOR 0.25
 
 struct CNF {

diff --git a/src/Makefile b/src/Makefile
index acf435a7d3d65b684f76102c7c87c62e34a1ae58..1ef9453edfa84263e7163f948d80d48035f7da25 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -12,9 +12,9 @@ HEADERS := $(wildcard *.h) $(wildcard AST/*.h) $(wildcard ASTTransform/*.h) $(wi
 
 OBJECTS := $(CPP_SOURCES:%.cc=$(OBJ_DIR)/%.o) $(C_SOURCES:%.c=$(OBJ_DIR)/%.o)
 
 
 OBJECTS := $(CPP_SOURCES:%.cc=$(OBJ_DIR)/%.o) $(C_SOURCES:%.c=$(OBJ_DIR)/%.o)
 

-CFLAGS := -Wall -g -O0
+CFLAGS := -Wall -O3 -g

 CFLAGS += -IAST -IASTTransform -IASTAnalyses -IASTAnalyses/Polarity -IASTAnalyses/Order -IASTAnalyses/Encoding -ITranslator -ICollections -IBackend -I. -IEncoders -ITuner -ISerialize
 CFLAGS += -IAST -IASTTransform -IASTAnalyses -IASTAnalyses/Polarity -IASTAnalyses/Order -IASTAnalyses/Encoding -ITranslator -ICollections -IBackend -I. -IEncoders -ITuner -ISerialize

-LDFLAGS := -ldl -lrt -rdynamic
+LDFLAGS := -ldl -lrt -rdynamic -g

 SHARED := -shared
 
 # Mac OSX options
 SHARED := -shared
 
 # Mac OSX options

diff --git a/src/Serialize/deserializer.cc b/src/Serialize/deserializer.cc
index 47de8b1595f2189162fe23fb9ff9c330517617ec..ddac4c922e19787114d1f5e95b58597c44466d3d 100644 (file)
--- a/src/Serialize/deserializer.cc
+++ b/src/Serialize/deserializer.cc
@@ -178,36 +178,36 @@ void Deserializer::deserializeSet() {
        myread(&type, sizeof(VarType));
        bool isRange;
        myread(&isRange, sizeof(bool));
        myread(&type, sizeof(VarType));
        bool isRange;
        myread(&isRange, sizeof(bool));

-        bool isMutable;
+       bool isMutable;

        myread(&isMutable, sizeof(bool));
        myread(&isMutable, sizeof(bool));

-        if(isRange){
-                uint64_t low;
-                myread(&low, sizeof(uint64_t));
-                uint64_t high;
-                myread(&high, sizeof(uint64_t));
-                map.put(s_ptr, new Set(type, low, high));
-        } else{
-                Set *set;
-                if(isMutable){
-                        set = new MutableSet(type);
-                }
-                uint size;
-                myread(&size, sizeof(uint));
-                Vector<uint64_t> members;
-                for(uint i=0; i<size; i++){
-                        uint64_t mem;
-                        myread(&mem, sizeof(uint64_t));
-                        if(isMutable) {
-                                ((MutableSet*) set)->addElementMSet(mem);
-                        }else {
-                                members.push(mem);
-                        }
-                }
-                if(!isMutable){
-                        set = solver->createSet(type, members.expose(), size);
-                }
-                map.put(s_ptr, set);
-        }
+       if(isRange){
+               uint64_t low;
+               myread(&low, sizeof(uint64_t));
+               uint64_t high;
+               myread(&high, sizeof(uint64_t));
+               map.put(s_ptr, new Set(type, low, high));
+       } else {
+               Set *set = NULL;
+               if(isMutable) {
+                       set = new MutableSet(type);
+               }
+               uint size;
+               myread(&size, sizeof(uint));
+               Vector<uint64_t> members;
+               for(uint i=0; i<size; i++) {
+                       uint64_t mem;
+                       myread(&mem, sizeof(uint64_t));
+                       if(isMutable) {
+                               ((MutableSet*) set)->addElementMSet(mem);
+                       } else {
+                               members.push(mem);
+                       }
+               }
+               if(!isMutable) {
+                       set = solver->createSet(type, members.expose(), size);
+               }
+               map.put(s_ptr, set);
+       }

 }
 
 void Deserializer::deserializeBooleanLogic() {
 }
 
 void Deserializer::deserializeBooleanLogic() {

diff --git a/src/Serialize/serializer.cc b/src/Serialize/serializer.cc
index fe41a39fae91964300180684b02b20e9029e521f..4a970748e66470319550dde3a34fa4c49406c887 100644 (file)
--- a/src/Serialize/serializer.cc
+++ b/src/Serialize/serializer.cc
@@ -48,7 +48,9 @@ void Serializer::mywrite(const void *__buf, size_t __n) {
        if (__n > SERIALBUFFERLENGTH *2) {
                if (bufferoffset != 0)
                        flushBuffer();
        if (__n > SERIALBUFFERLENGTH *2) {
                if (bufferoffset != 0)
                        flushBuffer();

-               write(filedesc, __buf, __n);
+               ssize_t result=write(filedesc, __buf, __n);
+               if (result != (ssize_t) __n)
+                       exit(-1);

        } else {
                char *towrite=(char *) __buf;
                do  {
        } else {
                char *towrite=(char *) __buf;
                do  {

diff --git a/src/Test/deserializerautotune.cc b/src/Test/deserializerautotune.cc
index 8bda6c6457b04685fbccb54d6fd9f23583c62080..9e21eb525ec8174a701a4cd16981055750c8d328 100755 (executable)
--- a/src/Test/deserializerautotune.cc
+++ b/src/Test/deserializerautotune.cc
@@ -7,7 +7,7 @@ int main(int argc, char ** argv){
                exit(-1);       
        }
        CSolver * solvers[argc-1];
                exit(-1);       
        }
        CSolver * solvers[argc-1];

-       AutoTuner *autotuner = new AutoTuner(300);
+       AutoTuner *autotuner = new AutoTuner(100);

        for(int i = 1; i < argc; i++) {
                solvers[i-1] = CSolver::deserialize(argv[i]);
                autotuner->addProblem(solvers[i-1]);
        for(int i = 1; i < argc; i++) {
                solvers[i-1] = CSolver::deserialize(argv[i]);
                autotuner->addProblem(solvers[i-1]);