Megatest

Check-in [c15ca73559]
Login
Overview
Comment:Corrected formating of info messages on load excess
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | v1.55
Files: files | file ages | folders
SHA1: c15ca7355983adf50b2467a23263398c3c68cd79
User & Date: matt on 2014-07-31 00:16:17
Other Links: branch diff | manifest | tags
Context
2014-08-01
01:04
Added three loop tries for -runtests check-in: 1c0eb707c7 user: matt tags: v1.55
2014-07-31
00:16
Corrected formating of info messages on load excess check-in: c15ca73559 user: matt tags: v1.55
00:02
Added built-in loadrunner into Megatest check-in: 229f3fa92e user: matt tags: v1.55
Changes

Modified common.scm from [31132e4c26] to [b4d7faf92c].

353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
	 (first   (car loadavg))
	 (next    (cadr loadavg))
	 (adjload (* maxload numcpus))
	 (loadjmp (- first next)))
    (cond
     ((and (> first adjload)
	   (> count 0))
      (print "waiting " waitdelay " seconds due to load " first " exceeding max of " adjload)
      (thread-sleep! waitdelay)
      (common:wait-for-cpuload maxload numcpus waitdelay count: (- count 1)))
     ((and (> loadjmp numcpus)
	   (> count 0))
      (print "waiting " waitdelay " seconds due to load jump " loadjmp " > numcpus " numcpus)
      (thread-sleep! waitdelay)
      (common:wait-for-cpuload maxload numcpus waitdelay count: (- count 1))))))

(define (common:get-num-cpus)
  (with-input-from-file "/proc/cpuinfo"
    (lambda ()
      (let loop ((numcpu 0)







|




|







353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
	 (first   (car loadavg))
	 (next    (cadr loadavg))
	 (adjload (* maxload numcpus))
	 (loadjmp (- first next)))
    (cond
     ((and (> first adjload)
	   (> count 0))
      (debug:print-info 0 "waiting " waitdelay " seconds due to load " first " exceeding max of " adjload)
      (thread-sleep! waitdelay)
      (common:wait-for-cpuload maxload numcpus waitdelay count: (- count 1)))
     ((and (> loadjmp numcpus)
	   (> count 0))
      (debug:print-info 0 "waiting " waitdelay " seconds due to load jump " loadjmp " > numcpus " numcpus)
      (thread-sleep! waitdelay)
      (common:wait-for-cpuload maxload numcpus waitdelay count: (- count 1))))))

(define (common:get-num-cpus)
  (with-input-from-file "/proc/cpuinfo"
    (lambda ()
      (let loop ((numcpu 0)