M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

planner_improve #1

Merged
M merged 10 commits from planner_improve into main 2023-12-03 16:20:11 +00:00
Conversation 0 Commits 10 Files Changed 13 +5 -7
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f4c7353741 - Show all commits

6
Planner/String.h
View File

@@ -75,16 +75,14 @@ public:
}
}
String(long s) {
String((long long)s);
}
String(long s) : String((long long)s) { }
String(long long s) {
length = 0;
body = new char[1];
body[0] = '\0';
if (s >= 0) {
long s_ = s;
long long s_ = s;
long size = 1;
while (s_ >= 10) {
s_ = s_ / 10;

6
Planner/Task.h
View File

@@ -42,7 +42,7 @@ protected:
String workspace;
TaskState state;
public:
long start_time;
long long start_time;
String printState(){
switch(state){
case Inactive:
@@ -152,8 +152,8 @@ public:
}else if (Utils::Exists(workspace+"/INTERRUPT")){
state=AbortedByUser;
} else {
long now = Utils::getAbsoluteTime();
long delta = now-start_time;
long long now = Utils::getAbsoluteTime();
long long delta = now-start_time;
if (maxtime<delta){
state=AbortedByTimeout;
}