From: Sébastien Miquée <sebastien.miquee@univ-fcomte.fr>
Date: Mon, 15 Nov 2010 13:12:49 +0000 (+0100)
Subject: Changing connection ports and names for logs.
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/jaceP2P.git/commitdiff_plain/20b19e7c187f40d42ae47ddcc3ff801b4113a376

Changing connection ports and names for logs.
---

diff --git a/src/jaceP2P/JaceDaemon.java b/src/jaceP2P/JaceDaemon.java
index f894793..bc1315f 100644
--- a/src/jaceP2P/JaceDaemon.java
+++ b/src/jaceP2P/JaceDaemon.java
@@ -15,8 +15,8 @@ public class JaceDaemon {
 	// attributes
 	public static JaceDaemon Instance = null;
 	private String snode_IP = null;
-	private int snode_port = 1099;
-	private int daemonPort = 1099;
+	private int snode_port = 1098;
+	private int daemonPort = 1098;
 	private int heartTime; // HeartBeat frequency
 	private String protocol;
 	private boolean running = false;
diff --git a/src/jaceP2P/JaceP2P.java b/src/jaceP2P/JaceP2P.java
index 3322d0a..f1634a0 100644
--- a/src/jaceP2P/JaceP2P.java
+++ b/src/jaceP2P/JaceP2P.java
@@ -57,7 +57,7 @@ public class JaceP2P {
 					} catch (NumberFormatException e) {
 						System.err.println("The number of Daemons per spawner and the number of daemons per thread must be integers: "
 										+ e);
-						System.exit(0);
+						System.exit(1);
 					}
 					//System.out.println("=====> " + algoMapping);
 					param = new String[args.length - 12];
@@ -106,19 +106,19 @@ public class JaceP2P {
 		System.out
 				.println("-Daemon : <option> = [superNodeName] [daemonPort] [protocol]");
 		System.out
-				.println("ex : java jaceP2P.JaceP2P -Daemon cluster1 1099 rmi");
+				.println("ex : java jaceP2P.JaceP2P -Daemon cluster1 1098 rmi");
 		System.out.println("");
 		System.out
 				.println("-SNode : <option> = [superNodeName] [superNodePort] [protocol] [timeHeartBeat]");
 		System.out
-				.println("ex : java jaceP2P.JaceP2P -SNode cluster1 1099 rmi 500");
+				.println("ex : java jaceP2P.JaceP2P -SNode cluster1 1098 rmi 500");
 		System.out.println("");
 		System.out
 				.println("-Spawner : <option> = [superNodeName] [SpawnerPort] [protocol] nbDaemonPerSpawner nbDaemonPerThread nbresave nbTask URLToTaskName <TaskParam>");
 		System.out
-				.println("ex : java jaceP2P.JaceP2P -Spawner cluster1 1099 rmi 8 4 3 16 http://bilbo/staff/vuillemi/java/LinSolv2 1000 0 20000 5");
+				.println("ex : java jaceP2P.JaceP2P -Spawner cluster1 1098 rmi 8 4 3 16 http://bilbo/staff/vuillemi/java/LinSolv2 1000 0 20000 5");
 		System.out
-				.println("ex : java jaceP2P.JaceP2P -Spawner cluster1 1099 rmi 8 4 3 16 file:/home/vuillemi/java/LinSolv2 1000 0 20000 5");
+				.println("ex : java jaceP2P.JaceP2P -Spawner cluster1 1098 rmi 8 4 3 16 file:/home/vuillemi/java/LinSolv2 1000 0 20000 5");
 		System.exit(0);
 	}
 }
diff --git a/src/jaceP2P/JaceSpawner.java b/src/jaceP2P/JaceSpawner.java
index 69eb8a3..7c64bed 100644
--- a/src/jaceP2P/JaceSpawner.java
+++ b/src/jaceP2P/JaceSpawner.java
@@ -20,8 +20,8 @@ public class JaceSpawner {
 	private Task tache = null;
 	public static JaceSpawner Instance;
 	private static String superNode_IP = null;
-	private int superNode_port = 1099;
-	private static int spawnerPort = 1099;
+	private int superNode_port = 1098;
+	private static int spawnerPort = 1098;
 	protected static JaceSuperNodeInterface centralServer = null;
 	private JaceSpawnerInterface spawnerRef = null;
 	private int nbTasks;
@@ -792,7 +792,7 @@ public class JaceSpawner {
 				System.out.println("nb of spawners desconnections: " + nbsdc);
 				
 				// ** Tests ** //
-				String path = "/home/lyon/smiquee/resultats/execTime_CG_"+algo+"_"+test ;
+				String path = "/home/lyon/smiquee/resultats/execTime_"+algo+"_"+test ;
 				PrintWriter ecrivain = null ;
 				ecrivain = new PrintWriter( new OutputStreamWriter( new FileOutputStream( path ), "UTF8" ) ) ;
 
@@ -1090,11 +1090,11 @@ public class JaceSpawner {
 			System.out.println( "### DH = " + dh ) ;
 			
 			Utils.writeGraph( al.getGraph(), "/home/lyon/smiquee/resultats/", 
-					"graph_CG_"+algo+"_"+test+".xml" ) ;
+					"graph_"+algo+"_"+test+".xml" ) ;
 			Utils.writeGrid( al.getGrid(), "/home/lyon/smiquee/resultats/", 
-					"grid_CG_"+algo+"_"+test+".xml") ;
+					"grid_"+algo+"_"+test+".xml") ;
 			Utils.writeMapping( al.getMapping(), "/home/lyon/smiquee/resultats/",
-					"mapping_CG_"+algo+"_"+test+".xml" ) ;
+					"mapping_"+algo+"_"+test+".xml" ) ;
 		} catch (RemoteException e1) {
 			System.err.println( "Problème avec Algo dans Spawner !" ) ;
 			e1.printStackTrace();
diff --git a/src/jaceP2P/JaceSuperNode.java b/src/jaceP2P/JaceSuperNode.java
index 5392cf9..06661a9 100644
--- a/src/jaceP2P/JaceSuperNode.java
+++ b/src/jaceP2P/JaceSuperNode.java
@@ -7,7 +7,7 @@ public class JaceSuperNode {
 	final int NB_HEART_DECONNECT = 3;
 	// attribute
 	private int heartTime; // frequency of heartBeat
-	private int port = 1099; // par la suite, donner par fichier de conf
+	private int port = 1098; // par la suite, donner par fichier de conf
 	private int timeBeforeKill; // wait for 3 non response of heartBeat to kill
 								// the Daemon
 	String protocol;
diff --git a/src/jaceP2P/SuperNodeListe.java b/src/jaceP2P/SuperNodeListe.java
index 8d9484f..0eede4b 100644
--- a/src/jaceP2P/SuperNodeListe.java
+++ b/src/jaceP2P/SuperNodeListe.java
@@ -62,7 +62,7 @@ public class SuperNodeListe implements Cloneable {
 			BufferedReader br = new BufferedReader(ipsr);
 
 			while ((adr = br.readLine()) != null) {
-				liste.add(new SuperNodeData(adr, 1099));
+				liste.add(new SuperNodeData(adr, 1098));
 			}
 
 			br.close();
@@ -81,9 +81,9 @@ public class SuperNodeListe implements Cloneable {
 
 		// String adr3="193.52.61.140";
 		// System.out.println("adr3 = " + adr3);
-		// liste.add(new SuperNodeData(adr1, 1099));
-		// liste.add(new SuperNodeData(adr2, 1099));
-		// liste.add(new SuperNodeData(adr3, 1099));
+		// liste.add(new SuperNodeData(adr1, 1098));
+		// liste.add(new SuperNodeData(adr2, 1098));
+		// liste.add(new SuperNodeData(adr3, 1098));
 	}
 
 	public void fileInitialization(String fileName) {