Merge pull request #143 from Vodorok/refactor_scheduler

Scheduler refactoration

Author: gyorb

eclipse-plugin/eclipse-depcopy/pom.xml

@@ -11,6 +11,11 @@
             <artifactId>gson</artifactId>
             <version>2.3.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin/META-INF/MANIFEST.MF

@@ -18,10 +18,30 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.cdt.core,
  org.eclipse.ui.console,
  org.apache.log4j
-Bundle-ClassPath: .,lib/cc-api.jar,lib/commons-codec.jar,lib/commons-lang3.jar,lib/compiler.jar,lib/hamcrest-all.jar,lib/httpclient.jar,lib/joda-time.jar,lib/libthrift.jar,lib/scl-thrift.jar,lib/cc-thrift.jar,lib/commons-exec.jar,lib/commons-logging.jar,lib/guava.jar,lib/hamcrest-core.jar,lib/httpcore.jar,lib/junit.jar,lib/scl.jar,lib/slf4j-api.jar,lib/gson.jar,lib/dd-plist.jar
+Bundle-ClassPath: .,
+ lib/commons-codec.jar,
+ lib/commons-lang3.jar,
+ lib/compiler.jar,
+ lib/hamcrest-all.jar,
+ lib/httpclient.jar,
+ lib/joda-time.jar,
+ lib/libthrift.jar,
+ lib/scl-thrift.jar,
+ lib/cc-thrift.jar,
+ lib/commons-exec.jar,
+ lib/commons-logging.jar,
+ lib/guava.jar,
+ lib/hamcrest-core.jar,
+ lib/httpcore.jar,
+ lib/junit.jar,
+ lib/scl.jar,
+ lib/slf4j-api.jar,
+ lib/gson.jar,
+ lib/dd-plist.jar,
+ lib/jsr305.jar
 ClassPath: lib/cc-api.jar lib/commons-codec.jar lib/commons-lang3.jar lib/compiler.jar lib/hamcrest-all.jar lib/httpclient.jar lib/joda-time.jar lib/libthrift.jar lib/scl-thrift.jar lib/cc-thrift.jar lib/commons-exec.jar lib/commons-logging.jar lib/guava.jar lib/hamcrest-core.jar lib/httpcore.jar lib/junit.jar lib/scl.jar lib/slf4j-api.jar lib/gson.jar lib/dd-plist.jar
 Class-Path: lib/cc-api.jar lib/commons-codec.jar lib/commons-lang3.jar lib/compiler.jar lib/hamcrest-all.jar lib/httpclient.jar lib/joda-time.jar lib/libthrift.jar lib/scl-thrift.jar lib/cc-thrift.jar lib/commons-exec.jar lib/commons-logging.jar lib/guava.jar lib/hamcrest-core.jar lib/httpcore.jar lib/junit.jar lib/scl.jar lib/slf4j-api.jar lib/gson.jar lib/dd-plist.jar
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: cc.codechecker.plugin,
  cc.codechecker.plugin.runtime

eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin/build.properties

@@ -6,5 +6,6 @@ bin.includes = plugin.xml,\
                icons/,\
                contexts.xml,\
                lib/*.jar,\
-               log4j.properties
+               log4j.properties,\
+               lib/jsr305.jar
 

eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin/src/cc/codechecker/plugin/Activator.java

@@ -83,7 +83,7 @@ public void start(BundleContext context) throws Exception {
      */
     public void stop(BundleContext context) throws Exception {
         plugin = null;
-        CodeCheckerContext.getInstance().stopServers();
+        ConsoleFactory.consoleWrite("CodeChecker Plugin Stopped");
         super.stop(context);
     }
 

eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin/src/cc/codechecker/plugin/CodeCheckerNature.java

@@ -7,6 +7,11 @@
 import cc.codechecker.plugin.config.CcConfiguration;
 import cc.codechecker.plugin.config.CodeCheckerContext;
 
+/**
+ * Eclipse uses natures as project feature indicators.
+ * This class adds CodeChecker related nature.
+ *
+ */
 public class CodeCheckerNature implements IProjectNature {
 
     public static final String NATURE_ID = "cc.codechecker.plugin.CodeCheckerNature";
@@ -20,10 +25,7 @@ public void configure() throws CoreException {
     }
 
     @Override
-    public void deconfigure() throws CoreException {
-        // TODO Auto-generated method stub
-
-    }
+    public void deconfigure() throws CoreException {}
 
     @Override
     public IProject getProject() {

eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin/src/cc/codechecker/plugin/Logger.java

@@ -1,5 +1,8 @@
 package cc.codechecker.plugin;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.Status;
 
@@ -28,4 +31,16 @@ public static void extLog(int level,String message){
     public static void consoleLog(String message){
         ConsoleFactory.consoleWrite(message);
     }
+    
+    /**
+     * Returns Stack Trace as String.
+     * @param throwable The exception in question.
+     * @return The Stack Trace as String.
+     */
+    public static String getStackTrace(final Throwable throwable) {
+        final StringWriter sw = new StringWriter();
+        final PrintWriter pw = new PrintWriter(sw, true);
+        throwable.printStackTrace(pw);
+        return sw.getBuffer().toString();
+    }
 }

eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin/src/cc/codechecker/plugin/config/CcConfiguration.java

@@ -7,6 +7,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import javax.annotation.Nullable;
 
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.envvar.IContributedEnvironment;
@@ -31,7 +32,6 @@
 import cc.codechecker.plugin.config.Config.ConfigLogger;
 import cc.codechecker.plugin.config.Config.ConfigTypes;
 import cc.codechecker.plugin.runtime.CodeCheckEnvironmentChecker;
-import cc.codechecker.plugin.runtime.CodecheckerServerThread;
 
 /**
  * Stores and manages configurations related to projects and the plug-in.
@@ -160,7 +160,7 @@ private void storeLoadedPreferences(){
      * @param global If null the projects internal boolean decides which to return.
      * @return The configuration which has chosen.
      */
-    public Map<ConfigTypes, String> getProjectConfig(Boolean global) {
+    public Map<ConfigTypes, String> getProjectConfig(@Nullable Boolean global) {
         Map<ConfigTypes, String> retConfig = new HashMap<>();
         retConfig.putAll(projectOnlyConfig);
         if (global == null) {
@@ -211,19 +211,18 @@ public void updateProjectConfig(Map<ConfigTypes,String> config){
         try {
             projectPreferences.flush();
             storeLoadedPreferences();
-            updateServer(CodeCheckerContext.getInstance().getServerObject(project));
         } catch (BackingStoreException e) {
             Logger.log(IStatus.ERROR, e.getMessage());
             e.printStackTrace();
         }    	
     }
 
     /**
-     * Return File location relative  to project location.
+     * Return File location relative to project location.
      * @param projectRelativeFile The file in question.
      * @return The location.
      */
-    public String convertFilenameToServer(String projectRelativeFile) {
+    public String getAsProjectRelativePath(String projectRelativeFile) {
         return getLocationPrefix() + projectRelativeFile;
     }
 
@@ -237,14 +236,14 @@ public String getLocationPrefix() {
 
     /**
      * Strips path from file location.
-     * @param serverFile Only the filename needed from this.
+     * @param path Only the filename needed from this.
      * @return Filename stripped of it's path prefix.
      */
-    public String convertFilenameFromServer(String serverFile) {
+    public String stripProjectPathFromFilePath(String path) {
         if (getLocationPrefix().equals(STR_EMPTY)) {
-            return serverFile;
+            return path;
         }
-        return serverFile.replace(getLocationPrefix(), STR_EMPTY);
+        return path.replace(getLocationPrefix(), STR_EMPTY);
     }
 
     /**
@@ -263,18 +262,6 @@ public void checkCodeCheckerReportDir() {
         }
     }
 
-    /**
-     * TODO Will be deleted in next patch.
-     * @param server .
-     */
-    public void updateServer(CodecheckerServerThread server) {
-        if (project!=null){
-            Logger.log(IStatus.INFO, "Updating Server" + project.getName());
-            CodeCheckEnvironmentChecker ccec = new CodeCheckEnvironmentChecker(getProjectConfig(null));
-            server.setCodecheckerEnvironment(ccec);
-        }
-    }
-
     /**
      * Adds to build environment variables, to be able to log the compilation commands with lldb.
      * @param environmentAdd
@@ -309,6 +296,17 @@ public void modifyProjectEnvironmentVariables() {
         }
     }
 
+    /**
+     *
+     * @return Returns the newly generated analyze log location.
+     */
+    public String getLogFileLocation() {
+        CodeCheckEnvironmentChecker ccec = new CodeCheckEnvironmentChecker(getProjectConfig(null));
+        String logFile = ccec.getLogFileLocation();
+        Logger.log(IStatus.INFO,"Logfile being used is: " + logFile);
+        return logFile;
+    }
+
     /**
      * @return The global configuration.
      */