Browse Source

Better Server Memory Management & Programs can enque precompiled code

tags/v0.2
mrbesen 1 year ago
parent
commit
3aeba6c8f2

+ 47
- 17
BBEncryptionCracker/src/de/mrbesen/CryptCrack.java
File diff suppressed because it is too large
View File


BIN
BBEncryptionCracker/test/CrackJOBID.class View File


+ 4
- 3
Server/BesenBoincServer/src/Comunication/Client.java View File

@@ -67,7 +67,7 @@ public class Client implements Runnable{
soc.close();
System.out.println("Disconnected!");
//re-enque all take jobs
Server.getServer().getProgram().jobmanager.reenque(takenjobs);
Server.getServer().getProgram().getJobManager().reenque(takenjobs);
takenjobs.clear();
} catch (IOException e) {
e.printStackTrace();
@@ -76,13 +76,14 @@ public class Client implements Runnable{

@Override
public void run() {
while(!soc.isClosed() & hold_connection) {
while(!soc.isClosed() && hold_connection) {
//handle data
try {
handler.HandleData((Data) in.readObject(), this);
// System.out.println("Recived data!");
} catch (Exception e) {
e.printStackTrace();
// e.printStackTrace();
System.err.println("Error while reciving! Disconnecting Client: " + soc.getInetAddress() );
disconnect();
}
}

+ 5
- 5
Server/BesenBoincServer/src/Comunication/Server.java View File

@@ -46,7 +46,7 @@ public class Server implements PacketHandler {
connections.add(c);
execution.submit(c);
c.send(new Data("welcomme"));
prog.jobmanager.update();
prog.getJobManager().update();
} catch (IOException e) {
e.printStackTrace();
}
@@ -60,8 +60,8 @@ public class Server implements PacketHandler {
programthread = new Thread(new Runnable() {
@Override
public void run() {
prog.run();
System.out.println("Program enqued " + prog.jobmanager.jobs_total() + " Jobs.");
for(int i = 0; i < 15 && prog.enquenextJob(); i++);//enque 15 start jobs
System.out.println("Program enqued " + prog.getJobManager().jobs_total() + " Jobs.");
}
}, "Programm Thread");
programthread.start();
@@ -114,8 +114,8 @@ public class Server implements PacketHandler {
c.send(new Data("pingback"));
// System.out.println("Pinged, pining back...");
} else if(info.equalsIgnoreCase("nextplease")) {
if(prog.jobmanager.hasNext()) {
c.send(new Data(prog.jobmanager.next(),ContentType.Job));
if(prog.getJobManager().hasNext()) {
c.send(new Data(prog.getJobManager().next(),ContentType.Job));
} else {
System.out.println("Out of Tasks");
}

+ 37
- 2
Server/BesenBoincServer/src/Core/Program.java View File

@@ -1,12 +1,26 @@
package Core;

import java.nio.ByteBuffer;
import java.util.Arrays;

import Job.JobManager;
import Job.Result;
import Job.Result.PartialResult;

public abstract class Program implements Runnable {
public abstract class Program{

public JobManager jobmanager = new JobManager();
private JobManager jobmanager = new JobManager(this);
public JobManager getJobManager() {
return jobmanager;
}
/**
* Called by the JobManager or Server, to get the Program generating the next Job.
* The Program is allowed to sumbit more than one Program to the JobManager.
* returns false, when all jobs are submited
*/
public abstract boolean enquenextJob();
public void HandleResult(Result r) {
jobmanager.setdone(r.getJobId());
@@ -20,5 +34,26 @@ public abstract class Program implements Runnable {
}
}
protected byte[] inttoBytes(int i ) {
return ByteBuffer.allocate(4).putInt(i).array();
}

protected byte[] longtoBytes(long i ) {
return ByteBuffer.allocate(8).putLong(i).array();
}
/**
* removes the zero terminating byte
* @param s
* @return
*/
protected byte[] stringtoBytes(String s) {
byte[] tmp = s.getBytes();
if(tmp[tmp.length-1] == 0) {
tmp = Arrays.copyOf(tmp, tmp.length-1);
}
return tmp;
}
public abstract void HandlePartialResult(PartialResult pres);
}

+ 1
- 1
Server/BesenBoincServer/src/Core/Starter.java View File

@@ -53,7 +53,7 @@ public class Starter {
Server.getServer().close();
run = false;
} else if(in.equalsIgnoreCase("stats")) {
JobManager jm = server.getProgram().jobmanager;
JobManager jm = server.getProgram().getJobManager();
System.out.println("\nStats:\nTasks done : " + jm.jobs_done() + "\nTasks send : " + jm.jobs_send() + "\nTasks compiled: " + jm.jobs_compiled() + "/" + jm.jobs_compiledtarget() + "\nCurrently Compiling: " + jm.isCompiling() + "\nTasks enqued : " + jm.jobs_enqued() + "\n--------------------\ntotal : " + jm.jobs_total()+ "\nConnections: " + server.getConnectionCount());
} else {
System.out.println("unknown Command.");

+ 40
- 13
Server/BesenBoincServer/src/Job/JobManager.java View File

@@ -10,6 +10,7 @@ import java.util.List;
import java.util.Scanner;

import Comunication.Server;
import Core.Program;
import Utils.StringUtils;

public class JobManager implements Iterator<Job>{
@@ -19,20 +20,28 @@ public class JobManager implements Iterator<Job>{
private List<Job> send = new ArrayList<Job>();//assigned jobs
private List<Job> done = new ArrayList<Job>();//done jobs

private Program prog;
private int jobcount = 0;

private boolean isCompiling = false;

public JobManager(Program program) {
prog = program;
}

public void reenque(List<Job> jobs) {
todo.addAll(0, jobs);
send.removeAll(jobs);
update();
}
public void enque(Job newjob) {
public void enque(Job newjob, boolean isPreCompiled) {
jobcount++;
newjob.setId(jobcount);
enqued.add(newjob);
if(isPreCompiled)
todo.add(newjob);
else
enqued.add(newjob);
update();
}
@@ -45,9 +54,13 @@ public class JobManager implements Iterator<Job>{
@Override
public void run() {
isCompiling = true;//doppelt hält besser
// System.out.println("Compilingque started!");
while(enqued.size() > 0 & todo.size() < 15 & isCompiling) {
//compile them!
while(enqued.size() > 0 && todo.size() < jobs_compiledtarget() && isCompiling) {
Job j = enqued.get(0);
if(j == null) {
System.out.println("enqued.size(): " + enqued.size() + " but job.get(0) is null!");
break;
}
//compile script
try {
// System.out.println(j.code);
@@ -86,20 +99,17 @@ public class JobManager implements Iterator<Job>{
enqued.remove(0);//manage ques
todo.add(j);

//br.close();

if(classfile.exists())//delete all files
classfile.delete();
if (file.exists())
file.delete();

// System.out.println("Compile done.");
} catch(IOException | InterruptedException e) {
e.printStackTrace();
}
}
isCompiling = false;
// System.out.println("Compiling que Stopped!");
// System.out.println("Compiler stopped!");
}
}, "Compiler");
}
@@ -109,20 +119,36 @@ public class JobManager implements Iterator<Job>{
*/
@Override
public boolean hasNext() {
return todo.size() != 0;
if(todo.size() == 0) {
update();
return false;
}
return true;
}

@Override
public Job next() {
//Warning! not checked if todo.get(0) exists!
send.add(todo.get(0));
todo.remove(0);
update();
System.out.println("" + ((int) (((float) done.size()) / ((float)jobs_total()))*100) + "% Done");
System.out.println(((int) (((float) done.size()) / ((float)jobs_total()))*100) + "% Done");
return send.get(send.size()-1);
}

public void update() {//called from Server on new Client Connection
if(enqued.size() > 0 & !isCompiling & todo.size() < jobs_compiledtarget()) {//7 für jede connection vorrätig
/**
* Called, when the job-lists get modified or a new client connects.
* This method simply checks weather the compiler-thread should be started or not.
* If the Thread should be started, this method does it with no further instruction.
*/
public void update() {
boolean hasnext = true;//variable zum testen, ob das Programm weitere Jobs hat
while(enqued.size() + todo.size() < jobs_compiledtarget() && (hasnext = prog.enquenextJob()));//genarte new jobs!
if(!hasnext) {
System.out.println("Program has no new Jobs!");
//TODO: somehow stop the compile thread after compiling (and disable it from re-opening) and set a flag, that after these jobs are done the server could shutdown.
}
if(enqued.size() > 0 && !isCompiling && todo.size() < jobs_compiledtarget()) {//7 jobs for each connection and at least 10
startCompile();
}
}
@@ -185,7 +211,7 @@ public class JobManager implements Iterator<Job>{
* @param jobId
*/
public void setdone(int jobId) {
//find yob
//find job
Job j = null;
int pos = -1;
for(int i = 0; i < send.size(); i++) {
@@ -199,6 +225,7 @@ public class JobManager implements Iterator<Job>{
if(j != null) {
send.remove(pos);
done.add(j);
//TODO: delete old done jobs, to preverse Memory?
} else {
System.out.println("Job id " + jobId + " not found");
}

+ 7
- 5
test-factorial/BBTestprogram/src/Test.java View File

@@ -4,12 +4,14 @@ import Job.Result.PartialResult;

public class Test extends Program {

private int c = 0;
@Override
public void run() {
for(int c = 5; c < 1000; c++) {
String code = "import Job.Job;\nimport Job.Result;\nimport Job.Result.PartialResult;\nimport Job.Jobsrc;\npublic class A" + c + " extends Jobsrc {\n@Override\npublic Result run() {\ndouble i ="+c+";\nfor(int n = 2; n < " + c + ";n++){\n i *= n;\n}\n Result r = new Result(" + (jobmanager.jobs_total() +1) +");\nr.OutputConsole(\"!"+c+"= \"+i);\n return r;\n }}";
jobmanager.enque(new Job(code));
}
public boolean enquenextJob() {
String code = "import Job.Job;\nimport Job.Result;\nimport Job.Result.PartialResult;\nimport Job.Jobsrc;\npublic class A" + c + " extends Jobsrc {\n@Override\npublic Result run() {\ndouble i ="+c+";\nfor(int n = 2; n < " + c + ";n++){\n i *= n;\n}\n Result r = new Result(" + (getJobManager().jobs_total() +1) +");\nr.OutputConsole(\"!"+c+"= \"+i);\n return r;\n }}";
getJobManager().enque(new Job(code), false);
c++;
return true;
}

@Override

+ 13
- 9
test-primefinder/BBPrimeFinder/src/mrbesen/PrimeFinder.java View File

@@ -15,14 +15,13 @@ import Job.Result.PartialResult;
public class PrimeFinder extends Program {

List<Double> primes = new ArrayList<Double>();
double count = -1;
double count = -1;//current prime
File file = new File("primes");

int save_count;//to save every 20 times
int save_intervall = 100;

@Override
public void run() {
public PrimeFinder() {
//load primes
try {
if(file.exists()) {
@@ -51,7 +50,7 @@ public class PrimeFinder extends Program {
count = primes.get(primes.size()-1)+1;

String insert = PrimetoString(count);
jobmanager.enque(new Job("import Job.Jobsrc;\nimport Job.Result;\nimport Job.Result.ResultType;\npublic class A" + insert + " extends Jobsrc{\n double num = " + insert + ";\n @Override\n public Result run() {\n Result r = new Result();\n for(double test = num; test < num + 200; test = test +2) {\n for(double i = 2; i * i <= test+2; i++) {\n if(test%i == 0)\n r.add(r.new PartialResult(ResultType.Value, test + \"|\" + false));\n }\n r.add(r.new PartialResult(ResultType.Value, test + \"|\" + true));\n }\n return r;\n }\n}") );
getJobManager().enque(new Job("import Job.Jobsrc;\nimport Job.Result;\nimport Job.Result.ResultType;\npublic class A" + insert + " extends Jobsrc{\n double num = " + insert + ";\n @Override\n public Result run() {\n Result r = new Result();\n for(double test = num; test < num + 200; test = test +2) {\n for(double i = 2; i * i <= test+2; i++) {\n if(test%i == 0)\n r.add(r.new PartialResult(ResultType.Value, test + \"|\" + false));\n }\n r.add(r.new PartialResult(ResultType.Value, test + \"|\" + true));\n }\n return r;\n }\n}"), false);
count+= 200;
}

@@ -67,11 +66,9 @@ public class PrimeFinder extends Program {
fw.close();
System.out.println("Primes saved");
}
private String PrimetoString(double prime) {
String out = prime + "";
out = out.substring(0,out.length()-2);
return out;
return ((int) prime) / 100 + "";
}

@Override
@@ -87,7 +84,7 @@ public class PrimeFinder extends Program {
primes.add(Double.parseDouble(split[0]));
}
}
save_count++;
if(save_count >=save_intervall)
try {
@@ -96,4 +93,11 @@ public class PrimeFinder extends Program {
e.printStackTrace();
}
}


@Override
public boolean enquenextJob() {
checkforprime();
return true;
}
}

Loading…
Cancel
Save