Add info about renderable project for this session: number of project allow by scheduler depending on the past error, current settings (ram, cpu, gpu,...)

This commit is contained in:
Laurent Clouet
2019-02-10 13:17:39 +01:00
parent be7c35eb31
commit 8f4c899ea2
4 changed files with 24 additions and 6 deletions

View File

@@ -373,6 +373,7 @@ public class Server extends Thread implements HostnameVerifier, X509TrustManager
int credits_earned = 0;
int credits_earned_session = 0;
int waiting_project = 0;
int renderable_project = 0;
int connected_machine = 0;
if (a_node.hasAttribute("frame_remaining") && a_node.hasAttribute("credits_total") && a_node.hasAttribute("credits_session") && a_node.hasAttribute("waiting_project") && a_node.hasAttribute("connected_machine")) {
remaining_frames = Integer.parseInt(a_node.getAttribute("frame_remaining"));
@@ -381,6 +382,9 @@ public class Server extends Thread implements HostnameVerifier, X509TrustManager
waiting_project = Integer.parseInt(a_node.getAttribute("waiting_project"));
connected_machine = Integer.parseInt(a_node.getAttribute("connected_machine"));
}
if (a_node.hasAttribute("renderable_project")) {
renderable_project = Integer.parseInt(a_node.getAttribute("renderable_project"));
}
ns = document.getElementsByTagName("job");
if (ns.getLength() == 0) {
@@ -472,7 +476,7 @@ public class Server extends Thread implements HostnameVerifier, X509TrustManager
update_method
);
this.client.getGui().displayStats(new Stats(remaining_frames, credits_earned, credits_earned_session, waiting_project, connected_machine));
this.client.getGui().displayStats(new Stats(remaining_frames, credits_earned, credits_earned_session, renderable_project, waiting_project, connected_machine));
return a_job;
}

View File

@@ -23,13 +23,15 @@ public class Stats {
private int remainingFrame;
private int creditsEarned;
private int creditsEarnedSession;
private int renderableProject;
private int waitingProject;
private int connectedMachine;
public Stats(int frame, int credits, int creditsSession, int waitings, int machines) {
public Stats(int frame, int credits, int creditsSession, int renderables, int waitings, int machines) {
remainingFrame = frame;
creditsEarned = credits;
creditsEarnedSession = creditsSession;
renderableProject = renderables;
waitingProject = waitings;
connectedMachine = machines;
}
@@ -38,6 +40,7 @@ public class Stats {
remainingFrame = 0;
creditsEarned = 0;
creditsEarnedSession = 0;
renderableProject = 0;
waitingProject = 0;
connectedMachine = 0;
}
@@ -54,6 +57,10 @@ public class Stats {
return creditsEarned;
}
public int getRenderableProject() {
return renderableProject;
}
public int getWaitingProject() {
return waitingProject;
}
@@ -64,6 +71,6 @@ public class Stats {
@Override
public String toString() {
return "Stats [remainingFrame=" + remainingFrame + ", creditsEarned=" + creditsEarned + ", creditsEarnedSession=" + creditsEarnedSession + ", waitingProject=" + waitingProject + ", connectedMachine=" + connectedMachine + "]";
return "Stats [remainingFrame=" + remainingFrame + ", creditsEarned=" + creditsEarned + ", creditsEarnedSession=" + creditsEarnedSession + ", renderableProject=" + renderableProject + ", waitingProject=" + waitingProject + ", connectedMachine=" + connectedMachine + "]";
}
}

View File

@@ -121,7 +121,7 @@ public class GuiSwing extends JFrame implements Gui {
}
setTitle(title);
setSize(520, 680);
setSize(520, 760);
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);

View File

@@ -69,6 +69,7 @@ public class Working implements Activity {
private JLabel currrent_project_progression_value;
private JLabel current_project_compute_method_value;
private JLabel user_info_points_total_value;
private JLabel renderable_projects_value;
private JLabel waiting_projects_value;
private JLabel connected_machines_value;
private JLabel user_info_total_rendertime_this_session_value;
@@ -85,6 +86,7 @@ public class Working implements Activity {
currrent_project_progression_value = new JLabel("");
current_project_compute_method_value = new JLabel("");
user_info_points_total_value = new JLabel("");
renderable_projects_value = new JLabel("");
waiting_projects_value = new JLabel("");
connected_machines_value = new JLabel("");
user_info_total_rendertime_this_session_value = new JLabel("");
@@ -126,6 +128,7 @@ public class Working implements Activity {
JLabel user_info_credits_this_session = new JLabel("Points earned: ", JLabel.TRAILING);
JLabel user_info_total_rendertime_this_session = new JLabel("Duration: ", JLabel.TRAILING);
JLabel user_info_rendered_frame_this_session = new JLabel("Rendered frames: ", JLabel.TRAILING);
JLabel global_static_renderable_project = new JLabel("Renderable projects: ", JLabel.TRAILING);
session_info_panel.add(user_info_credits_this_session);
session_info_panel.add(creditEarned);
@@ -133,6 +136,9 @@ public class Working implements Activity {
session_info_panel.add(user_info_rendered_frame_this_session);
session_info_panel.add(renderedFrameContent);
session_info_panel.add(global_static_renderable_project);
session_info_panel.add(renderable_projects_value);
session_info_panel.add(user_info_total_rendertime_this_session);
session_info_panel.add(user_info_total_rendertime_this_session_value);
@@ -142,7 +148,7 @@ public class Working implements Activity {
JLabel global_stats_machine_connected = new JLabel("Machines connected: ", JLabel.TRAILING);
JLabel global_stats_remaining_frame = new JLabel("Remaining frames: ", JLabel.TRAILING);
JLabel global_stats_waiting_project = new JLabel("Remaining projects: ", JLabel.TRAILING);
JLabel global_stats_waiting_project = new JLabel("Active projects: ", JLabel.TRAILING);
JLabel global_stats_user_points = new JLabel("User's points: ", JLabel.TRAILING);
global_stats_panel.add(global_stats_waiting_project);
@@ -213,7 +219,7 @@ public class Working implements Activity {
widthLeftColumn = Spring.max(widthLeftColumn, getBestWidth(session_info_panel, 3, 2));
alignPanel(current_project_panel, 5, 2, widthLeftColumn);
alignPanel(global_stats_panel, 4, 2, widthLeftColumn);
alignPanel(session_info_panel, 3, 2, widthLeftColumn);
alignPanel(session_info_panel, 4, 2, widthLeftColumn);
}
public void setStatus(String msg_) {
@@ -241,6 +247,7 @@ public class Working implements Activity {
remainingFrameContent.setText(df.format(stats.getRemainingFrame()));
creditEarned.setText(df.format(stats.getCreditsEarnedDuringSession()));
user_info_points_total_value.setText(df.format(stats.getCreditsEarned()));
renderable_projects_value.setText(df.format(stats.getRenderableProject()));
waiting_projects_value.setText(df.format(stats.getWaitingProject()));
connected_machines_value.setText(df.format(stats.getConnectedMachine()));
updateTime();