projects
/
IRC.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e7ac04d
)
compile error fixes for new Barrier.java
author
adash
<adash>
Wed, 6 Aug 2008 07:34:11 +0000
(07:34 +0000)
committer
adash
<adash>
Wed, 6 Aug 2008 07:34:11 +0000
(07:34 +0000)
Robust/src/ClassLibrary/Barrier.java
patch
|
blob
|
history
diff --git
a/Robust/src/ClassLibrary/Barrier.java
b/Robust/src/ClassLibrary/Barrier.java
index 2be5dc9e49a22da0fa67d666b2493de8ae237589..35556326ba614ab3c500b1776e050e56a4a29859 100644
(file)
--- a/
Robust/src/ClassLibrary/Barrier.java
+++ b/
Robust/src/ClassLibrary/Barrier.java
@@
-6,25
+6,26
@@
public class BarrierServer extends Thread {
}
public run() {
}
public run() {
+ int n;
atomic {
n=numthreads;
}
ServerSocket ss=new ServerSocket(2000);
atomic {
n=numthreads;
}
ServerSocket ss=new ServerSocket(2000);
- Socket ar[]=new Socket[n
umthreads
];
- for(int i=0;i<n
umthreads
;i++) {
+ Socket ar[]=new Socket[n];
+ for(int i=0;i<n;i++) {
ar[i]=ss.accept();
}
while(true) {
ar[i]=ss.accept();
}
while(true) {
- for(int j=0;j<n
umthreads
;j++) {
+ for(int j=0;j<n;j++) {
Socket s=ar[j];
byte b[]=new byte[1];
while(s.read(b)!=1)
;
}
byte b[]=new byte[1];
Socket s=ar[j];
byte b[]=new byte[1];
while(s.read(b)!=1)
;
}
byte b[]=new byte[1];
- b[0]='A';
- for(int j=0;j<n
umthreads
;j++)
+ b[0]=
(byte)
'A';
+ for(int j=0;j<n;j++)
ar[j].write(b);
}
}
ar[j].write(b);
}
}
@@
-33,13
+34,13
@@
public class BarrierServer extends Thread {
public class Barrier {
Socket s;
public Barrier(String name) {
public class Barrier {
Socket s;
public Barrier(String name) {
-
s=new Socket(name, 2000);
+ s=new Socket(name, 2000);
}
}
- public static void enterBarrier(Barrier b) {
-
byte b[]=new byte[1];
-
s.write(b);
-
while(s.read(b)!=1)
-
;
+ public static void enterBarrier(Barrier b
arr
) {
+ byte b[]=new byte[1];
+ s.write(b);
+ while(s.read(b)!=1)
+ ;
}
}
-}
\ No newline at end of file
+}