From ab022e768d6d3d74e5b55318925532977334689a Mon Sep 17 00:00:00 2001 From: "Gun.io Whitespace Robot" Date: Wed, 26 Oct 2011 19:30:38 -0400 Subject: [PATCH] Remove whitespace [Gun.io WhitespaceBot] --- .gitignore | 20 ++++++++++++++++++++ jobim-core/project.clj | 4 ++-- jobim-core/src/jobim/behaviours/server.clj | 8 ++++---- jobim-core/src/jobim/core.clj | 10 +++++----- jobim-core/src/jobim/events.clj | 6 +++--- jobim-core/src/jobim/examples/barber.clj | 6 +++--- jobim-core/src/loadtest.clj | 2 +- jobim-core/test/jobim/test/jobim_local.clj | 4 ++-- 8 files changed, 40 insertions(+), 20 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ac8f968 --- /dev/null +++ b/.gitignore @@ -0,0 +1,20 @@ +# Compiled source # +################### +*.com +*.class +*.dll +*.exe +*.o +*.so +*.pyc + +# Logs and databases # +###################### +*.log + +# OS generated files # +###################### +.DS_Store* +ehthumbs.db +Icon? +Thumbs.db diff --git a/jobim-core/project.clj b/jobim-core/project.clj index 440d2b0..9258958 100644 --- a/jobim-core/project.clj +++ b/jobim-core/project.clj @@ -15,6 +15,6 @@ "repository.jboss.org" "http://repository.jboss.org/nexus/content/groups/public"} :dev-dependencies [[leiningen/lein-swank "1.2.0-SNAPSHOT"] [cdt "1.2"]] -; :jvm-opts ["-Xmn3072m -Xmx3072m -Xincgc"] -; :jvm-opts ["-Xmn3072m -Xmx3072m"] +; :jvm-opts ["-Xmn3072m -Xmx3072m -Xincgc"] +; :jvm-opts ["-Xmn3072m -Xmx3072m"] :aot :all) diff --git a/jobim-core/src/jobim/behaviours/server.clj b/jobim-core/src/jobim/behaviours/server.clj index 9c06364..bedb6b9 100644 --- a/jobim-core/src/jobim/behaviours/server.clj +++ b/jobim-core/src/jobim/behaviours/server.clj @@ -76,9 +76,9 @@ [[:server-call ?pid ?from ?request] msg] (do-server-call server from request state) ;; Cast [[:server-cast ?request] msg] (do-server-cast server request state) - ;; Terminate + ;; Terminate [:terminate msg] (do (terminate server state) :norecur) - ;; Info + ;; Info [_ msg] (do-handle-info server msg state))] (when (not= result :norecur) (recur (receive) (second result))))))) @@ -93,9 +93,9 @@ [[:server-call ?pid ?from ?request] msg] (do-server-call server from request state) ;; Cast [[:server-cast ?request] msg] (do-server-cast server request state) - ;; Terminate + ;; Terminate [:terminate msg] (do (terminate server state) :norecur) - ;; Info + ;; Info [_ msg] (do-handle-info server msg state))] (when (not= result :norecur) (react-recur (second result)))))))) diff --git a/jobim-core/src/jobim/core.clj b/jobim-core/src/jobim/core.clj index 4ea8819..8010b71 100644 --- a/jobim-core/src/jobim/core.clj +++ b/jobim-core/src/jobim/core.clj @@ -93,7 +93,7 @@ msg (HashMap.)] (.put content "tx-name" tx-name) (.put msg "content" content) - (.put msg "topic" "link-new") + (.put msg "topic" "link-new") (.put msg "type" "msg") (.put msg "from" from) (.put msg "to" to) @@ -408,7 +408,7 @@ (defn dictionary-write ([pid key value] (let [] - + (swap! *process-table* (fn [table] (let [process-number (pid-to-process-number pid) ptable (get table process-number) dictionary (:dictionary ptable) @@ -457,7 +457,7 @@ (declare self) (defn remote-send - ([node pid msg] + ([node pid msg] (let [msg (if (and (= (map? msg)) (= :signal (keyword (get msg "type")))) msg @@ -684,7 +684,7 @@ old-process-data (get t (pid-to-process-number pid))] (assoc t (pid-to-process-number pid) (assoc old-process-data :mbox-data mbox-data-p))))))) - + (defn- do-save-queue "Tries to find a matching event in the saved queue for the handler of an evented actor" ([mbox-filter ^LinkedList save-queue] @@ -694,7 +694,7 @@ matching-msg nil] ;; End of the saved queue (if (nil? msg) - [matching-msg new-save-queue] + [matching-msg new-save-queue] ;; another item in the saved queue (if (and (nil? matching-msg) (mbox-filter msg)) ;; we found a mathching message diff --git a/jobim-core/src/jobim/events.clj b/jobim-core/src/jobim/events.clj index 2a9258e..9475a53 100644 --- a/jobim-core/src/jobim/events.clj +++ b/jobim-core/src/jobim/events.clj @@ -51,15 +51,15 @@ (defn- process-publish ([key data] - + (let [^LinkedList queue (get *events-queues* key) handler (get *events-handlers* key)] - + (when (and (nil? queue) (nil? handler)) (let [queue (LinkedList.)] (.add queue data) (.put *events-queues* key queue))) - + (when (and (nil? queue) (not (nil? handler))) (let [{:keys [handler kind]} handler] (if (= :persistent kind) diff --git a/jobim-core/src/jobim/examples/barber.clj b/jobim-core/src/jobim/examples/barber.clj index b733521..3f88268 100644 --- a/jobim-core/src/jobim/examples/barber.clj +++ b/jobim-core/src/jobim/examples/barber.clj @@ -53,11 +53,11 @@ (let [seated (do (send! (resolve-name "barber-shop") [:get-seat (self)]) (receive))] ;; we have a seat, wait to have a hair cut - (if (= seated :seated) + (if (= seated :seated) (let [_ (send! (resolve-name "the-barber") :hey) ;; Awaking the barber msg (receive)] ;; barber starting to do his thing - (when (= msg :cutting) + (when (= msg :cutting) (notify-shop (str "Customer " id " getting his hair cut"))) ;; barber finished (let [msg (receive)] @@ -110,7 +110,7 @@ (start-event-manager "barber-manager") (add-handler (resolve-name "barber-manager") [name jobim.examples.barber.BarberLogger] - nil) + nil) (shop num-seats num-clients) (barber) (loop [ids (range 0 num-clients) diff --git a/jobim-core/src/loadtest.clj b/jobim-core/src/loadtest.clj index a4b6001..66a50c3 100644 --- a/jobim-core/src/loadtest.clj +++ b/jobim-core/src/loadtest.clj @@ -55,7 +55,7 @@ (def-server Cell (init [this [id]] - (if (= id *first-cell*) + (if (= id *first-cell*) {:id id :next (atom (self)) :counter (atom 0) :out (writer "out.txt")} {:id id :next (atom (self)) :counter (atom 0)})) diff --git a/jobim-core/test/jobim/test/jobim_local.clj b/jobim-core/test/jobim/test/jobim_local.clj index 1350b41..c9759fc 100644 --- a/jobim-core/test/jobim/test/jobim_local.clj +++ b/jobim-core/test/jobim/test/jobim_local.clj @@ -112,7 +112,7 @@ (is (= :open (state fsm))) (lock fsm) (is (= :locked (state fsm))))) - + (deftest test-server-1 (println "*** test-server1") (let [server (jserver/make-channel-manager) @@ -120,7 +120,7 @@ (is (not (nil? chn))) (jserver/free server chn) (is (= chn (jserver/alloc server))))) - + (deftest test-server-2 (println "*** test-server2") (let [server (jserver/make-channel-manager-evented)