Commit graph

100 commits

Author SHA1 Message Date
Viktor Klang
b45cec3da4 Preparing Akka Camel for bin compat 2012-05-23 15:17:49 +02:00
Viktor Klang
22f0062f23 Merge with upstream + minor edits 2012-05-21 11:00:45 +02:00
Viktor Klang
5eba9fceef Saving the planet and shufflin' 2012-05-18 13:37:26 +02:00
Viktor Klang
5ca3fe11f8 Adding tons of ScalaDocs for Mailbox.scala 2012-05-16 17:37:23 +02:00
Viktor Klang
2ee712a8b1 Do not tinker with the 0mq socket for the ConnectionSocketActor on Restart 2012-04-04 11:08:28 +02:00
Roland
ca9d6b369d fix CallingThreadMailbox.numberOfMessages 2012-04-03 16:28:36 +02:00
Roland
64b523638e rework childrenRefs to make context.stop(child) fully asynchronous
- replace TreeMap with custom ChildrenContainer, which has three
  implementations: empty, normal and “terminating” (i.e. waiting for
  some child to terminate)
- split recreate() in the same way as terminate(), so that there is a
  phase during which the suspended actor waits for termination of all
  children which were stopped in preRestart
- do not null out “actor” in ActorCell during restart, because we do
  need the supervisionStrategy and nulling it out does not buy us much
  in this case anyway
- provide new ActorContext.suspendForChildTermination(), which enters
  limbo for as long there are outstanding termination requests; this
  enables code which is very similar to previously (half-working) setups
  with “synchronous” context.stop(child)

docs are still missing, plus a little polishing here and there; oh, and
before I forget: ActorCell NOW is 64 bytes again ;-)
2012-02-29 21:10:31 +01:00
phaller
2d67675057 Update constructors of deque-based mailboxes 2012-02-27 23:26:15 +01:00
phaller
82ac03d882 Merge remote-tracking branch 'origin/master' into wip-stash 2012-02-27 23:00:20 +01:00
Roland
b4fcc3b2f2 Merge remote-tracking branch 'origin/master' into wip-1836-durMB-settings-∂π
... and fix up MailboxType docs with new constructor signature.
2012-02-26 21:38:56 +01:00
Roland
eaee16c7d3 include system.settings when constructing MailboxType, see #1864
- necessary to not have to construct one Settings object per
  MessageQueue
- added system.settings to DispatcherPrerequisites
2012-02-26 21:26:25 +01:00
phaller
601ef17f54 Fix merge issues 2012-02-24 16:32:00 +01:00
Viktor Klang
2c5f65b0b2 #1860 - Making all default messagequeues be the implementation, and therefor avoiding one level of indirection. 2012-02-24 13:13:55 +01:00
Viktor Klang
2b4c8b2508 Changing so that PriorityMailboxes can be used 2012-02-21 17:24:09 +01:00
Roland
c84daf83e8 clean up mailbox types configurability, see #1843
- add (config) constructors to std mailbox types
- update docs for prio mailbox to directly implement MailboxType
2012-02-21 16:40:34 +01:00
Roland
3eeaadd804 move back to explicit enqueue/dequeue delegation from Mailbox to MessageQueue, see #1844 2012-02-21 13:22:25 +01:00
Philipp Haller
bda8617526 Remove DequeBasedMessageQueue.enqueueAllFirst 2012-02-19 23:13:56 +01:00
Roland
2f3737195b split Mailbox and MessageQueue, see #1844
- this enables using any MessageQueue in BalancingDispatcher,
  CallingThreadDispatcher and in general leads to less conflation of
  concepts
- add MessageQueue.cleanUp(owner, deadLetterQueue) for the benefit of
  durable mailboxes
- change MailboxType.create to take an optional owner and generate only
  a MessageQueue, not a Mailbox
2012-02-19 10:28:56 +01:00
Philipp Haller
13488ecd1c Fix merge conflicts 2012-02-13 22:25:55 +01:00
Roland
251a7cc7e3 clean up BalancingDispatcher:
- change from messageQueue.numberOfMessages to maintaining an AtomicLong
  for performance reasons
- add comments/scaladoc where missing
- remove some assert()s
- fix ResiserSpec to employ buddy-wakeup-threshold
2012-02-13 12:38:59 +01:00
phaller
74daec6fe0 Merge branch 'master' into wip-stash 2012-02-13 12:11:37 +01:00
phaller
7511789e90 Clean ups. Reorder traits for readability. Fewer braces. 2012-02-13 12:10:35 +01:00
phaller
7b004c33b9 Make Stash.unstashAll() not atomic. Avoid locking on hot path. Update docs in Stash accordingly. 2012-02-13 10:26:33 +01:00
Roland
a2ef3eed7e scaffolding: make debug printout more useful, add assertions 2012-02-10 20:56:52 +01:00
Roland
ca3deb4007 now that was a nice journey (related to #1804)
- first, fix quite some data races in RoutedActorRef wrt. the contained
  ActorCell’s childrenRef field (which is not even @volatile)
- then notice that there still are double-deregistrations happening in
  the dispatcher
- coming finally to the conclusion that the Mailbox should not really
  process all system messages in processAllSystemMessages(): we should
  really really stop after having closed the mailbox ;-)
- added simple test case which stops self twice to keep this fixed
2012-02-09 17:34:14 +01:00
phaller
fc4d312156 Check capacity in BoundedDequeBasedMessageQueueSemantics.enqueueAllFirst(). Document semantics of unstashAll(). 2012-02-09 14:55:44 +01:00
phaller
4f43141c50 Add bounded deque-based mailbox 2012-02-08 18:26:54 +01:00
Philipp Haller
ab60681a17 Fix merge conflict 2012-02-07 17:04:38 +01:00
Philipp Haller
cdcba16a9c Improve docs. Use private instead of instance-private modifiers. Add return type. 2012-02-07 16:51:20 +01:00
Viktor Klang
66c1e2d835 Sprinkling some finals and adding return types 2012-02-06 15:42:28 +01:00
Philipp Haller
68d6a18883 Add Stash and UnboundedDequeBasedMailbox 2012-02-06 14:49:23 +01:00
Patrik Nordwall
09e13e271b Merge branch 'master' into wip-1310-err2-patriknw
Conflicts:
	akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
	akka-cluster/src/main/scala/akka/cluster/Cluster.scala
	akka-cluster/src/main/scala/akka/cluster/TransactionLog.scala
	akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
2012-02-03 13:57:28 +01:00
Viktor Klang
c201d28fbb #1773 bites the dust 2012-02-02 09:22:26 +01:00
Patrik Nordwall
5033647176 Fixed things from review. See #1310 2012-02-01 17:38:12 +01:00
Patrik Nordwall
c447f46224 Some polish on the error handling. See #1310 2012-02-01 14:40:12 +01:00
Patrik Nordwall
f13b5356f7 Second stab at revised error handling. See #1310 2012-01-31 14:44:14 +01:00
Viktor Klang
f7a45c0e8f Removing dead imports from akka-actor 2012-01-25 15:38:04 +01:00
Viktor Klang
e523d5418c Clarified the code, removing a negation that could be overlooked 2012-01-21 13:12:30 +01:00
Viktor Klang
61e0bd568b Modifications after review 2012-01-21 13:04:45 +01:00
Viktor Klang
42d3328815 Moving tests after first invocation 2012-01-21 01:33:07 +01:00
Viktor Klang
a22d01f595 Removing noise 2012-01-21 01:15:00 +01:00
Viktor Klang
388ec810bf Fixing inverted logic 2012-01-21 01:13:55 +01:00
Viktor Klang
bcfd70f6e0 Moving debug logging statement back into Mailbox.scala 2012-01-21 01:09:06 +01:00
Viktor Klang
184d15d81e Switching to tail recursion and lowering numer of moving parts 2012-01-21 01:06:32 +01:00
Viktor Klang
149fbea5a7 Updating Copyright as per #1660 2012-01-19 18:21:06 +01:00
Roland
e81791cbb6 fix dormant bug in Mailbox’s error logging
- actor.actor could potentially be null after a failed restart attempt
- fix one case of baroqueness in FaultHandling.scala
2012-01-17 14:07:20 +01:00
Roland
d0498eb32e add Class[_] to LogEvent
- it is customary to use class name for categorizing logs, hence we
  should support it; class is taken from logSource.getClass
- update SLF4J module to use logClass as category and set logSource in
  MDC "akkaSource"
- add docs
2012-01-12 13:29:17 +01:00
Roland
6fddb87fca fix one spurious buglet in CallingThreadDispatcher, see #1375 2012-01-10 13:33:57 +01:00
Patrik Nordwall
c4401f1ca8 Changed so that the configured FQCN of the mailboxType must be a MailboxType, not the Mailbox. See #1458 2011-12-21 19:37:18 +01:00
Patrik Nordwall
d87d9e2e80 Additional feedback, thanks. 2011-12-20 10:12:40 +01:00