Merge pull request #356 from ipelupessy/refactor_async2

various improvements of async requests:
- handling of exceptions
- allow normal call when async is in progress
- request can be indexed
- requests can be used as arguments to code function calls
- requests can be unpacked, ie a,b=code.funct(return_request=True)
- requests can be combined in expressions (resulting in new request)
- put async stuff in seperate file

src/amuse/datamodel/incode_storage.py

@@ -103,7 +103,7 @@
 from amuse.datamodel import Grid
 from amuse.datamodel import AttributeStorage
 
-from amuse.rfi.channel import ASyncRequestSequence
+from amuse.rfi.async_request import ASyncRequestSequence
 
 class ParticleMappingMethod(AbstractCodeMethodWrapper):
     def __init__(self, method, attribute_names = None):

src/amuse/datamodel/memory_storage.py

@@ -8,6 +8,7 @@
 from amuse.units.quantities import is_quantity
 from amuse.datamodel.base import *
 from amuse.support import exceptions
+from amuse.rfi.async_request import FakeASyncRequest
 
 try:
   if numpy.uintp().itemsize<8: raise Exception()
@@ -110,7 +111,6 @@ def get_values_in_store(self, indices, attributes):
         return results
 
     def get_values_in_store_async(self, indices, attributes):
-        from amuse.rfi.channel import FakeASyncRequest
         result = self.get_values_in_store(indices, attributes)
         return FakeASyncRequest(result)
 
@@ -146,7 +146,6 @@ def set_values_in_store(self, indices, attributes, list_of_values_to_set):
                     raise AttributeError("exception in setting attribute '{0}', error was '{1}'".format(attribute, ex))
 
     def set_values_in_store_async(self, indices, attributes, list_of_values_to_set):
-        from amuse.rfi.channel import FakeASyncRequest
         result = self.set_values_in_store(indices, attributes, list_of_values_to_set)
         return FakeASyncRequest(result)
 

src/amuse/ext/job_server.py

@@ -30,7 +30,7 @@
 """
 from amuse.rfi.core import *
 import cPickle as pickle
-from amuse.rfi.channel import AsyncRequestsPool
+from amuse.rfi.async_request import AsyncRequestsPool
 import inspect
 from collections import deque
 import threading