ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-24 05:18:24 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'wip' of oss.readytalk.com:/var/local/git/avian into wip

Browse Source
This commit is contained in:
jet 2009-11-03 11:50:21 -07:00
commit ad379e1b20
6 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
classpath/java/nio/channels/SocketChannel.java
View File

@ -42,6 +42,10 @@ public class SocketChannel extends SelectableChannel
return blocking; return blocking;
} }
public boolean isConnected() {
return connected;
}
public Socket socket() { public Socket socket() {
return new Handle(); return new Handle();
} }
@ -59,7 +63,10 @@ public class SocketChannel extends SelectableChannel
} }
public boolean finishConnect() throws IOException { public boolean finishConnect() throws IOException {
return natFinishConnect(socket); if (! connected) {
connected = natFinishConnect(socket);
}
return connected;
} }
public void close() throws IOException { public void close() throws IOException {

2
classpath/java/nio/channels/SocketSelector.java
View File

@ -65,7 +65,7 @@ class SocketSelector extends Selector {
public int doSelect(long interval) throws IOException { public int doSelect(long interval) throws IOException {
selectedKeys.clear(); selectedKeys.clear();
if (clearWoken()) return 0; if (clearWoken()) interval = -1;
int max=0; int max=0;
for (Iterator<SelectionKey> it = keys.iterator(); for (Iterator<SelectionKey> it = keys.iterator();

2
makefile
View File

@ -507,6 +507,8 @@ clean-native:
@echo "removing $(native-build)" @echo "removing $(native-build)"
rm -rf $(native-build) rm -rf $(native-build)
$(native-build)/compile-x86-asm.o: $(src)/continuations-x86.S
gen-arg = $(shell echo $(1) | sed -e 's:$(native-build)/type-\(.*\)\.cpp:\1:') gen-arg = $(shell echo $(1) | sed -e 's:$(native-build)/type-\(.*\)\.cpp:\1:')
$(generated-code): %.cpp: $(src)/types.def $(generator) $(classpath-dep) $(generated-code): %.cpp: $(src)/types.def $(generator) $(classpath-dep)
@echo "generating $(@)" @echo "generating $(@)"

8
src/compile-powerpc.S
View File

@ -24,11 +24,11 @@
# define GLOBAL(x) x # define GLOBAL(x) x
#endif #endif
#define THREAD_CONTINUATION 96 #define THREAD_CONTINUATION 100
#define THREAD_EXCEPTION 36 #define THREAD_EXCEPTION 36
#define THREAD_EXCEPTION_STACK_ADJUSTMENT 100 #define THREAD_EXCEPTION_STACK_ADJUSTMENT 104
#define THREAD_EXCEPTION_OFFSET 104 #define THREAD_EXCEPTION_OFFSET 108
#define THREAD_EXCEPTION_HANDLER 108 #define THREAD_EXCEPTION_HANDLER 112
#define CONTINUATION_NEXT 4 #define CONTINUATION_NEXT 4
#define CONTINUATION_ADDRESS 16 #define CONTINUATION_ADDRESS 16

7
src/compiler.cpp
View File

@ -5182,8 +5182,6 @@ populateSiteTables(Context* c, Event* e, SiteRecordList* frozen)
resolveJunctionSites(c, e, frozen); resolveJunctionSites(c, e, frozen);
resolveBranchSites(c, e, frozen); resolveBranchSites(c, e, frozen);
captureBranchSnapshots(c, e);
} }
void void
@ -5452,12 +5450,17 @@ compile(Context* c)
populateSources(c, e); populateSources(c, e);
if (branch and e->successors) {
captureBranchSnapshots(c, e);
}
thaw(c, &frozen); thaw(c, &frozen);
e->compile(c); e->compile(c);
if ((not branch) and e->successors) { if ((not branch) and e->successors) {
populateSiteTables(c, e, &frozen); populateSiteTables(c, e, &frozen);
captureBranchSnapshots(c, e);
thaw(c, &frozen); thaw(c, &frozen);
} }

16
src/continuations-x86.S
View File

@ -1,10 +1,10 @@
#ifdef __x86_64__ #ifdef __x86_64__
#define THREAD_CONTINUATION 168 #define THREAD_CONTINUATION 176
#define THREAD_EXCEPTION 64 #define THREAD_EXCEPTION 64
#define THREAD_EXCEPTION_STACK_ADJUSTMENT 176 #define THREAD_EXCEPTION_STACK_ADJUSTMENT 184
#define THREAD_EXCEPTION_OFFSET 184 #define THREAD_EXCEPTION_OFFSET 192
#define THREAD_EXCEPTION_HANDLER 192 #define THREAD_EXCEPTION_HANDLER 200
#define CONTINUATION_NEXT 8 #define CONTINUATION_NEXT 8
#define CONTINUATION_ADDRESS 32 #define CONTINUATION_ADDRESS 32
@ -75,11 +75,11 @@ LOCAL(vmInvoke_exit):
#elif defined __i386__ #elif defined __i386__
#define THREAD_CONTINUATION 96 #define THREAD_CONTINUATION 100
#define THREAD_EXCEPTION 36 #define THREAD_EXCEPTION 36
#define THREAD_EXCEPTION_STACK_ADJUSTMENT 100 #define THREAD_EXCEPTION_STACK_ADJUSTMENT 104
#define THREAD_EXCEPTION_OFFSET 104 #define THREAD_EXCEPTION_OFFSET 108
#define THREAD_EXCEPTION_HANDLER 108 #define THREAD_EXCEPTION_HANDLER 112
#define CONTINUATION_NEXT 4 #define CONTINUATION_NEXT 4
#define CONTINUATION_ADDRESS 16 #define CONTINUATION_ADDRESS 16