Set version to 9.0.488

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog #
 
 
+## Version 9.0.488
+
+Date: 2022-10-17
+
+- Add more usability fixes on concurrencly limiter
+
+
+
 ## Version 9.0.486
 
 Date: 2022-10-17

build.clj

@@ -29,12 +29,21 @@
    {:class-dir class-dir
     :jar-file jar-file}))
 
+
 (defn compile [_]
   (b/javac {:src-dirs ["src"]
             :class-dir class-dir
             :basis basis
             :javac-opts ["-source" "11" "-target" "11" "-Xlint:unchecked"]}))
 
+
+(defn install [_]
+  (b/install {:basis basis
+              :lib lib
+              :version version
+              :jar-file jar-file
+              :class-dir class-dir}))
+
 (defn clojars [_]
   (b/process
    {:command-args ["mvn"

doc/user-guide.md

@@ -9,13 +9,13 @@ A promise library for Clojure and ClojureScript.
 Leiningen:
 
 ```clojure
-[funcool/promesa "9.0.486"]
+[funcool/promesa "9.0.488"]
 ```
 
 deps.edn:
 
 ```clojure
-funcool/promesa {:mvn/version "9.0.486"}
+funcool/promesa {:mvn/version "9.0.488"}
 ```
 
 On the JVM platform _promesa_ is built on top of *completable futures*

src/promesa/exec.cljc

@@ -475,12 +475,13 @@
 #?(:clj
    (defn concurrency-limiter
      "Create an instance of concurrencly limiter. EXPERIMENTAL"
-     [& {:keys [executor concurrency queue-size on-run on-poll]
+     [& {:keys [executor concurrency queue-size on-run on-poll on-queue]
          :or {executor *default-executor*
               concurrency 1
               queue-size Integer/MAX_VALUE}}]
      (let [^ExecutorService executor (resolve-executor executor)]
        (doto (ConcurrencyLimiter. executor (int concurrency) (int queue-size))
+         (cond-> (fn? on-queue) (.setOnQueueCallback on-queue))
          (cond-> (fn? on-run) (.setOnRunCallback on-run))
          (cond-> (fn? on-poll) (.setOnPollCallback on-poll))))))
 

src/promesa/exec/ConcurrencyLimiter.java

@@ -48,6 +48,7 @@ public class ConcurrencyLimiter extends AFn implements IObj {
   private final int maxQueueSize;
   private IPersistentMap metadata = PersistentArrayMap.EMPTY;
 
+  protected IFn onQueueCallback;
   protected IFn onRunCallback;
   protected IFn onPollCallback;
 
@@ -61,6 +62,10 @@ public ConcurrencyLimiter(final ExecutorService executor,
     this.limit = new Semaphore(maxConcurrency);
   }
 
+  public void setOnQueueCallback(IFn f) {
+    this.onQueueCallback = f;
+  }
+
   public void setOnRunCallback(IFn f) {
     this.onRunCallback = f;
   }
@@ -89,6 +94,10 @@ public CompletableFuture invoke(Object arg1) {
       return result;
     }
 
+    if (this.onQueueCallback != null) {
+      this.onQueueCallback.invoke();
+    }
+
     this.executor.submit((Runnable)this);
     return result;
   }
@@ -196,10 +205,10 @@ public void run() {
         return;
       }
 
-      future.whenComplete((result, t) -> {
-          if (t != null) {
+      future.whenComplete((result, cause) -> {
+          if (cause != null) {
             this.limiter.releaseAndSchedule();
-            this.result.completeExceptionally((Throwable)t);
+            this.result.completeExceptionally((Throwable)cause);
           } else {
             this.limiter.releaseAndSchedule();
             this.result.complete(result);