Changeset 6390
- Timestamp:
- Jun 16, 2016, 6:22:33 PM (8 years ago)
- Location:
- nanovis/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
nanovis/trunk/Command.cpp
r5479 r6390 877 877 objPtr = Tcl_NewStringObj(buf, -1); 878 878 Tcl_ListObjAppendElement(interp, listObjPtr, objPtr); 879 /* date */ 880 Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj("date", 4)); 881 strcpy(buf, ctime(&g_stats.start.tv_sec)); 882 buf[strlen(buf) - 1] = '\0'; 883 Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj(buf, -1)); 884 /* date_secs */ 885 Tcl_ListObjAppendElement(interp, listObjPtr, 886 Tcl_NewStringObj("date_secs", 9)); 887 Tcl_ListObjAppendElement(interp, listObjPtr, 888 Tcl_NewLongObj(g_stats.start.tv_sec)); 879 889 } else { 880 890 objPtr = Tcl_NewStringObj("render_info", 11); 881 891 Tcl_ListObjAppendElement(interp, listObjPtr, objPtr); 882 } 883 Tcl_DStringInit(&ds); 884 /* date */ 885 Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj("date", 4)); 886 strcpy(buf, ctime(&g_stats.start.tv_sec)); 887 buf[strlen(buf) - 1] = '\0'; 888 Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj(buf, -1)); 889 /* date_secs */ 890 Tcl_ListObjAppendElement(interp, listObjPtr, 891 Tcl_NewStringObj("date_secs", 9)); 892 Tcl_ListObjAppendElement(interp, listObjPtr, 893 Tcl_NewLongObj(g_stats.start.tv_sec)); 892 struct timeval now; 893 gettimeofday(&now, NULL); 894 /* date */ 895 Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj("date", 4)); 896 strcpy(buf, ctime(&now.tv_sec)); 897 buf[strlen(buf) - 1] = '\0'; 898 Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj(buf, -1)); 899 /* date_secs */ 900 Tcl_ListObjAppendElement(interp, listObjPtr, 901 Tcl_NewStringObj("date_secs", 9)); 902 Tcl_ListObjAppendElement(interp, listObjPtr, 903 Tcl_NewLongObj(now.tv_sec)); 904 } 894 905 /* Client arguments. */ 895 906 if (Tcl_ListObjGetElements(interp, objv[1], &numItems, &items) != TCL_OK) { -
nanovis/trunk/nanovisServer.cpp
r5492 r6390 167 167 serverStats(int code) 168 168 { 169 double start, finish;170 169 char buf[BUFSIZ]; 171 170 Tcl_DString ds; 172 171 int result; 173 172 174 { 175 struct timeval tv; 176 177 /* Get ending time. */ 178 gettimeofday(&tv, NULL); 179 finish = CVT2SECS(tv); 180 tv = g_stats.start; 181 start = CVT2SECS(tv); 182 } 173 /* Get ending time. */ 174 struct timeval now; 175 gettimeofday(&tv, NULL); 176 double session_time = CVT2SECS(now) - CVT2SECS(g_stats.start); 177 183 178 /* 184 179 * Session information: … … 186 181 * - Process ID 187 182 * - Hostname where server is running 188 * - St artdate of session189 * - St artdate of session in seconds183 * - Stop date of session 184 * - Stop date of session in seconds 190 185 * - Number of frames returned 191 186 * - Number of bytes total returned (in frames) … … 217 212 /* date */ 218 213 Tcl_DStringAppendElement(&ds, "date"); 219 strcpy(buf, ctime(& g_stats.start.tv_sec));214 strcpy(buf, ctime(&now.tv_sec)); 220 215 buf[strlen(buf) - 1] = '\0'; 221 216 Tcl_DStringAppendElement(&ds, buf); 222 217 /* date_secs */ 223 218 Tcl_DStringAppendElement(&ds, "date_secs"); 224 sprintf(buf, "%ld", g_stats.start.tv_sec);219 sprintf(buf, "%ld", now.tv_sec); 225 220 Tcl_DStringAppendElement(&ds, buf); 226 221 /* num_frames */ … … 242 237 /* session_time */ 243 238 Tcl_DStringAppendElement(&ds, "session_time"); 244 sprintf(buf, "%g", finish - start);239 sprintf(buf, "%g", session_time); 245 240 Tcl_DStringAppendElement(&ds, buf); 246 241 /* status */ … … 273 268 } 274 269 Tcl_DStringAppend(&ds, "\n", -1); 275 int f = getStatsFile(NULL);276 result = writeToStatsFile(f , Tcl_DStringValue(&ds),270 int fd = getStatsFile(NULL); 271 result = writeToStatsFile(fd, Tcl_DStringValue(&ds), 277 272 Tcl_DStringLength(&ds)); 278 close(f );273 close(fd); 279 274 Tcl_DStringFree(&ds); 280 275 return result;
Note: See TracChangeset
for help on using the changeset viewer.