suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Going back to simple X server

Browse Source
This commit is contained in:
Jay McCarthy 2010-12-08 15:29:19 -07:00
parent 83613e822f
commit 2e6cfb0e02
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
collects/meta/drdr/config.rkt
View File

@ -8,7 +8,7 @@
(plt-directory "/opt/plt")
(drdr-directory "/opt/svn/drdr")
(git-path "/usr/bin/git")
(Xvfb-path "/usr/bin/Xvnc")
(Xvfb-path "/usr/bin/Xorg")
(fluxbox-path "/usr/bin/fluxbox")
(vncviewer-path "/usr/bin/vncviewer")
(current-make-install-timeout-seconds (* 90 60))

19
collects/meta/drdr/plt-build.rkt
View File

@ -277,10 +277,8 @@
(recur-many (sub1 i) r f)))))
(define XSERVER-OFFSET 20)
(define (cpu->parent cpu-i)
(+ XSERVER-OFFSET (* cpu-i 2) 0))
(define (cpu->child cpu-i)
(+ XSERVER-OFFSET (* cpu-i 2) 1))
(+ XSERVER-OFFSET cpu-i))
(define (integrate-revision rev)
(define test-dir
@ -319,7 +317,7 @@
(when (build?)
(build-revision rev))
(define (start-x-server i parent inner)
(define (start-x-server i inner)
(notify! "Starting X server #~a" i)
(safely-delete-directory (format "/tmp/.X~a-lock" i))
(safely-delete-directory (build-path tmp-dir (format ".X~a-lock" i)))
@ -331,21 +329,12 @@
(sleep 1)
(with-running-program
(fluxbox-path) (list "-display" (format ":~a" i) "-rc" "/home/jay/.fluxbox/init")
(if parent
(lambda ()
(with-running-program
(vncviewer-path) (list "-display" (format ":~a" parent) (format ":~a" i)
"-passwd" "/home/jay/.vnc/passwd")
inner))
inner)))))
inner))))
(recur-many (number-of-cpus)
(lambda (cpu-i inner)
(define parent (cpu->parent cpu-i))
(define child (cpu->child cpu-i))
(start-x-server parent #f
(λ ()
(start-x-server child parent inner))))
(start-x-server child inner))
(lambda ()
(test-revision rev)))))
; Remove the test directory