commit 65719819c51612480a355267c160af56a37c01a9
author Logan <tzuhsiang.chien@gmail.com> Fri Jan 07 11:17:14 2011 +0800
committer Logan <tzuhsiang.chien@gmail.com> Fri Jan 07 11:17:14 2011 +0800
tree 5f0a5170f5146737c22c48a160800f00f7537950
parent cc6da3fbb1196e6895e32e9e4b37a8e1d705c539

Fix Compiler::compile() return code.  Fix some uninitialized variable.

lib/bcc/Compiler.cpp

diff --git a/lib/bcc/Compiler.cpp b/lib/bcc/Compiler.cpp
index b0aaef0..e72950f 100644
--- a/lib/bcc/Compiler.cpp
+++ b/lib/bcc/Compiler.cpp
@@ -660,20 +660,12 @@
   if (TM)
     delete TM;
 
-#if 0
   if (mError.empty()) {
-    if (mUseCache && mCacheFd >= 0 && mCacheNew) {
-      genCacheFile();
-      //LOGI("DONE generating cache file");  //sliao
-      flock(mCacheFd, LOCK_UN);
-    }
-
-    return false;
+    return 0;
   }
-#endif
 
   // LOGE(getErrorMessage());
-  return true;
+  return 1;
 }
 
 

lib/bcc/Script.cpp

diff --git a/lib/bcc/Script.cpp b/lib/bcc/Script.cpp
index 894d35d..c6ccfa1 100644
--- a/lib/bcc/Script.cpp
+++ b/lib/bcc/Script.cpp
@@ -246,12 +246,18 @@
   // Setup the source bitcode / module
   if (sourceBC) {
     if (mCompiled->readBC(sourceBC, sourceSize, sourceResName, 0) != 0) {
+      LOGE("Unable to readBC, bitcode=%p, size=%lu\n",
+           sourceBC, (unsigned long)sourceSize);
       return 1;
     }
+
+    LOGE("Load sourceBC\n");
   } else if (sourceModule) {
     if (mCompiled->readModule(sourceModule) != 0) {
       return 1;
     }
+
+    LOGE("Load sourceModule\n");
   }
 
   // Link the source module with the library module
@@ -259,10 +265,13 @@
     if (mCompiled->linkBC(libraryBC, librarySize) != 0) {
       return 1;
     }
+
+    LOGE("Load Library\n");
   }
 
   // Compile and JIT the code
   if (mCompiled->compile() != 0) {
+    LOGE("Unable to compile.\n");
     return 1;
   }
 

lib/bcc/Script.h

diff --git a/lib/bcc/Script.h b/lib/bcc/Script.h
index 8b3beef..306cf23 100644
--- a/lib/bcc/Script.h
+++ b/lib/bcc/Script.h
@@ -69,9 +69,10 @@
 
   public:
     Script() : mErrorCode(BCC_NO_ERROR), mStatus(ScriptStatus::Unknown),
-               cacheFile(NULL), sourceBC(NULL), sourceResName(NULL),
-               sourceSize(0), sourceModule(NULL), mpExtSymbolLookupFn(NULL),
-               mpExtSymbolLookupFnContext(NULL) {
+               cacheFile(NULL),
+               sourceBC(NULL), sourceResName(NULL), sourceSize(0),
+               sourceModule(NULL), libraryBC(NULL), librarySize(0),
+               mpExtSymbolLookupFn(NULL), mpExtSymbolLookupFnContext(NULL) {
       Compiler::GlobalInitialization();
     }
 

lib/bcc/ScriptCompiled.h

diff --git a/lib/bcc/ScriptCompiled.h b/lib/bcc/ScriptCompiled.h
index f676b3c..4d332b1 100644
--- a/lib/bcc/ScriptCompiled.h
+++ b/lib/bcc/ScriptCompiled.h
@@ -59,7 +59,8 @@
     char *mContext; // Context of BCC script (code and data)
 
   public:
-    ScriptCompiled(Script *owner) : mpOwner(owner), mCompiler(this) {
+    ScriptCompiled(Script *owner)
+      : mpOwner(owner), mCompiler(this), mContext(NULL) {
     }
 
     ~ScriptCompiled();