diff --git a/src/sbbs3/jsexec.c b/src/sbbs3/jsexec.c index 3827976f31efee74023d6a6b17b9337658f0f843..08270f908e898622d6e9463fdd7710de8988ab62 100644 --- a/src/sbbs3/jsexec.c +++ b/src/sbbs3/jsexec.c @@ -613,8 +613,8 @@ long js_exec(const char *fname, char** args) jsval val; jsval rval=JSVAL_VOID; int32 result=0; - clock_t start; - clock_t diff; + double start; + double diff; if(fname!=NULL) { if(strcspn(fname,"/\\")==strlen(fname)) { @@ -709,26 +709,24 @@ long js_exec(const char *fname, char** args) if(fp!=NULL && fp!=stdin) fclose(fp); - start=msclock(); + start=xp_timer(); if((js_script=JS_CompileScript(js_cx, js_glob, js_buf, js_buflen, fname==NULL ? NULL : path, 1))==NULL) { lprintf(LOG_ERR,"!Error compiling script from %s",path); return(-1); } - if((diff=msclock()-start) > 0) - fprintf(statfp,"%s compiled in %u.%03u seconds\n" + if((diff=xp_timer()-start) > 0) + fprintf(statfp,"%s compiled in %.2f seconds\n" ,path - ,diff/MSCLOCKS_PER_SEC - ,diff%MSCLOCKS_PER_SEC); + ,diff); - start=msclock(); + start=xp_timer(); JS_ExecuteScript(js_cx, js_glob, js_script, &rval); js_EvalOnExit(js_cx, js_glob, &branch); - if((diff=msclock()-start) > 0) - fprintf(statfp,"%s executed in %u.%03u seconds\n" + if((diff=xp_timer()-start) > 0) + fprintf(statfp,"%s executed in %.2f seconds\n" ,path - ,diff/MSCLOCKS_PER_SEC - ,diff%MSCLOCKS_PER_SEC); + ,diff); JS_GetProperty(js_cx, js_glob, "exit_code", &rval); diff --git a/src/sbbs3/websrvr.c b/src/sbbs3/websrvr.c index eb197d4aca94790a746d16643189614dd7e621b4..0dc0e039669c7c164b0bc3e21ac5ed11cd5d5d43 100644 --- a/src/sbbs3/websrvr.c +++ b/src/sbbs3/websrvr.c @@ -3405,7 +3405,7 @@ static BOOL exec_ssjs(http_session_t* session, char* script) { jsval rval; char path[MAX_PATH+1]; BOOL retval=TRUE; - clock_t start; + double start; /* External JavaScript handler? */ if(script == session->req.physical_path && session->req.xjs_handler[0]) @@ -3443,11 +3443,11 @@ static BOOL exec_ssjs(http_session_t* session, char* script) { } lprintf(LOG_DEBUG,"%04d JavaScript: Executing script: %s",session->socket,script); - start=msclock(); + start=xp_timer(); JS_ExecuteScript(session->js_cx, session->js_glob, js_script, &rval); js_EvalOnExit(session->js_cx, session->js_glob, &session->js_branch); - lprintf(LOG_DEBUG,"%04d JavaScript: Done executing script: %s (%ld ms)" - ,session->socket,script,msclock()-start); + lprintf(LOG_DEBUG,"%04d JavaScript: Done executing script: %s (%.2f seconds)" + ,session->socket,script,xp_timer()-start); } while(0); SAFECOPY(session->req.physical_path, path);