Changeset 4073

Timestamp:

Dec 20, 2007, 2:47:41 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

References #636: Kill a running job

Infrastructure for signal processing is set up. Need more implementors. Need more support
in the core to be able to use it (in Job class). Internal job queue and job agents must also be updated.

Location:

trunk/src

Files:

• core/net/sf/basedb/core/InternalJobQueue.java (modified) (1 diff)
• core/net/sf/basedb/core/PluginExecutionRequest.java (modified) (2 diffs)
• core/net/sf/basedb/core/signal (added)
• core/net/sf/basedb/core/signal/AbstractSignalHandler.java (added)
• core/net/sf/basedb/core/signal/AbstractSignalReceiver.java (added)
• core/net/sf/basedb/core/signal/AbstractSignalTransporter.java (added)
• core/net/sf/basedb/core/signal/DelegatingSignalHandler.java (added)
• core/net/sf/basedb/core/signal/LocalSignalReceiver.java (added)
• core/net/sf/basedb/core/signal/LocalSignalTransporter.java (added)
• core/net/sf/basedb/core/signal/Signal.java (added)
• core/net/sf/basedb/core/signal/SignalException.java (added)
• core/net/sf/basedb/core/signal/SignalHandler.java (added)
• core/net/sf/basedb/core/signal/SignalReceiver.java (added)
• core/net/sf/basedb/core/signal/SignalTarget.java (added)
• core/net/sf/basedb/core/signal/SignalTransporter.java (added)
• core/net/sf/basedb/core/signal/SocketSignalReceiver.java (added)
• core/net/sf/basedb/core/signal/SocketSignalTransporter.java (added)
• core/net/sf/basedb/core/signal/ThreadSignalHandler.java (added)
• core/net/sf/basedb/core/signal/UnsupportedSignalException.java (added)
• plugins/core/net/sf/basedb/plugins/AbstractFlatFileImporter.java (modified) (3 diffs)

trunk/src/core/net/sf/basedb/core/InternalJobQueue.java

@@ -430 +430 @@
           throw t;
         }
-        dc.close();
+        //exec.setSignalReceiver(signalReceiver);
+        dc.commit();
         
         // Now, we can execute the job

trunk/src/core/net/sf/basedb/core/PluginExecutionRequest.java

@@ -28 +28 @@
 import net.sf.basedb.core.plugin.Request;
 import net.sf.basedb.core.plugin.Response;
+import net.sf.basedb.core.signal.SignalHandler;
+import net.sf.basedb.core.signal.SignalReceiver;
+import net.sf.basedb.core.signal.SignalTarget;
 
 /**
@@ -118 +121 @@
   }
   
+  public void setSignalReceiver(SignalReceiver signalReceiver)
+  {
+    Plugin p = getPlugin();
+    SignalHandler signalHandler = null;
+    if (p instanceof SignalTarget)
+    {
+      signalHandler = ((SignalTarget)p).getSignalHandler();
+    }
+    if (signalHandler != null)
+    {
+      String ID = signalReceiver.registerSignalHandler(signalHandler);
+      Job job = getJob();
+      //job.setSignalReceiverId(ID);
+    }
+  }
+  
 }

trunk/src/plugins/core/net/sf/basedb/plugins/AbstractFlatFileImporter.java

@@ -52 +52 @@
 import net.sf.basedb.core.plugin.Response;
 import net.sf.basedb.core.plugin.Plugin;
+import net.sf.basedb.core.signal.SignalHandler;
+import net.sf.basedb.core.signal.SignalTarget;
+import net.sf.basedb.core.signal.ThreadSignalHandler;
 
 import net.sf.basedb.util.NumberFormatUtil;
@@ -143 +146 @@
 public abstract class AbstractFlatFileImporter 
   extends AbstractPlugin
-  implements AutoDetectingImporter
+  implements AutoDetectingImporter, SignalTarget
 {
 
@@ -661 +664 @@
   }
   // -------------------------------------------
+  /*
+    From the SignalTarget interface
+    -------------------------------------------
+  */
+  /**
+    Create a new {@link ThreadSignalHandler} that supports
+    the {@link net.sf.basedb.core.signal.Signal#ABORT} signal.
+    Subclasses may override this to provide another signal 
+    handler, or return null if they don't support signals.
+    @since 2.6
+  */
+  public SignalHandler getSignalHandler()
+  {
+    return new ThreadSignalHandler();
+  }
+  // -------------------------------------------
 
   private int getProgress(long parsedCharacters)