A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
hpcvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correction and modification of save mechanisms.
[hpcvm.git]
/
src
/
and
/
hpcvm
/
Client.java
diff --git
a/src/and/hpcvm/Client.java
b/src/and/hpcvm/Client.java
index
e3233eb
..
3153cb9
100644
(file)
--- a/
src/and/hpcvm/Client.java
+++ b/
src/and/hpcvm/Client.java
@@
-81,7
+81,7
@@
public class Client extends UnicastRemoteObject implements ServicesClient
} catch( Exception e ) {}
}
} catch( Exception e ) {}
}
- stopVM() ;
+ stopVM(
1
) ;
}
}
@@
-241,7
+241,7
@@
public class Client extends UnicastRemoteObject implements ServicesClient
if( ! ret )
{
sema.release() ;
if( ! ret )
{
sema.release() ;
- stopVM() ;
+ stopVM(
1
) ;
return 1 ;
} else {
retry++ ;
return 1 ;
} else {
retry++ ;
@@
-250,7
+250,7
@@
public class Client extends UnicastRemoteObject implements ServicesClient
System.err.println( "Unable to check VM!" ) ;
sema.release() ;
System.err.println( "Unable to check VM!" ) ;
sema.release() ;
- stopVM() ;
+ stopVM(
1
) ;
return 1 ;
}
System.out.println( "Retrying (" + retry + ") ... " ) ;
return 1 ;
}
System.out.println( "Retrying (" + retry + ") ... " ) ;
@@
-261,12
+261,12
@@
public class Client extends UnicastRemoteObject implements ServicesClient
} catch( IOException e ) {
e.printStackTrace() ;
sema.release() ;
} catch( IOException e ) {
e.printStackTrace() ;
sema.release() ;
- stopVM() ;
+ stopVM(
1
) ;
return 1 ;
} catch( InterruptedException e ) {
e.printStackTrace() ;
sema.release() ;
return 1 ;
} catch( InterruptedException e ) {
e.printStackTrace() ;
sema.release() ;
- stopVM() ;
+ stopVM(
1
) ;
return 1 ;
}
return 1 ;
}
@@
-283,7
+283,7
@@
public class Client extends UnicastRemoteObject implements ServicesClient
sema.release() ;
sema.release() ;
- stopVM() ;
+ stopVM(
1
) ;
return 1 ;
} else {
return 1 ;
} else {
@@
-315,7
+315,7
@@
public class Client extends UnicastRemoteObject implements ServicesClient
} catch( IOException e1 ) {
e1.printStackTrace() ;
sema.release() ;
} catch( IOException e1 ) {
e1.printStackTrace() ;
sema.release() ;
- stopVM() ;
+ stopVM(
1
) ;
return 1 ;
}
return 1 ;
}
@@
-346,7
+346,7
@@
public class Client extends UnicastRemoteObject implements ServicesClient
if( ! ret )
{
sema.release() ;
if( ! ret )
{
sema.release() ;
- stopVM() ;
+ stopVM(
1
) ;
return 1 ;
} else {
retry++ ;
return 1 ;
} else {
retry++ ;
@@
-355,7
+355,7
@@
public class Client extends UnicastRemoteObject implements ServicesClient
System.err.println( "Unable to send information to VM!" ) ;
sema.release() ;
System.err.println( "Unable to send information to VM!" ) ;
sema.release() ;
- stopVM() ;
+ stopVM(
1
) ;
return 1 ;
}
return 1 ;
}
@@
-367,12
+367,12
@@
public class Client extends UnicastRemoteObject implements ServicesClient
System.err.println( "Error during execution of runScriptInGuest command: " ) ;
e.printStackTrace() ;
sema.release() ;
System.err.println( "Error during execution of runScriptInGuest command: " ) ;
e.printStackTrace() ;
sema.release() ;
- stopVM() ;
+ stopVM(
1
) ;
return 1 ;
} catch( InterruptedException e) {
e.printStackTrace() ;
sema.release() ;
return 1 ;
} catch( InterruptedException e) {
e.printStackTrace() ;
sema.release() ;
- stopVM() ;
+ stopVM(
1
) ;
return 1 ;
}
}
return 1 ;
}
}
@@
-396,7
+396,7
@@
public class Client extends UnicastRemoteObject implements ServicesClient
} catch( IOException e1 ) {
e1.printStackTrace() ;
sema.release() ;
} catch( IOException e1 ) {
e1.printStackTrace() ;
sema.release() ;
- stopVM() ;
+ stopVM(
1
) ;
return 1 ;
}
return 1 ;
}
@@
-428,7
+428,7
@@
public class Client extends UnicastRemoteObject implements ServicesClient
if( ! ret )
{
sema.release() ;
if( ! ret )
{
sema.release() ;
- stopVM() ;
+ stopVM(
1
) ;
return 1 ;
} else {
retry++ ;
return 1 ;
} else {
retry++ ;
@@
-437,7
+437,7
@@
public class Client extends UnicastRemoteObject implements ServicesClient
System.err.println( "Unable to send information to VM!" ) ;
sema.release() ;
System.err.println( "Unable to send information to VM!" ) ;
sema.release() ;
- stopVM() ;
+ stopVM(
1
) ;
return 1 ;
}
return 1 ;
}
@@
-449,12
+449,12
@@
public class Client extends UnicastRemoteObject implements ServicesClient
System.err.println( "Error during execution of runScriptInGuest command: " ) ;
e.printStackTrace() ;
sema.release() ;
System.err.println( "Error during execution of runScriptInGuest command: " ) ;
e.printStackTrace() ;
sema.release() ;
- stopVM() ;
+ stopVM(
1
) ;
return 1 ;
} catch( InterruptedException e ) {
e.printStackTrace() ;
sema.release() ;
return 1 ;
} catch( InterruptedException e ) {
e.printStackTrace() ;
sema.release() ;
- stopVM() ;
+ stopVM(
1
) ;
return 1 ;
}
}
return 1 ;
}
}
@@
-482,7
+482,7
@@
public class Client extends UnicastRemoteObject implements ServicesClient
@Override
@Override
- public int stopVM()
+ public int stopVM(
int _mode
)
{
if( machine != null && machine.getStatus().equalsIgnoreCase( "stopped" ) )
{
{
if( machine != null && machine.getStatus().equalsIgnoreCase( "stopped" ) )
{
@@
-505,6
+505,7
@@
public class Client extends UnicastRemoteObject implements ServicesClient
int retry = 0 ;
machine.setStatus( "undefined" ) ;
int retry = 0 ;
machine.setStatus( "undefined" ) ;
+ if( _mode == 0 )
try {
LocalHost.Instance().getServerStub().changeStatus(
LocalHost.Instance().getIP(), "undefined" ) ;
try {
LocalHost.Instance().getServerStub().changeStatus(
LocalHost.Instance().getIP(), "undefined" ) ;
@@
-560,6
+561,7
@@
public class Client extends UnicastRemoteObject implements ServicesClient
}
machine.setStatus( "stopped" ) ;
}
machine.setStatus( "stopped" ) ;
+ if( _mode == 0 )
try {
LocalHost.Instance().getServerStub().changeStatus(
LocalHost.Instance().getIP(), "stopped" ) ;
try {
LocalHost.Instance().getServerStub().changeStatus(
LocalHost.Instance().getIP(), "stopped" ) ;
@@
-761,7
+763,7
@@
public class Client extends UnicastRemoteObject implements ServicesClient
e.printStackTrace() ;
}
e.printStackTrace() ;
}
- if( stopVM() == 0 )
+ if( stopVM(
1
) == 0 )
{
if( machine.deployLastSave() == 0 )
{
{
if( machine.deployLastSave() == 0 )
{
@@
-819,7
+821,7
@@
public class Client extends UnicastRemoteObject implements ServicesClient
return 0 ;
}
} else {
return 0 ;
}
} else {
- stopVM() ;
+ stopVM(
1
) ;
}
}
}
}
}
}
@@
-1509,7
+1511,7
@@
public class Client extends UnicastRemoteObject implements ServicesClient
reader.close() ; reader = null ;
socket.close() ; socket = null ;
reader.close() ; reader = null ;
socket.close() ; socket = null ;
- stopVM() ;
+ stopVM(
0
) ;
machine.setStatus( "connected" ) ;
try {
machine.setStatus( "connected" ) ;
try {
@@
-1552,7
+1554,7
@@
public class Client extends UnicastRemoteObject implements ServicesClient
@Override
public void stop()
{
@Override
public void stop()
{
- stopVM() ;
+ stopVM(
0
) ;
pingServer.stopPing() ;
pingServer.stopPing() ;