Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 12 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
View
4 src/code/filesys.lisp
@@ -1155,11 +1155,11 @@ Experimental: interface subject to change."
(error 'simple-file-error
:format-control "bad place for a wild pathname"
:pathname pathspec))
- (let ((dir (pathname-directory pathname))
+ (let* ((dir (pathname-directory pathname))
(*default-pathname-defaults*
(make-pathname :directory dir :device (pathname-device pathname)))
(dev (pathname-device pathname)))
- (loop for i from (case dev (:unc 3) (otherwise 2)) upto (length dir)
+ (loop for i from (case dev (:unc 3) (otherwise 2))
upto (length dir)
do
(let* ((newpath (make-pathname
View
8 src/code/run-program.lisp
@@ -1118,7 +1118,7 @@ Users Manual for details about the PROCESS structure."#-win32"
(values fd nil))
(t
(error "couldn't duplicate file descriptor: ~A"
- (strerror errno))))))))
+ (strerror errno)))))))
((streamp object)
(ecase direction
(:input
@@ -1202,6 +1202,6 @@ Users Manual for details about the PROCESS structure."#-win32"
external-format)
(push read-fd *close-on-error*)
(push write-fd *close-in-parent*)
- (return (values write-fd nil)))))))
- (t
- (error "invalid option to RUN-PROGRAM: ~S" object)))))
+ (return (values write-fd nil)))))
+ (t
+ (error "invalid option to RUN-PROGRAM: ~S" object))))))))
View
4 src/code/target-alieneval.lisp
@@ -156,8 +156,8 @@ This is SETFable."
(/show0 ":EXTERN case")
(let ((info (make-heap-alien-info
:type alien-type
- :sap-form `(foreign-symbol-sap ',initial-value
- ,datap))))
+ :datap datap
+ :alien-name initial-value)))
`((symbol-macrolet
((,symbol (%heap-alien ',info)))
,@body))))
View
27 src/code/target-thread.lisp
@@ -1410,19 +1410,20 @@ See also: RETURN-FROM-THREAD, ABORT-THREAD."
;; could be sharing them)
(catch 'sb!impl::toplevel-catcher
(catch 'sb!impl::%end-of-the-world
- (with-simple-restart
- (terminate-thread
- (format nil
- "~~@<Terminate this thread (~A)~~@:>"
- *current-thread*))
- (without-interrupts
+ (catch '%abort-thread
+ (with-simple-restart
+ (terminate-thread
+ (format nil
+ "~~@<Terminate this thread (~A)~~@:>"
+ *current-thread*))
+ (without-interrupts
(unwind-protect
(with-local-interrupts
- ;; Now that most things have a chance
- ;; to work properly without messing up
- ;; other threads, it's time to enable
- ;; signals.
- (sb!unix::unblock-deferrable-signals)
+ ;; Now that most things have a chance
+ ;; to work properly without messing up
+ ;; other threads, it's time to enable
+ ;; signals.
+ (sb!unix::unblock-deferrable-signals)
#!+win32
;; FPU state, on win32 at least, is
;; per-thread and it isn't
@@ -1457,7 +1458,7 @@ See also: RETURN-FROM-THREAD, ABORT-THREAD."
;; mind.
(setq *interrupt-pending* nil)
(handle-thread-exit thread))))))))
- (values))))
+ (values)))))
;; If the starting thread is stopped for gc before it signals the
;; semaphore then we'd be stuck.
(assert (not *gc-inhibit*))
@@ -1473,7 +1474,7 @@ See also: RETURN-FROM-THREAD, ABORT-THREAD."
(when (zerop os-thread)
(error "Can't create a new thread"))
(wait-on-semaphore setup-sem)
- thread)))))
+ (return-from make-thread thread))))))
:cant-spawn
(error "Could not create a new thread.")))
View
1  src/compiler/generic/objdef.lisp
@@ -398,7 +398,6 @@
(control-stack-guard-page-protected)
(alien-stack-start :c-type "lispobj *" :length #!+alpha 2 #!-alpha 1)
(alien-stack-pointer :c-type "lispobj *" :length #!+alpha 2 #!-alpha 1)
- #!+gencgc (alloc-region :c-type "struct alloc_region" :length 5)
#!+win32 (private-events :c-type "struct private_events" :length 2)
(this :c-type "struct thread *" :length #!+alpha 2 #!-alpha 1)
(prev :c-type "struct thread *" :length #!+alpha 2 #!-alpha 1)
View
24 src/runtime/gencgc.c
@@ -2636,17 +2636,6 @@ scavenge_newspace_generation_one_scan(generation_index_t generation)
static void
scavenge_newspace_generation(generation_index_t generation)
{
-<<<<<<< HEAD
- intptr_t i;
-
- /* the new_areas array currently being written to by gc_alloc() */
- struct new_area (*current_new_areas)[] = &new_areas_1;
- intptr_t current_new_areas_index;
-
- /* the new_areas created by the previous scavenge cycle */
- struct new_area (*previous_new_areas)[] = NULL;
- intptr_t previous_new_areas_index;
-=======
size_t i;
/* the new_areas array currently being written to by gc_alloc() */
@@ -2656,7 +2645,6 @@ scavenge_newspace_generation(generation_index_t generation)
/* the new_areas created by the previous scavenge cycle */
struct new_area (*previous_new_areas)[] = NULL;
size_t previous_new_areas_index;
->>>>>>> master
/* Flush the current regions updating the tables. */
gc_alloc_update_all_page_tables();
@@ -2890,13 +2878,8 @@ print_ptr(lispobj *addr)
page_index_t pi1 = find_page_index((void*)addr);
if (pi1 != -1)
-<<<<<<< HEAD
- fprintf(stderr," %x: page %d alloc %d gen %d bytes_used %d offset %lu dont_move %d\n",
- (uword_t) addr,
-=======
fprintf(stderr," %p: page %d alloc %d gen %d bytes_used %d offset %lu dont_move %d\n",
addr,
->>>>>>> master
pi1,
page_table[pi1].allocated,
page_table[pi1].gen,
@@ -3955,13 +3938,10 @@ collect_garbage(generation_index_t last_gen)
}
gc_active_p = 0;
-<<<<<<< HEAD
#ifdef LISP_FEATURE_WIN32
os_commit_wp_violation_data(0);
#endif
-=======
large_allocation = 0;
->>>>>>> master
log_generation_stats(gc_logfile, "=== GC End ===");
SHOW("returning from collect_garbage");
@@ -4249,9 +4229,6 @@ general_alloc_internal(sword_t nbytes, int page_type_flag, struct alloc_region *
return(new_obj); /* yup */
}
-<<<<<<< HEAD
- /* we have to go the intptr_t way around, it seems. Check whether we
-=======
/* We don't want to count nbytes against auto_gc_trigger unless we
* have to: it speeds up the tenuring of objects and slows down
* allocation. However, unless we do so when allocating _very_
@@ -4262,7 +4239,6 @@ general_alloc_internal(sword_t nbytes, int page_type_flag, struct alloc_region *
trigger_bytes = nbytes;
/* we have to go the long way around, it seems. Check whether we
->>>>>>> master
* should GC in the near future
*/
if (auto_gc_trigger && (bytes_allocated+trigger_bytes > auto_gc_trigger)) {

No commit comments for this range

Something went wrong with that request. Please try again.