Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hi! I cleaned up your code for you! #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions jobim-core/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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)
8 changes: 4 additions & 4 deletions jobim-core/src/jobim/behaviours/server.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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)))))))
Expand All @@ -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))))))))
Expand Down
10 changes: 5 additions & 5 deletions jobim-core/src/jobim/core.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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]
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions jobim-core/src/jobim/events.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions jobim-core/src/jobim/examples/barber.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion jobim-core/src/loadtest.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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)}))

Expand Down
4 changes: 2 additions & 2 deletions jobim-core/test/jobim/test/jobim_local.clj
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,15 @@
(is (= :open (state fsm)))
(lock fsm)
(is (= :locked (state fsm)))))

(deftest test-server-1
(println "*** test-server1")
(let [server (jserver/make-channel-manager)
chn (jserver/alloc server)]
(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)
Expand Down