From owner-p4-projects@FreeBSD.ORG Mon Apr 4 02:50:07 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AA3916A4CF; Mon, 4 Apr 2005 02:50:07 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 55E7316A4D6 for ; Mon, 4 Apr 2005 02:50:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC9ED43D2F for ; Mon, 4 Apr 2005 02:50:05 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j342o5iw095810 for ; Mon, 4 Apr 2005 02:50:05 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j342o5l8095807 for perforce@freebsd.org; Mon, 4 Apr 2005 02:50:05 GMT (envelope-from davidxu@freebsd.org) Date: Mon, 4 Apr 2005 02:50:05 GMT Message-Id: <200504040250.j342o5l8095807@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74439 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2005 02:50:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=74439 Change 74439 by davidxu@davidxu_celeron on 2005/04/04 02:49:40 Change cpu_set_kse_upcall() to more general prototype. Affected files ... .. //depot/projects/davidxu_thread/src/sys/alpha/alpha/vm_machdep.c#4 edit .. //depot/projects/davidxu_thread/src/sys/amd64/amd64/vm_machdep.c#4 edit .. //depot/projects/davidxu_thread/src/sys/arm/arm/vm_machdep.c#5 edit .. //depot/projects/davidxu_thread/src/sys/i386/i386/vm_machdep.c#4 edit .. //depot/projects/davidxu_thread/src/sys/ia64/ia64/vm_machdep.c#4 edit .. //depot/projects/davidxu_thread/src/sys/kern/kern_kse.c#5 edit .. //depot/projects/davidxu_thread/src/sys/powerpc/powerpc/vm_machdep.c#4 edit .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/vm_machdep.c#4 edit .. //depot/projects/davidxu_thread/src/sys/sys/proc.h#11 edit Differences ... ==== //depot/projects/davidxu_thread/src/sys/alpha/alpha/vm_machdep.c#4 (text+ko) ==== @@ -322,15 +322,16 @@ } void -cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku) +cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg, + stack_t *stack) { struct pcb *pcb; struct trapframe *tf; - uint64_t stack; + uint64_t sp; pcb = td->td_pcb; tf = td->td_frame; - stack = ((uint64_t)ku->ku_stack.ss_sp + ku->ku_stack.ss_size) & ~15; + sp = ((uint64_t)stack->ss_sp + stack->ss_size) & ~15; bzero(tf->tf_regs, FRAME_SIZE * sizeof(tf->tf_regs[0])); bzero(&pcb->pcb_fp, sizeof(pcb->pcb_fp)); @@ -338,15 +339,15 @@ pcb->pcb_fp.fpr_cr = FPCR_DYN_NORMAL | FPCR_INVD | FPCR_DZED | FPCR_OVFD | FPCR_INED | FPCR_UNFD; if (td != curthread) { - pcb->pcb_hw.apcb_usp = stack; + pcb->pcb_hw.apcb_usp = sp; pcb->pcb_hw.apcb_unique = 0; } else { - alpha_pal_wrusp(stack); + alpha_pal_wrusp(sp); alpha_pal_wrunique(0); } tf->tf_regs[FRAME_PS] = ALPHA_PSL_USERSET; - tf->tf_regs[FRAME_PC] = (u_long)ku->ku_func; - tf->tf_regs[FRAME_A0] = (u_long)ku->ku_mailbox; + tf->tf_regs[FRAME_PC] = (u_long)entry; + tf->tf_regs[FRAME_A0] = (u_long)arg; tf->tf_regs[FRAME_T12] = tf->tf_regs[FRAME_PC]; /* aka. PV */ tf->tf_regs[FRAME_FLAGS] = 0; /* full restore */ } ==== //depot/projects/davidxu_thread/src/sys/amd64/amd64/vm_machdep.c#4 (text+ko) ==== @@ -302,7 +302,8 @@ * in thread_userret() itself can be done as well. */ void -cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku) +cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg, + stack_t *stack) { /* @@ -320,16 +321,16 @@ */ td->td_frame->tf_rbp = 0; td->td_frame->tf_rsp = - ((register_t)ku->ku_stack.ss_sp + ku->ku_stack.ss_size) & ~0x0f; + ((register_t)stack->ss_sp + stack->ss_size) & ~0x0f; td->td_frame->tf_rsp -= 8; td->td_frame->tf_rbp = 0; - td->td_frame->tf_rip = (register_t)ku->ku_func; + td->td_frame->tf_rip = (register_t)entry; /* * Pass the address of the mailbox for this kse to the uts * function as a parameter on the stack. */ - td->td_frame->tf_rdi = (register_t)ku->ku_mailbox; + td->td_frame->tf_rdi = (register_t)arg; } #ifdef SMP ==== //depot/projects/davidxu_thread/src/sys/arm/arm/vm_machdep.c#5 (text+ko) ==== @@ -271,14 +271,15 @@ * in thread_userret() itself can be done as well. */ void -cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku) +cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg, + stack_t *stack) { struct trapframe *tf = td->td_frame; - tf->tf_usr_sp = ((int)ku->ku_stack.ss_sp + ku->ku_stack.ss_size + tf->tf_usr_sp = ((int)stack->ss_sp + stack->ss_size - sizeof(struct trapframe)) & ~7; - tf->tf_pc = (int)ku->ku_func; - tf->tf_r0 = (int)ku->ku_mailbox; + tf->tf_pc = (int)entry; + tf->tf_r0 = (int)arg; tf->tf_spsr = PSR_USR32_MODE; } ==== //depot/projects/davidxu_thread/src/sys/i386/i386/vm_machdep.c#4 (text+ko) ==== @@ -431,7 +431,8 @@ * in thread_userret() itself can be done as well. */ void -cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku) +cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg, + stack_t *stack) { /* @@ -449,15 +450,15 @@ */ td->td_frame->tf_ebp = 0; td->td_frame->tf_esp = - (int)ku->ku_stack.ss_sp + ku->ku_stack.ss_size - 16; - td->td_frame->tf_eip = (int)ku->ku_func; + (int)stack->ss_sp + stack->ss_size - 16; + td->td_frame->tf_eip = (int)entry; /* * Pass the address of the mailbox for this kse to the uts * function as a parameter on the stack. */ suword((void *)(td->td_frame->tf_esp + sizeof(void *)), - (int)ku->ku_mailbox); + (int)arg); } /* ==== //depot/projects/davidxu_thread/src/sys/ia64/ia64/vm_machdep.c#4 (text+ko) ==== @@ -161,11 +161,12 @@ } void -cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku) +cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg, + stack_t *stack) { struct ia64_fdesc *fd; struct trapframe *tf; - uint64_t ndirty, stack; + uint64_t ndirty, sp; tf = td->td_frame; ndirty = tf->tf_special.ndirty + (tf->tf_special.bspstore & 0x1ffUL); @@ -173,13 +174,13 @@ KASSERT((ndirty & ~PAGE_MASK) == 0, ("Whoa there! We have more than 8KB of dirty registers!")); - fd = ku->ku_func; - stack = (uint64_t)ku->ku_stack.ss_sp; + fd = (struct ia64_fdesc *)entry; + sp = (uint64_t)stack->ss_sp; bzero(&tf->tf_special, sizeof(tf->tf_special)); tf->tf_special.iip = fuword(&fd->func); tf->tf_special.gp = fuword(&fd->gp); - tf->tf_special.sp = (stack + ku->ku_stack.ss_size - 16) & ~15; + tf->tf_special.sp = (sp + stack->ss_size - 16) & ~15; tf->tf_special.rsc = 0xf; tf->tf_special.fpsr = IA64_FPSR_DEFAULT; tf->tf_special.psr = IA64_PSR_IC | IA64_PSR_I | IA64_PSR_IT | @@ -188,19 +189,19 @@ if (tf->tf_flags & FRAME_SYSCALL) { tf->tf_special.cfm = (3UL<<62) | (1UL<<7) | 1UL; - tf->tf_special.bspstore = stack + 8; - suword((caddr_t)stack, (uint64_t)ku->ku_mailbox); + tf->tf_special.bspstore = sp + 8; + suword((caddr_t)sp, (uint64_t)arg); } else { tf->tf_special.cfm = (1UL<<63) | (1UL<<7) | 1UL; - tf->tf_special.bspstore = stack; + tf->tf_special.bspstore = sp; tf->tf_special.ndirty = 8; - stack = td->td_kstack + ndirty - 8; - if ((stack & 0x1ff) == 0x1f8) { - *(uint64_t*)stack = 0; + sp = td->td_kstack + ndirty - 8; + if ((sp & 0x1ff) == 0x1f8) { + *(uint64_t*)sp = 0; tf->tf_special.ndirty += 8; - stack -= 8; + sp -= 8; } - *(uint64_t*)stack = (uint64_t)ku->ku_mailbox; + *(uint64_t*)sp = (uint64_t)arg; } } ==== //depot/projects/davidxu_thread/src/sys/kern/kern_kse.c#5 (text+ko) ==== @@ -780,7 +780,8 @@ * to the new thread, so we should clear single step * flag here. */ - cpu_set_upcall_kse(newtd, newku); + cpu_set_upcall_kse(newtd, newku->ku_func, + newku->ku_mailbox, &newku->ku_stack); if (p->p_flag & P_TRACED) ptrace_clear_single_step(newtd); } @@ -1371,7 +1372,8 @@ * Set user context to the UTS */ if (!(ku->ku_mflags & KMF_NOUPCALL)) { - cpu_set_upcall_kse(td, ku); + cpu_set_upcall_kse(td, ku->ku_func, ku->ku_mailbox, + &ku->ku_stack); if (p->p_flag & P_TRACED) ptrace_clear_single_step(td); error = suword32(&ku->ku_mailbox->km_lwp, ==== //depot/projects/davidxu_thread/src/sys/powerpc/powerpc/vm_machdep.c#4 (text+ko) ==== @@ -325,23 +325,24 @@ } void -cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku) +cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg, + stack_t *stack) { struct trapframe *tf; uint32_t sp; tf = td->td_frame; /* align stack and alloc space for frame ptr and saved LR */ - sp = ((uint32_t)ku->ku_stack.ss_sp + ku->ku_stack.ss_size + sp = ((uint32_t)stack->ss_sp + stack->ss_size - 2*sizeof(u_int32_t)) & ~0x1f; bzero(tf, sizeof(struct trapframe)); tf->fixreg[1] = (register_t)sp; - tf->fixreg[3] = (register_t)ku->ku_mailbox; - tf->srr0 = (register_t)ku->ku_func; + tf->fixreg[3] = (register_t)arg; + tf->srr0 = (register_t)entry; tf->srr1 = PSL_MBO | PSL_USERSET | PSL_FE_DFLT; td->td_pcb->pcb_flags = 0; - td->td_retval[0] = (register_t)ku->ku_func; + td->td_retval[0] = (register_t)entry; td->td_retval[1] = 0; } ==== //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/vm_machdep.c#4 (text+ko) ==== @@ -173,16 +173,17 @@ } void -cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku) +cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg, + stack_t *stack) { struct trapframe *tf; uint64_t sp; tf = td->td_frame; - sp = (uint64_t)ku->ku_stack.ss_sp + ku->ku_stack.ss_size; - tf->tf_out[0] = (uint64_t)ku->ku_mailbox; + sp = (uint64_t)stack->ss_sp + stack->ss_size; + tf->tf_out[0] = (uint64_t)arg; tf->tf_out[6] = sp - SPOFF - sizeof(struct frame); - tf->tf_tpc = (uint64_t)ku->ku_func; + tf->tf_tpc = (uint64_t)entry; tf->tf_tnpc = tf->tf_tpc + 4; td->td_retval[0] = tf->tf_out[0]; ==== //depot/projects/davidxu_thread/src/sys/sys/proc.h#11 (text+ko) ==== @@ -890,7 +890,7 @@ void kse_GC(void); void kseinit(void); void cpu_set_upcall(struct thread *td, struct thread *td0); -void cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku); +void cpu_set_upcall_kse(struct thread *, void (*)(void *), void *, stack_t *); void cpu_thread_clean(struct thread *); void cpu_thread_exit(struct thread *); void cpu_thread_setup(struct thread *td); From owner-p4-projects@FreeBSD.ORG Mon Apr 4 19:07:57 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3A1516A4D0; Mon, 4 Apr 2005 19:07:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B949D16A4CE for ; Mon, 4 Apr 2005 19:07:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4B4743D2D for ; Mon, 4 Apr 2005 19:07:56 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j34J7utJ062466 for ; Mon, 4 Apr 2005 19:07:56 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j34J7uG0062463 for perforce@freebsd.org; Mon, 4 Apr 2005 19:07:56 GMT (envelope-from jhb@freebsd.org) Date: Mon, 4 Apr 2005 19:07:56 GMT Message-Id: <200504041907.j34J7uG0062463@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 74465 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2005 19:07:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=74465 Change 74465 by jhb@jhb_slimer on 2005/04/04 19:07:39 Tidy. Affected files ... .. //depot/projects/smpng/sys/vm/vm_meter.c#24 edit Differences ... ==== //depot/projects/smpng/sys/vm/vm_meter.c#24 (text+ko) ==== @@ -255,22 +255,19 @@ static int vcnt(SYSCTL_HANDLER_ARGS) { - int error = 0; int count = *(int *)arg1; + int offset = (char *)arg1 - (char *)&cnt; #ifdef SMP int i; - int offset = (char *)arg1 - (char *)&cnt; for (i = 0; i < mp_ncpus; ++i) { struct pcpu *pcpu = pcpu_find(i); count += *(int *)((char *)&pcpu->pc_cnt + offset); } #else - int offset = (char *)arg1 - (char *)&cnt; count += *(int *)((char *)PCPU_PTR(cnt) + offset); #endif - error = SYSCTL_OUT(req, &count, sizeof(int)); - return(error); + return (SYSCTL_OUT(req, &count, sizeof(int))); } SYSCTL_PROC(_vm, VM_TOTAL, vmtotal, CTLTYPE_OPAQUE|CTLFLAG_RD, From owner-p4-projects@FreeBSD.ORG Mon Apr 4 19:08:59 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24D3916A4D0; Mon, 4 Apr 2005 19:08:59 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DDA0616A4CE for ; Mon, 4 Apr 2005 19:08:58 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 791E343D2F for ; Mon, 4 Apr 2005 19:08:58 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j34J8wI8062520 for ; Mon, 4 Apr 2005 19:08:58 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j34J8wil062517 for perforce@freebsd.org; Mon, 4 Apr 2005 19:08:58 GMT (envelope-from jhb@freebsd.org) Date: Mon, 4 Apr 2005 19:08:58 GMT Message-Id: <200504041908.j34J8wil062517@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 74466 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2005 19:08:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=74466 Change 74466 by jhb@jhb_slimer on 2005/04/04 19:08:11 Use PCPU_LAZY_INC() more to try to reduce atomic ops. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/interrupt.c#33 edit .. //depot/projects/smpng/sys/alpha/alpha/trap.c#57 edit .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#10 edit .. //depot/projects/smpng/sys/amd64/amd64/trap.c#23 edit .. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#8 edit .. //depot/projects/smpng/sys/arm/arm/trap.c#9 edit .. //depot/projects/smpng/sys/arm/arm/undefined.c#6 edit .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#13 edit .. //depot/projects/smpng/sys/i386/i386/trap.c#74 edit .. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#3 edit .. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#28 edit .. //depot/projects/smpng/sys/ia64/ia64/trap.c#72 edit .. //depot/projects/smpng/sys/kern/kern_intr.c#66 edit .. //depot/projects/smpng/sys/notes#34 edit .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#43 edit .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#60 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#33 (text+ko) ==== @@ -139,7 +139,7 @@ break; case ALPHA_INTR_DEVICE: /* I/O device interrupt */ - cnt.v_intr++; + PCPU_LAZY_INC(cnt.v_intr); if (platform.iointr) (*platform.iointr)(framep, a1); break; @@ -462,7 +462,7 @@ alpha_clock_interrupt(struct trapframe *framep) { - cnt.v_intr++; + PCPU_LAZY_INC(cnt.v_intr); #ifdef EVCNT_COUNTERS clock_intr_evcnt.ev_count++; #else ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#57 (text+ko) ==== @@ -295,7 +295,7 @@ * Giant hasn't been acquired yet. */ - cnt.v_trap++; + PCPU_LAZY_INC(cnt.v_trap); ucode = 0; user = (framep->tf_regs[FRAME_PS] & ALPHA_PSL_USERMODE) != 0; CTR5(KTR_TRAP, "%s trap: pid %d, (%lx, %lx, %lx)", @@ -655,7 +655,7 @@ panic("syscall"); #endif - cnt.v_syscall++; + PCPU_LAZY_INC(cnt.v_syscall); td->td_frame = framep; opc = framep->tf_regs[FRAME_PC] - 4; sticks = td->td_sticks; ==== //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#10 (text+ko) ==== @@ -167,7 +167,7 @@ * processed too. */ (*isrc->is_count)++; - cnt.v_intr++; + PCPU_LAZY_INC(cnt.v_intr); it = isrc->is_ithread; if (it == NULL) ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#23 (text+ko) ==== @@ -162,7 +162,7 @@ u_int sticks = 0; int i = 0, ucode = 0, type, code; - atomic_add_int(&cnt.v_trap, 1); + PCPU_LAZY_INC(cnt.v_trap); type = frame.tf_trapno; #ifdef KDB ==== //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#8 (text+ko) ==== @@ -106,7 +106,7 @@ * note: PCPU_LAZY_INC() can only be used if we can afford * occassional inaccuracy in the count. */ - cnt.v_syscall++; + PCPU_LAZY_INC(cnt.v_syscall); sticks = td->td_sticks; td->td_frame = &frame; ==== //depot/projects/smpng/sys/arm/arm/trap.c#9 (text+ko) ==== @@ -251,7 +251,7 @@ td = curthread; p = td->td_proc; - atomic_add_int(&cnt.v_trap, 1); + PCPU_LAZY_INC(cnt.v_trap); /* Data abort came from user mode? */ user = TRAP_USERMODE(tf); @@ -716,7 +716,7 @@ td = curthread; p = td->td_proc; - atomic_add_int(&cnt.v_trap, 1); + PCPU_LAZY_INC(cnt.v_trap); if (TRAP_USERMODE(tf)) { td->td_frame = tf; @@ -867,7 +867,7 @@ int locked = 0; u_int sticks = 0; - atomic_add_int(&cnt.v_syscall, 1); + PCPU_LAZY_INC(cnt.v_syscall); sticks = td->td_sticks; if (td->td_ucred != td->td_proc->p_ucred) cred_update_thread(td); ==== //depot/projects/smpng/sys/arm/arm/undefined.c#6 (text+ko) ==== @@ -185,7 +185,7 @@ enable_interrupts(I32_bit); frame->tf_pc -= INSN_SIZE; - atomic_add_int(&cnt.v_trap, 1); + PCPU_LAZY_INC(cnt.v_trap); fault_pc = frame->tf_pc; ==== //depot/projects/smpng/sys/i386/i386/intr_machdep.c#13 (text+ko) ==== @@ -167,7 +167,7 @@ * processed too. */ (*isrc->is_count)++; - cnt.v_intr++; + PCPU_LAZY_INC(cnt.v_intr); it = isrc->is_ithread; if (it == NULL) ==== //depot/projects/smpng/sys/i386/i386/trap.c#74 (text+ko) ==== @@ -180,7 +180,7 @@ static int lastalert = 0; #endif - atomic_add_int(&cnt.v_trap, 1); + PCPU_LAZY_INC(cnt.v_trap); type = frame.tf_trapno; #ifdef KDB ==== //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#3 (text+ko) ==== @@ -62,7 +62,7 @@ u_int code; int error, i, narg; - atomic_add_int(&cnt.v_syscall, 1); + PCPU_LAZY_INC(cnt.v_syscall); td = curthread; params = (caddr_t)(tf->tf_special.sp & ((1L<<32)-1)) + @@ -205,7 +205,7 @@ KASSERT(TRAPF_USERMODE(tf), ("%s: In kernel mode???", __func__)); ia64_set_fpsr(IA64_FPSR_DEFAULT); - atomic_add_int(&cnt.v_trap, 1); + PCPU_LAZY_INC(cnt.v_trap); td = curthread; td->td_frame = tf; ==== //depot/projects/smpng/sys/ia64/ia64/interrupt.c#28 (text+ko) ==== @@ -150,7 +150,7 @@ if (vector == CLOCK_VECTOR) {/* clock interrupt */ /* CTR0(KTR_INTR, "clock interrupt"); */ - cnt.v_intr++; + PCPU_LAZY_INC(cnt.v_intr); #ifdef EVCNT_COUNTERS clock_intr_evcnt.ev_count++; #else ==== //depot/projects/smpng/sys/ia64/ia64/trap.c#72 (text+ko) ==== @@ -332,7 +332,7 @@ user = TRAPF_USERMODE(tf) ? 1 : 0; - atomic_add_int(&cnt.v_trap, 1); + PCPU_LAZY_INC(cnt.v_trap); td = curthread; p = td->td_proc; @@ -896,7 +896,7 @@ code = tf->tf_scratch.gr15; args = &tf->tf_scratch.gr16; - atomic_add_int(&cnt.v_syscall, 1); + PCPU_LAZY_INC(cnt.v_syscall); td = curthread; td->td_frame = tf; ==== //depot/projects/smpng/sys/kern/kern_intr.c#66 (text+ko) ==== @@ -457,7 +457,7 @@ struct ithd *it = ih->ih_ithread; int error; - atomic_add_int(&cnt.v_intr, 1); /* one more global interrupt */ + PCPU_LAZY_INC(cnt.v_intr); CTR3(KTR_INTR, "swi_sched pid %d(%s) need=%d", it->it_td->td_proc->p_pid, it->it_td->td_proc->p_comm, it->it_need); ==== //depot/projects/smpng/sys/notes#34 (text+ko) ==== @@ -80,6 +80,13 @@ spinlock_*() changes happen. - KTR change: include __func__ along with __FILE__ and __LINE__ and display it after cpu number by default +- Cheapen global stats counters via PCPU_LAZY_INC + + cnt.v_trap + + cnt.v_syscall + + cnt.v_intr + - not implemented at all on arm, powerpc, or sparc64 + + cnt.v_soft + - fork counts? Active child branches: - jhb_intr - intr_vector stuff ==== //depot/projects/smpng/sys/powerpc/powerpc/trap.c#43 (text+ko) ==== @@ -147,7 +147,7 @@ int sig, type, user; u_int sticks, ucode; - atomic_add_int(&cnt.v_trap, 1); + PCPU_LAZY_INC(cnt.v_trap); td = PCPU_GET(curthread); p = td->td_proc; @@ -338,7 +338,7 @@ td = PCPU_GET(curthread); p = td->td_proc; - atomic_add_int(&cnt.v_syscall, 1); + PCPU_LAZY_INC(cnt.v_syscall); if (p->p_flag & P_SA) thread_user_enter(td); ==== //depot/projects/smpng/sys/sparc64/sparc64/trap.c#60 (text+ko) ==== @@ -240,7 +240,7 @@ trap_msg[tf->tf_type & ~T_KERNEL], (TRAPF_USERMODE(tf) ? "user" : "kernel"), rdpr(pil)); - atomic_add_int(&cnt.v_trap, 1); + PCPU_LAZY_INC(cnt.v_trap); if ((tf->tf_tstate & TSTATE_PRIV) == 0) { KASSERT(td != NULL, ("trap: curthread NULL")); @@ -510,7 +510,7 @@ p = td->td_proc; - atomic_add_int(&cnt.v_syscall, 1); + PCPU_LAZY_INC(cnt.v_syscall); narg = 0; error = 0; From owner-p4-projects@FreeBSD.ORG Mon Apr 4 22:34:14 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43E2816A4D1; Mon, 4 Apr 2005 22:34:14 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1763116A4CE for ; Mon, 4 Apr 2005 22:34:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D17DD43D1F for ; Mon, 4 Apr 2005 22:34:13 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j34MYDk2077869 for ; Mon, 4 Apr 2005 22:34:13 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j34MYDgE077866 for perforce@freebsd.org; Mon, 4 Apr 2005 22:34:13 GMT (envelope-from peter@freebsd.org) Date: Mon, 4 Apr 2005 22:34:13 GMT Message-Id: <200504042234.j34MYDgE077866@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 74473 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2005 22:34:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=74473 Change 74473 by peter@peter_daintree on 2005/04/04 22:33:56 Set the iobase offset Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#118 edit .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#83 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#118 (text+ko) ==== @@ -1251,6 +1251,7 @@ /* doublefault stack space, runs on ist1 */ common_tss[0].tss_ist1 = (long)&dblfault_stack[sizeof(dblfault_stack)]; + common_tss[0].tss_iobase = sizeof(amd64tss); gsel_tss = GSEL(GPROC0_SEL, SEL_KPL); ltr(gsel_tss); ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#83 (text+ko) ==== @@ -379,6 +379,7 @@ /* Init tss */ common_tss[cpu] = common_tss[0]; common_tss[cpu].tss_rsp0 = 0; /* not used until after switch */ + common_tss[cpu].tss_iobase = sizeof(amd64tss); gdt_segs[GPROC0_SEL].ssd_base = (long) &common_tss[cpu]; ssdtosyssd(&gdt_segs[GPROC0_SEL], From owner-p4-projects@FreeBSD.ORG Mon Apr 4 22:36:17 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04A4916A4D0; Mon, 4 Apr 2005 22:36:17 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D4F1516A4CE for ; Mon, 4 Apr 2005 22:36:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC82C43D54 for ; Mon, 4 Apr 2005 22:36:16 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j34MaGgG077994 for ; Mon, 4 Apr 2005 22:36:16 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j34MaGx8077991 for perforce@freebsd.org; Mon, 4 Apr 2005 22:36:16 GMT (envelope-from peter@freebsd.org) Date: Mon, 4 Apr 2005 22:36:16 GMT Message-Id: <200504042236.j34MaGx8077991@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 74474 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2005 22:36:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=74474 Change 74474 by peter@peter_daintree on 2005/04/04 22:35:38 Note that tss_ist1 hasn't been set for mp_machdep.c (double fault handler stack) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#84 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#84 (text+ko) ==== @@ -380,6 +380,7 @@ common_tss[cpu] = common_tss[0]; common_tss[cpu].tss_rsp0 = 0; /* not used until after switch */ common_tss[cpu].tss_iobase = sizeof(amd64tss); + /* XXX set tss_ist1 so we have a stack for a double fault */ gdt_segs[GPROC0_SEL].ssd_base = (long) &common_tss[cpu]; ssdtosyssd(&gdt_segs[GPROC0_SEL], From owner-p4-projects@FreeBSD.ORG Mon Apr 4 22:49:33 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80E0016A4D0; Mon, 4 Apr 2005 22:49:33 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B79716A4CE for ; Mon, 4 Apr 2005 22:49:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3BE0C43D39 for ; Mon, 4 Apr 2005 22:49:33 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j34MnX3O078433 for ; Mon, 4 Apr 2005 22:49:33 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j34MnWG7078430 for perforce@freebsd.org; Mon, 4 Apr 2005 22:49:32 GMT (envelope-from peter@freebsd.org) Date: Mon, 4 Apr 2005 22:49:32 GMT Message-Id: <200504042249.j34MnWG7078430@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 74475 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2005 22:49:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=74475 Change 74475 by peter@peter_melody on 2005/04/04 22:48:55 spell 'struct' right. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#119 edit .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#85 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#119 (text+ko) ==== @@ -1251,7 +1251,7 @@ /* doublefault stack space, runs on ist1 */ common_tss[0].tss_ist1 = (long)&dblfault_stack[sizeof(dblfault_stack)]; - common_tss[0].tss_iobase = sizeof(amd64tss); + common_tss[0].tss_iobase = sizeof(struct amd64tss); gsel_tss = GSEL(GPROC0_SEL, SEL_KPL); ltr(gsel_tss); ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#85 (text+ko) ==== @@ -379,7 +379,7 @@ /* Init tss */ common_tss[cpu] = common_tss[0]; common_tss[cpu].tss_rsp0 = 0; /* not used until after switch */ - common_tss[cpu].tss_iobase = sizeof(amd64tss); + common_tss[cpu].tss_iobase = sizeof(struct amd64tss); /* XXX set tss_ist1 so we have a stack for a double fault */ gdt_segs[GPROC0_SEL].ssd_base = (long) &common_tss[cpu]; From owner-p4-projects@FreeBSD.ORG Mon Apr 4 22:49:34 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F5A516A4DE; Mon, 4 Apr 2005 22:49:34 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B92A616A4EF for ; Mon, 4 Apr 2005 22:49:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B6A543D39 for ; Mon, 4 Apr 2005 22:49:33 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j34MnXSg078440 for ; Mon, 4 Apr 2005 22:49:33 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j34MnXrE078436 for perforce@freebsd.org; Mon, 4 Apr 2005 22:49:33 GMT (envelope-from peter@freebsd.org) Date: Mon, 4 Apr 2005 22:49:33 GMT Message-Id: <200504042249.j34MnXrE078436@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 74476 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2005 22:49:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=74476 Change 74476 by peter@peter_melody on 2005/04/04 22:49:08 Make this interim code compile properly. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/db_disasm.c#8 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/db_disasm.c#8 (text+ko) ==== @@ -1291,8 +1291,7 @@ } else { db_printf("%s", i_name); - if ((strncmp(i_name, "push", 4) == 0) || - (strncmp(i_name, "pop", 3) == 0)) { + if (inst >= 0x50 && inst <= 0x5f) { i_size = NONE; db_printf("q"); } From owner-p4-projects@FreeBSD.ORG Mon Apr 4 22:59:47 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A302116A4D0; Mon, 4 Apr 2005 22:59:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7816E16A4CE for ; Mon, 4 Apr 2005 22:59:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6181943D1F for ; Mon, 4 Apr 2005 22:59:46 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j34MxkpU078835 for ; Mon, 4 Apr 2005 22:59:46 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j34MxkR1078832 for perforce@freebsd.org; Mon, 4 Apr 2005 22:59:46 GMT (envelope-from peter@freebsd.org) Date: Mon, 4 Apr 2005 22:59:46 GMT Message-Id: <200504042259.j34MxkR1078832@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 74477 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2005 22:59:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=74477 Change 74477 by peter@peter_melody on 2005/04/04 22:58:45 And today's exciting development.. I can't count! Affected files ... .. //depot/projects/hammer/sys/amd64/include/tss.h#10 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/tss.h#10 (text+ko) ==== @@ -50,7 +50,6 @@ u_int64_t tss_rsp2 __packed; /* kernel stack pointer ring 2 */ u_int32_t tss_rsvd1; u_int32_t tss_rsvd2; - u_int32_t tss_rsvd3; u_int64_t tss_ist1 __packed; /* Interrupt stack table 1 */ u_int64_t tss_ist2 __packed; /* Interrupt stack table 2 */ u_int64_t tss_ist3 __packed; /* Interrupt stack table 3 */ @@ -58,9 +57,9 @@ u_int64_t tss_ist5 __packed; /* Interrupt stack table 5 */ u_int64_t tss_ist6 __packed; /* Interrupt stack table 6 */ u_int64_t tss_ist7 __packed; /* Interrupt stack table 7 */ + u_int32_t tss_rsvd3; u_int32_t tss_rsvd4; - u_int32_t tss_rsvd5; - u_int16_t tss_rsvd6; + u_int16_t tss_rsvd5; u_int16_t tss_iobase; /* io bitmap offset */ }; From owner-p4-projects@FreeBSD.ORG Tue Apr 5 00:40:53 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55CAA16A4D0; Tue, 5 Apr 2005 00:40:53 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1717016A4CE for ; Tue, 5 Apr 2005 00:40:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2634B43D4C for ; Tue, 5 Apr 2005 00:40:52 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j350eqQl083448 for ; Tue, 5 Apr 2005 00:40:52 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j350eodC083445 for perforce@freebsd.org; Tue, 5 Apr 2005 00:40:50 GMT (envelope-from peter@freebsd.org) Date: Tue, 5 Apr 2005 00:40:50 GMT Message-Id: <200504050040.j350eodC083445@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 74481 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Apr 2005 00:40:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=74481 Change 74481 by peter@peter_daintree on 2005/04/05 00:40:31 IFC @74479 Affected files ... .. //depot/projects/hammer/etc/defaults/rc.conf#51 integrate .. //depot/projects/hammer/etc/periodic/weekly/330.catman#2 integrate .. //depot/projects/hammer/etc/rc.d/pf#7 integrate .. //depot/projects/hammer/etc/rc.d/ugidfw#3 integrate .. //depot/projects/hammer/include/Makefile#40 integrate .. //depot/projects/hammer/include/pthread.h#7 integrate .. //depot/projects/hammer/include/time.h#4 integrate .. //depot/projects/hammer/lib/Makefile#48 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#19 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#20 integrate .. //depot/projects/hammer/lib/libc/gen/errlst.c#4 integrate .. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#18 integrate .. //depot/projects/hammer/lib/libc/net/name6.c#14 integrate .. //depot/projects/hammer/lib/libc/string/strcspn.c#2 integrate .. //depot/projects/hammer/lib/libc/string/strspn.c#2 integrate .. //depot/projects/hammer/lib/libdisk/change.c#6 integrate .. //depot/projects/hammer/lib/libthr/Makefile#8 integrate .. //depot/projects/hammer/lib/libthr/arch/alpha/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libthr/arch/alpha/alpha/_curthread.c#3 delete .. //depot/projects/hammer/lib/libthr/arch/alpha/alpha/pthread_md.c#1 branch .. //depot/projects/hammer/lib/libthr/arch/alpha/include/pthread_md.h#1 branch .. //depot/projects/hammer/lib/libthr/arch/amd64/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libthr/arch/amd64/amd64/_setcurthread.c#2 delete .. //depot/projects/hammer/lib/libthr/arch/amd64/amd64/pthread_md.c#1 branch .. //depot/projects/hammer/lib/libthr/arch/amd64/include/pthread_md.h#1 branch .. //depot/projects/hammer/lib/libthr/arch/arm/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libthr/arch/arm/arm/pthread_md.c#1 branch .. //depot/projects/hammer/lib/libthr/arch/arm/include/pthread_md.h#1 branch .. //depot/projects/hammer/lib/libthr/arch/i386/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libthr/arch/i386/i386/_curthread.S#4 delete .. //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#17 delete .. //depot/projects/hammer/lib/libthr/arch/i386/i386/pthread_md.c#1 branch .. //depot/projects/hammer/lib/libthr/arch/i386/include/pthread_md.h#1 branch .. //depot/projects/hammer/lib/libthr/arch/ia64/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libthr/arch/ia64/ia64/_curthread.c#4 delete .. //depot/projects/hammer/lib/libthr/arch/ia64/ia64/pthread_md.c#1 branch .. //depot/projects/hammer/lib/libthr/arch/ia64/include/pthread_md.h#1 branch .. //depot/projects/hammer/lib/libthr/arch/powerpc/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libthr/arch/powerpc/include/pthread_md.h#1 branch .. //depot/projects/hammer/lib/libthr/arch/powerpc/powerpc/_curthread.c#2 delete .. //depot/projects/hammer/lib/libthr/arch/powerpc/powerpc/pthread_md.c#1 branch .. //depot/projects/hammer/lib/libthr/arch/sparc64/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libthr/arch/sparc64/include/pthread_md.h#1 branch .. //depot/projects/hammer/lib/libthr/arch/sparc64/sparc64/_setcurthread.c#3 delete .. //depot/projects/hammer/lib/libthr/arch/sparc64/sparc64/pthread_md.c#1 branch .. //depot/projects/hammer/lib/libthr/pthread.map#1 branch .. //depot/projects/hammer/lib/libthr/sys/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libthr/sys/thr_error.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/Makefile.inc#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_atfork.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_attr.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_barrier.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_barrierattr.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_cancel.c#9 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_clean.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_concurrency.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_cond.c#12 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_condattr.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_condattr_destroy.c#2 delete .. //depot/projects/hammer/lib/libthr/thread/thr_condattr_init.c#2 delete .. //depot/projects/hammer/lib/libthr/thread/thr_create.c#14 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_detach.c#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#14 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_find_thread.c#4 delete .. //depot/projects/hammer/lib/libthr/thread/thr_fork.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_getschedparam.c#3 branch .. //depot/projects/hammer/lib/libthr/thread/thr_info.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#15 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_join.c#10 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_kern.c#12 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_kill.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_list.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_main_np.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mattr_init.c#2 delete .. //depot/projects/hammer/lib/libthr/thread/thr_mattr_kind_np.c#3 delete .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#22 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex_prioceiling.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex_protocol.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutexattr.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_mutexattr_destroy.c#2 delete .. //depot/projects/hammer/lib/libthr/thread/thr_once.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_printf.c#5 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#23 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_pspinlock.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_resume_np.c#6 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_rwlock.c#6 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_self.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_sem.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_seterrno.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_setschedparam.c#7 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_sig.c#9 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_sigmask.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_single_np.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_spec.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_spinlock.c#9 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_stack.c#5 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_subr.c#2 delete .. //depot/projects/hammer/lib/libthr/thread/thr_suspend_np.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_switch_np.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_symbols.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_syscalls.c#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_umtx.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_umtx.h#1 branch .. //depot/projects/hammer/lib/libthread_db/libthr_db.c#3 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#29 integrate .. //depot/projects/hammer/release/Makefile#70 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#74 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/install.sgml#13 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#7 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#9 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#89 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#25 integrate .. //depot/projects/hammer/release/doc/zh_CN.GB2312/errata/article.sgml#2 integrate .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#3 integrate .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/install.sgml#3 integrate .. //depot/projects/hammer/release/scripts/package-split.py#2 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#13 integrate .. //depot/projects/hammer/sbin/ffsinfo/ffsinfo.8#6 integrate .. //depot/projects/hammer/sbin/ffsinfo/ffsinfo.c#7 integrate .. //depot/projects/hammer/sbin/growfs/Makefile#7 integrate .. //depot/projects/hammer/sbin/restore/dirs.c#7 integrate .. //depot/projects/hammer/sbin/restore/restore.h#6 integrate .. //depot/projects/hammer/sbin/sunlabel/sunlabel.8#5 integrate .. //depot/projects/hammer/sbin/sunlabel/sunlabel.c#11 integrate .. //depot/projects/hammer/share/man/man4/Makefile#67 integrate .. //depot/projects/hammer/share/man/man4/arcmsr.4#1 branch .. //depot/projects/hammer/share/man/man4/cpufreq.4#4 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#52 integrate .. //depot/projects/hammer/share/man/man9/devclass_get_drivers.9#1 branch .. //depot/projects/hammer/share/man/man9/devclass_get_maxunit.9#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/critical.c#4 delete .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#34 integrate .. //depot/projects/hammer/sys/alpha/alpha/mp_machdep.c#15 integrate .. //depot/projects/hammer/sys/alpha/alpha/vm_machdep.c#21 integrate .. //depot/projects/hammer/sys/alpha/include/critical.h#6 delete .. //depot/projects/hammer/sys/alpha/include/proc.h#4 integrate .. //depot/projects/hammer/sys/alpha/osf1/imgact_osf1.c#10 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_misc.c#16 integrate .. //depot/projects/hammer/sys/amd64/amd64/critical.c#15 delete .. //depot/projects/hammer/sys/amd64/amd64/db_disasm.c#9 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#120 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#86 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#67 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#68 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#59 integrate .. //depot/projects/hammer/sys/amd64/include/critical.h#22 delete .. //depot/projects/hammer/sys/amd64/include/floatingpoint.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/proc.h#15 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/hammer/sys/arm/arm/critical.c#3 delete .. //depot/projects/hammer/sys/arm/arm/machdep.c#12 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#10 integrate .. //depot/projects/hammer/sys/arm/include/critical.h#3 delete .. //depot/projects/hammer/sys/arm/include/proc.h#4 integrate .. //depot/projects/hammer/sys/boot/pc98/boot2/Makefile#8 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#19 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_sa.c#14 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_target.c#14 integrate .. //depot/projects/hammer/sys/coda/coda_fbsd.c#17 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#23 integrate .. //depot/projects/hammer/sys/compat/linux/linux_getcwd.c#9 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#27 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#28 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#27 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#27 integrate .. //depot/projects/hammer/sys/compat/svr4/imgact_svr4.c#8 integrate .. //depot/projects/hammer/sys/conf/Makefile.alpha#9 integrate .. //depot/projects/hammer/sys/conf/Makefile.amd64#17 integrate .. //depot/projects/hammer/sys/conf/Makefile.arm#7 integrate .. //depot/projects/hammer/sys/conf/Makefile.i386#7 integrate .. //depot/projects/hammer/sys/conf/Makefile.ia64#9 integrate .. //depot/projects/hammer/sys/conf/Makefile.pc98#7 integrate .. //depot/projects/hammer/sys/conf/Makefile.powerpc#12 integrate .. //depot/projects/hammer/sys/conf/Makefile.sparc64#8 integrate .. //depot/projects/hammer/sys/conf/NOTES#85 integrate .. //depot/projects/hammer/sys/conf/files#109 integrate .. //depot/projects/hammer/sys/conf/files.alpha#20 integrate .. //depot/projects/hammer/sys/conf/files.amd64#66 integrate .. //depot/projects/hammer/sys/conf/files.arm#3 integrate .. //depot/projects/hammer/sys/conf/files.i386#55 integrate .. //depot/projects/hammer/sys/conf/files.ia64#25 integrate .. //depot/projects/hammer/sys/conf/files.pc98#42 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#12 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#28 integrate .. //depot/projects/hammer/sys/conf/kern.mk#20 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#30 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#37 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#45 integrate .. //depot/projects/hammer/sys/conf/majors#28 delete .. //depot/projects/hammer/sys/conf/majors.awk#2 delete .. //depot/projects/hammer/sys/conf/options#71 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_asus.c#4 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#58 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#30 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_if.m#6 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#42 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.c#19 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#20 integrate .. //depot/projects/hammer/sys/dev/arcmsr/arcmsr.c#1 branch .. //depot/projects/hammer/sys/dev/arcmsr/arcmsr.h#1 branch .. //depot/projects/hammer/sys/dev/asr/asr.c#16 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#44 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#25 integrate .. //depot/projects/hammer/sys/dev/ata/ata-card.c#20 integrate .. //depot/projects/hammer/sys/dev/ata/ata-cbus.c#10 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#52 integrate .. //depot/projects/hammer/sys/dev/ata/ata-commands.h#3 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#29 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.h#7 integrate .. //depot/projects/hammer/sys/dev/ata/ata-dma.c#18 integrate .. //depot/projects/hammer/sys/dev/ata/ata-isa.c#11 integrate .. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#26 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#28 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#27 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#23 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#20 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.h#10 integrate .. //depot/projects/hammer/sys/dev/ata/ata_if.m#1 branch .. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#25 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cd.h#8 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-fd.c#12 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-fd.h#6 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-tape.c#15 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-tape.h#6 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/amrr/amrr.c#5 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#6 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#29 integrate .. //depot/projects/hammer/sys/dev/ath/if_athioctl.h#8 integrate .. //depot/projects/hammer/sys/dev/ath/if_athrate.h#3 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#14 integrate .. //depot/projects/hammer/sys/dev/drm/drm_bufs.h#11 integrate .. //depot/projects/hammer/sys/dev/firewire/fwdev.c#17 integrate .. //depot/projects/hammer/sys/dev/hptmv/hptproc.c#3 integrate .. //depot/projects/hammer/sys/dev/ieee488/upd7210.c#4 integrate .. //depot/projects/hammer/sys/dev/mlx/mlx.c#10 integrate .. //depot/projects/hammer/sys/dev/mse/msevar.h#4 integrate .. //depot/projects/hammer/sys/dev/nmdm/nmdm.c#20 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#37 integrate .. //depot/projects/hammer/sys/dev/pci/pcireg.h#7 integrate .. //depot/projects/hammer/sys/dev/random/randomdev_soft.c#11 integrate .. //depot/projects/hammer/sys/dev/sio/sio_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/snp/snp.c#18 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#17 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/mixer.c#14 integrate .. //depot/projects/hammer/sys/dev/syscons/apm/apm_saver.c#4 integrate .. //depot/projects/hammer/sys/dev/usb/ukbd.c#13 integrate .. //depot/projects/hammer/sys/dev/vkbd/vkbd.c#5 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_devs.c#11 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vfsops.c#15 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#31 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_lookup.c#7 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vnops.c#13 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#24 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#25 integrate .. //depot/projects/hammer/sys/geom/concat/g_concat.c#14 integrate .. //depot/projects/hammer/sys/geom/geom_pc98.c#24 integrate .. //depot/projects/hammer/sys/geom/geom_sunlabel_enc.c#5 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_lookup.c#11 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#36 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#65 integrate .. //depot/projects/hammer/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/hammer/sys/i386/cpufreq/powernow.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/critical.c#7 delete .. //depot/projects/hammer/sys/i386/i386/machdep.c#48 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#40 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#41 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#13 integrate .. //depot/projects/hammer/sys/i386/ibcs2/imgact_coff.c#10 integrate .. //depot/projects/hammer/sys/i386/include/apm_bios.h#3 integrate .. //depot/projects/hammer/sys/i386/include/bus.h#2 integrate .. //depot/projects/hammer/sys/i386/include/bus_at386.h#8 delete .. //depot/projects/hammer/sys/i386/include/bus_pc98.h#6 delete .. //depot/projects/hammer/sys/i386/include/critical.h#9 delete .. //depot/projects/hammer/sys/i386/include/floatingpoint.h#3 integrate .. //depot/projects/hammer/sys/i386/include/legacyvar.h#5 integrate .. //depot/projects/hammer/sys/i386/include/md_var.h#13 integrate .. //depot/projects/hammer/sys/i386/include/pci_cfgreg.h#8 integrate .. //depot/projects/hammer/sys/i386/include/proc.h#8 integrate .. //depot/projects/hammer/sys/i386/linux/imgact_linux.c#11 integrate .. //depot/projects/hammer/sys/ia64/ia64/critical.c#3 delete .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#49 integrate .. //depot/projects/hammer/sys/ia64/ia64/mp_machdep.c#10 integrate .. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#27 integrate .. //depot/projects/hammer/sys/ia64/include/critical.h#6 delete .. //depot/projects/hammer/sys/ia64/include/proc.h#5 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#26 integrate .. //depot/projects/hammer/sys/kern/imgact_gzip.c#8 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_cpu.c#5 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#49 integrate .. //depot/projects/hammer/sys/kern/kern_idle.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_linker.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#18 integrate .. //depot/projects/hammer/sys/kern/kern_lockf.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_ntptime.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#45 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#40 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#48 integrate .. //depot/projects/hammer/sys/kern/kern_time.c#17 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#38 integrate .. //depot/projects/hammer/sys/kern/sys_generic.c#22 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#27 integrate .. //depot/projects/hammer/sys/kern/tty_tty.c#10 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#47 integrate .. //depot/projects/hammer/sys/kern/vfs_cache.c#12 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#38 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#14 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#53 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#79 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#33 integrate .. //depot/projects/hammer/sys/libkern/strspn.c#2 integrate .. //depot/projects/hammer/sys/modules/Makefile#72 integrate .. //depot/projects/hammer/sys/modules/arcmsr/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/Makefile.inc#1 branch .. //depot/projects/hammer/sys/modules/ata/ata/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atacam/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atacard/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atacbus/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atadisk/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/ataisa/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapicd/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapifd/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapist/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/ataraid/Makefile#1 branch .. //depot/projects/hammer/sys/modules/cpufreq/Makefile#4 integrate .. //depot/projects/hammer/sys/net/bpf.c#30 integrate .. //depot/projects/hammer/sys/net/if_tap.c#21 integrate .. //depot/projects/hammer/sys/net/if_tun.c#24 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.h#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.c#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#17 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#13 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.h#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#18 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#19 integrate .. //depot/projects/hammer/sys/netsmb/smb_dev.c#11 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#20 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_node.c#19 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#40 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#31 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#38 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#42 integrate .. //depot/projects/hammer/sys/pc98/include/_inttypes.h#1 branch .. //depot/projects/hammer/sys/pc98/include/_limits.h#1 branch .. //depot/projects/hammer/sys/pc98/include/_stdint.h#1 branch .. //depot/projects/hammer/sys/pc98/include/_types.h#1 branch .. //depot/projects/hammer/sys/pc98/include/apm_bios.h#1 branch .. //depot/projects/hammer/sys/pc98/include/apm_segments.h#1 branch .. //depot/projects/hammer/sys/pc98/include/asm.h#1 branch .. //depot/projects/hammer/sys/pc98/include/asmacros.h#1 branch .. //depot/projects/hammer/sys/pc98/include/atomic.h#1 branch .. //depot/projects/hammer/sys/pc98/include/bootinfo.h#1 branch .. //depot/projects/hammer/sys/pc98/include/bus.h#1 branch .. //depot/projects/hammer/sys/pc98/include/bus_dma.h#1 branch .. //depot/projects/hammer/sys/pc98/include/bus_memio.h#1 branch .. //depot/projects/hammer/sys/pc98/include/bus_pio.h#1 branch .. //depot/projects/hammer/sys/pc98/include/clock.h#1 branch .. //depot/projects/hammer/sys/pc98/include/cpu.h#1 branch .. //depot/projects/hammer/sys/pc98/include/cpufunc.h#1 branch .. //depot/projects/hammer/sys/pc98/include/cputypes.h#1 branch .. //depot/projects/hammer/sys/pc98/include/cserial.h#1 branch .. //depot/projects/hammer/sys/pc98/include/db_machdep.h#1 branch .. //depot/projects/hammer/sys/pc98/include/elf.h#1 branch .. //depot/projects/hammer/sys/pc98/include/endian.h#1 branch .. //depot/projects/hammer/sys/pc98/include/exec.h#1 branch .. //depot/projects/hammer/sys/pc98/include/float.h#1 branch .. //depot/projects/hammer/sys/pc98/include/floatingpoint.h#1 branch .. //depot/projects/hammer/sys/pc98/include/frame.h#1 branch .. //depot/projects/hammer/sys/pc98/include/gdb_machdep.h#1 branch .. //depot/projects/hammer/sys/pc98/include/i4b_cause.h#1 branch .. //depot/projects/hammer/sys/pc98/include/i4b_debug.h#1 branch .. //depot/projects/hammer/sys/pc98/include/i4b_ioctl.h#1 branch .. //depot/projects/hammer/sys/pc98/include/i4b_rbch_ioctl.h#1 branch .. //depot/projects/hammer/sys/pc98/include/i4b_tel_ioctl.h#1 branch .. //depot/projects/hammer/sys/pc98/include/i4b_trace.h#1 branch .. //depot/projects/hammer/sys/pc98/include/ieeefp.h#1 branch .. //depot/projects/hammer/sys/pc98/include/in_cksum.h#1 branch .. //depot/projects/hammer/sys/pc98/include/intr_machdep.h#1 branch .. //depot/projects/hammer/sys/pc98/include/iodev.h#1 branch .. //depot/projects/hammer/sys/pc98/include/kdb.h#1 branch .. //depot/projects/hammer/sys/pc98/include/legacyvar.h#1 branch .. //depot/projects/hammer/sys/pc98/include/limits.h#1 branch .. //depot/projects/hammer/sys/pc98/include/md_var.h#1 branch .. //depot/projects/hammer/sys/pc98/include/memdev.h#1 branch .. //depot/projects/hammer/sys/pc98/include/metadata.h#1 branch .. //depot/projects/hammer/sys/pc98/include/mp_watchdog.h#1 branch .. //depot/projects/hammer/sys/pc98/include/mptable.h#1 branch .. //depot/projects/hammer/sys/pc98/include/mutex.h#1 branch .. //depot/projects/hammer/sys/pc98/include/npx.h#1 branch .. //depot/projects/hammer/sys/pc98/include/param.h#1 branch .. //depot/projects/hammer/sys/pc98/include/pc/bios.h#1 branch .. //depot/projects/hammer/sys/pc98/include/pc/display.h#1 branch .. //depot/projects/hammer/sys/pc98/include/pc/vesa.h#1 branch .. //depot/projects/hammer/sys/pc98/include/pcaudio.h#1 branch .. //depot/projects/hammer/sys/pc98/include/pcb.h#1 branch .. //depot/projects/hammer/sys/pc98/include/pcb_ext.h#1 branch .. //depot/projects/hammer/sys/pc98/include/pci_cfgreg.h#1 branch .. //depot/projects/hammer/sys/pc98/include/pcpu.h#1 branch .. //depot/projects/hammer/sys/pc98/include/pecoff_machdep.h#1 branch .. //depot/projects/hammer/sys/pc98/include/perfmon.h#1 branch .. //depot/projects/hammer/sys/pc98/include/pmap.h#1 branch .. //depot/projects/hammer/sys/pc98/include/privatespace.h#1 branch .. //depot/projects/hammer/sys/pc98/include/proc.h#1 branch .. //depot/projects/hammer/sys/pc98/include/profile.h#1 branch .. //depot/projects/hammer/sys/pc98/include/psl.h#1 branch .. //depot/projects/hammer/sys/pc98/include/ptrace.h#1 branch .. //depot/projects/hammer/sys/pc98/include/pvct_ioctl.h#1 branch .. //depot/projects/hammer/sys/pc98/include/reg.h#1 branch .. //depot/projects/hammer/sys/pc98/include/reloc.h#1 branch .. //depot/projects/hammer/sys/pc98/include/resource.h#1 branch .. //depot/projects/hammer/sys/pc98/include/runq.h#1 branch .. //depot/projects/hammer/sys/pc98/include/segments.h#1 branch .. //depot/projects/hammer/sys/pc98/include/setjmp.h#1 branch .. //depot/projects/hammer/sys/pc98/include/sf_buf.h#1 branch .. //depot/projects/hammer/sys/pc98/include/sigframe.h#1 branch .. //depot/projects/hammer/sys/pc98/include/signal.h#1 branch .. //depot/projects/hammer/sys/pc98/include/smapi.h#1 branch .. //depot/projects/hammer/sys/pc98/include/smp.h#1 branch .. //depot/projects/hammer/sys/pc98/include/speaker.h#1 branch .. //depot/projects/hammer/sys/pc98/include/specialreg.h#1 branch .. //depot/projects/hammer/sys/pc98/include/stdarg.h#1 branch .. //depot/projects/hammer/sys/pc98/include/sysarch.h#1 branch .. //depot/projects/hammer/sys/pc98/include/trap.h#1 branch .. //depot/projects/hammer/sys/pc98/include/tss.h#1 branch .. //depot/projects/hammer/sys/pc98/include/ucontext.h#1 branch .. //depot/projects/hammer/sys/pc98/include/varargs.h#1 branch .. //depot/projects/hammer/sys/pc98/include/vm86.h#1 branch .. //depot/projects/hammer/sys/pc98/include/vmparam.h#1 branch .. //depot/projects/hammer/sys/pc98/linux/linux.h#1 branch .. //depot/projects/hammer/sys/pc98/linux/linux_ipc64.h#1 branch .. //depot/projects/hammer/sys/pc98/linux/linux_proto.h#1 branch .. //depot/projects/hammer/sys/pci/agp_amd64.c#6 integrate .. //depot/projects/hammer/sys/pci/agp_nvidia.c#5 integrate .. //depot/projects/hammer/sys/pci/if_ti.c#28 integrate .. //depot/projects/hammer/sys/posix4/p1003_1b.c#6 integrate .. //depot/projects/hammer/sys/powerpc/include/critical.h#6 delete .. //depot/projects/hammer/sys/powerpc/include/proc.h#2 integrate .. //depot/projects/hammer/sys/powerpc/powermac/ata_kauai.c#7 integrate .. //depot/projects/hammer/sys/powerpc/powermac/ata_macio.c#11 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/critical.c#4 delete .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#35 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#23 integrate .. //depot/projects/hammer/sys/powerpc/psim/ata_iobus.c#9 integrate .. //depot/projects/hammer/sys/sparc64/include/critical.h#6 delete .. //depot/projects/hammer/sys/sparc64/include/proc.h#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/critical.c#3 delete .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#39 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#14 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/vm_machdep.c#21 integrate .. //depot/projects/hammer/sys/sys/ata.h#9 integrate .. //depot/projects/hammer/sys/sys/bus.h#18 integrate .. //depot/projects/hammer/sys/sys/conf.h#32 integrate .. //depot/projects/hammer/sys/sys/errno.h#6 integrate .. //depot/projects/hammer/sys/sys/lock.h#7 integrate .. //depot/projects/hammer/sys/sys/lockmgr.h#9 integrate .. //depot/projects/hammer/sys/sys/mman.h#8 integrate .. //depot/projects/hammer/sys/sys/mutex.h#17 integrate .. //depot/projects/hammer/sys/sys/namei.h#9 integrate .. //depot/projects/hammer/sys/sys/proc.h#77 integrate .. //depot/projects/hammer/sys/sys/shm.h#6 integrate .. //depot/projects/hammer/sys/sys/sun_disklabel.h#9 integrate .. //depot/projects/hammer/sys/sys/syscallsubr.h#18 integrate .. //depot/projects/hammer/sys/sys/systm.h#33 integrate .. //depot/projects/hammer/sys/sys/time.h#9 integrate .. //depot/projects/hammer/sys/sys/vnode.h#51 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_extern.h#11 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#15 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#36 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#27 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#48 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#34 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_extattr.c#18 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_lookup.c#12 integrate .. //depot/projects/hammer/sys/vm/vm.h#6 integrate .. //depot/projects/hammer/sys/vm/vm_extern.h#15 integrate .. //depot/projects/hammer/sys/vm/vm_meter.c#16 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#31 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#53 integrate .. //depot/projects/hammer/sys/vm/vm_object.h#22 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#33 integrate .. //depot/projects/hammer/tools/regression/lib/msun/test-rem.t#1 branch .. //depot/projects/hammer/tools/tools/ath/80211watch.c#2 integrate .. //depot/projects/hammer/tools/tools/ath/athstats.c#6 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.birthday#10 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#33 integrate .. //depot/projects/hammer/usr.bin/find/find.1#15 integrate .. //depot/projects/hammer/usr.bin/find/misc.c#3 integrate .. //depot/projects/hammer/usr.bin/make/arch.c#17 integrate .. //depot/projects/hammer/usr.bin/make/arch.h#3 integrate .. //depot/projects/hammer/usr.bin/make/buf.c#10 integrate .. //depot/projects/hammer/usr.bin/make/cond.c#17 integrate .. //depot/projects/hammer/usr.bin/make/cond.h#2 integrate .. //depot/projects/hammer/usr.bin/make/globals.h#3 integrate .. //depot/projects/hammer/usr.bin/make/job.c#24 integrate .. //depot/projects/hammer/usr.bin/make/job.h#13 integrate .. //depot/projects/hammer/usr.bin/make/lst.c#4 integrate .. //depot/projects/hammer/usr.bin/make/main.c#31 integrate .. //depot/projects/hammer/usr.bin/make/make.1#20 integrate .. //depot/projects/hammer/usr.bin/make/make.c#13 integrate .. //depot/projects/hammer/usr.bin/make/parse.c#27 integrate .. //depot/projects/hammer/usr.bin/make/parse.h#2 integrate .. //depot/projects/hammer/usr.bin/make/str.c#13 integrate .. //depot/projects/hammer/usr.bin/make/targ.c#14 integrate .. //depot/projects/hammer/usr.bin/make/util.h#4 integrate .. //depot/projects/hammer/usr.bin/make/var.c#26 integrate .. //depot/projects/hammer/usr.bin/make/var_modify.c#9 integrate .. //depot/projects/hammer/usr.bin/mt/mt.1#8 integrate .. //depot/projects/hammer/usr.bin/top/machine.c#11 integrate .. //depot/projects/hammer/usr.sbin/Makefile#62 integrate .. //depot/projects/hammer/usr.sbin/config/config.h#7 integrate .. //depot/projects/hammer/usr.sbin/config/config.y#9 integrate .. //depot/projects/hammer/usr.sbin/config/configvers.h#6 integrate .. //depot/projects/hammer/usr.sbin/config/main.c#7 integrate .. //depot/projects/hammer/usr.sbin/memcontrol/memcontrol.c#4 integrate .. //depot/projects/hammer/usr.sbin/mtree/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/mtree/compare.c#9 integrate .. //depot/projects/hammer/usr.sbin/mtree/create.c#9 integrate .. //depot/projects/hammer/usr.sbin/mtree/misc.c#5 integrate .. //depot/projects/hammer/usr.sbin/mtree/mtree.8#12 integrate .. //depot/projects/hammer/usr.sbin/mtree/mtree.h#3 integrate .. //depot/projects/hammer/usr.sbin/mtree/spec.c#6 integrate .. //depot/projects/hammer/usr.sbin/mtree/specspec.c#5 integrate .. //depot/projects/hammer/usr.sbin/mtree/test/test03.sh#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/disks.c#16 integrate Differences ... ==== //depot/projects/hammer/etc/defaults/rc.conf#51 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.243 2005/03/12 21:09:15 trhodes Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.244 2005/04/03 21:45:20 njl Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -474,9 +474,9 @@ devfs_set_rulesets="" # A list of /mount/dev=ruleset_name settings to # apply (must be mounted already, i.e. fstab(5)) performance_cx_lowest="HIGH" # Online CPU idle state -performance_cpu_freq="NONE" # Online CPU frequency +performance_cpu_freq="HIGH" # Online CPU frequency economy_cx_lowest="HIGH" # Offline CPU idle state -economy_cpu_freq="NONE" # Offline CPU frequency +economy_cpu_freq="HIGH" # Offline CPU frequency virecover_enable="YES" # Perform housekeeping for the vi(1) editor ugidfw_enable="NO" # Load mac_bsdextended(4) rules on boot bsdextended_script="/etc/rc.bsdextended" # Default mac_bsdextended(4) ==== //depot/projects/hammer/etc/periodic/weekly/330.catman#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/periodic/weekly/330.catman,v 1.9 2002/03/05 19:13:05 cjc Exp $ +# $FreeBSD: src/etc/periodic/weekly/330.catman,v 1.10 2005/03/30 18:02:49 ru Exp $ # # If there is a global system configuration file, suck it in. @@ -34,7 +34,7 @@ rc=0 # Preformat original, non-localized manpages - echo /usr/libexec/catman.local "$MANPATH" | + echo /usr/libexec/catman.local -r "$MANPATH" | su -fm man || rc=3 # Preformat localized manpages. @@ -42,7 +42,7 @@ then for i in $man_locales do - echo /usr/libexec/catman.local -L \ + echo /usr/libexec/catman.local -Lr \ "$MANPATH" | LC_ALL=$i su -fm man || rc=3 done fi ==== //depot/projects/hammer/etc/rc.d/pf#7 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/pf,v 1.6 2004/10/25 08:12:28 pjd Exp $ +# $FreeBSD: src/etc/rc.d/pf,v 1.7 2005/04/04 23:06:10 seanc Exp $ # # PROVIDE: pf @@ -75,7 +75,9 @@ echo "Reloading pf rules." ${pf_program:-/sbin/pfctl} -n -f "${pf_rules}" || return 1 - ${pf_program:-/sbin/pfctl} -Fa > /dev/null 2>&1 + # Flush everything but existing state entries that way when + # rules are read in, it doesn't break established connections. + ${pf_program:-/sbin/pfctl} -Fnat -Fqueue -Frules -FSources -Finfo -FTables -Fosfp > /dev/null 2>&1 ${pf_program:-/sbin/pfctl} -f "${pf_rules}" ${pf_flags} } ==== //depot/projects/hammer/etc/rc.d/ugidfw#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ugidfw,v 1.2 2004/10/14 04:37:57 trhodes Exp $ +# $FreeBSD: src/etc/rc.d/ugidfw,v 1.3 2005/04/02 00:01:03 trhodes Exp $ # PROVIDE: ugidfw # REQUIRE: @@ -15,6 +15,14 @@ start_precmd="ugidfw_precmd" stop_cmd="ugidfw_stop" +ugidfw_load() +{ + if [ -r "${bsdextended_script}" ]; then + . "${bsdextended_script}" + echo -n " ${_bsdextended_profile}" + fi +} + ugidfw_precmd() { if ! sysctl security.mac.bsdextended @@ -31,13 +39,19 @@ ugidfw_start() { - # set the default policy script if none was specified - [ -z "${bsdextended_script}" ] && bsdextended_script=/etc/rc.bsdextended + # check for existing profiles and set the default policy script + # if none was specified + [ -z "${bsdextended_profiles}" ] && { + bsdextended_profiles=default + [ -z "${bsdextended_script}" ] && bsdextended_script=/etc/rc.bsdextended + bsdextended_default_script=/etc/rc.bsdextended + } - if [ -r "${bsdextended_script}" ]; then - . "${bsdextended_script}" - echo -n 'MAC bsdextended rules loaded sucessfully.' - fi + echo -n "Loading MAC bsdextended rules:" + for _bsdextended_profile in ${bsdextended_profiles}; do + eval bsdextended_script=\"\$bsdextended_${_bsdextended_profile}_script\" + ugidfw_load + done echo '.' } ==== //depot/projects/hammer/include/Makefile#40 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.237 2005/03/11 17:24:46 ume Exp $ +# $FreeBSD: src/include/Makefile,v 1.239 2005/04/03 04:53:23 imp Exp $ # # Doing a "make install" builds /usr/include. @@ -87,6 +87,10 @@ INCSLINKS+= posix4/$i ${INCLUDEDIR}/$i .endfor +.if ${MACHINE} != ${MACHINE_ARCH} +_MARCH=${MACHINE_ARCH} +.endif + .include installincludes: ${SHARED} @@ -94,7 +98,7 @@ # Take care of stale directory-level symlinks. compat: -.for i in ${LDIRS} ${LSUBDIRS} machine crypto +.for i in ${LDIRS} ${LSUBDIRS} machine ${_MARCH} crypto if [ -L ${DESTDIR}${INCLUDEDIR}/$i ]; then \ rm -f ${DESTDIR}${INCLUDEDIR}/$i; \ fi @@ -109,7 +113,8 @@ .endif copies: -.for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} altq crypto machine machine/pc +.for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} altq crypto machine machine/pc \ + ${_MARCH} .if exists(${DESTDIR}${INCLUDEDIR}/$i) cd ${DESTDIR}${INCLUDEDIR}/$i; \ for h in *.h; do \ @@ -143,14 +148,28 @@ cd ${.CURDIR}/../sys/opencrypto; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/crypto - cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include; \ + cd ${.CURDIR}/../sys/${MACHINE}/include; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/machine -.if exists(${.CURDIR}/../sys/${MACHINE_ARCH}/include/pc) - cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include/pc; \ +.if exists(${.CURDIR}/../sys/${MACHINE}/include/pc) + cd ${.CURDIR}/../sys/${MACHINE}/include/pc; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/machine/pc .endif +.if defined(_MARCH) + ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \ + ${DESTDIR}${INCLUDEDIR}/${_MARCH}; \ + cd ${.CURDIR}/../sys/${_MARCH}/include; \ + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ + ${DESTDIR}${INCLUDEDIR}/${_MARCH} +.if exists(${.CURDIR}/../sys/${_MARCH}/include/pc) + ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \ + ${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \ + cd ${.CURDIR}/../sys/${_MARCH}/include/pc; \ + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ + ${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc +.endif +.endif symlinks: @${ECHO} "Setting up symlinks to kernel source tree..." @@ -207,15 +226,33 @@ ln -fs ../../../sys/opencrypto/$$h \ ${DESTDIR}${INCLUDEDIR}/crypto; \ done - cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include; \ + cd ${.CURDIR}/../sys/${MACHINE}/include; \ for h in *.h; do \ - ln -fs ../../../sys/${MACHINE_ARCH}/include/$$h \ + ln -fs ../../../sys/${MACHINE}/include/$$h \ ${DESTDIR}${INCLUDEDIR}/machine; \ done -.if exists(${.CURDIR}/../sys/${MACHINE_ARCH}/include/pc) - cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include/pc; \ +.if exists(${.CURDIR}/../sys/${MACHINE}/include/pc) + cd ${.CURDIR}/../sys/${MACHINE}/include/pc; \ for h in *.h; do \ - ln -fs ../../../../sys/${MACHINE_ARCH}/include/pc/$$h \ + ln -fs ../../../../sys/${MACHINE}/include/pc/$$h \ ${DESTDIR}${INCLUDEDIR}/machine/pc; \ done .endif +.if defined(_MARCH) + ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \ + ${DESTDIR}${INCLUDEDIR}/${_MARCH}; \ + cd ${.CURDIR}/../sys/${_MARCH}/include; \ + for h in *.h; do \ + ln -fs ../../../sys/${_MARCH}/include/$$h \ + ${DESTDIR}${INCLUDEDIR}/${_MARCH}; \ + done +.if exists(${.CURDIR}/../sys/${_MARCH}/include/pc) + ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \ + ${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \ + cd ${.CURDIR}/../sys/${_MARCH}/include/pc; \ + for h in *.h; do \ + ln -fs ../../../../sys/${_MARCH}/include/pc/$$h \ + ${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \ + done +.endif +.endif ==== //depot/projects/hammer/include/pthread.h#7 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/pthread.h,v 1.33 2005/01/08 11:07:13 davidxu Exp $ + * $FreeBSD: src/include/pthread.h,v 1.34 2005/04/03 23:55:02 davidxu Exp $ */ #ifndef _PTHREAD_H_ #define _PTHREAD_H_ @@ -225,6 +225,10 @@ void pthread_cleanup_push(void (*) (void *), void *routine_arg); int pthread_condattr_destroy(pthread_condattr_t *); int pthread_condattr_init(pthread_condattr_t *); +int pthread_condattr_getclock(const pthread_condattr_t *, + clockid_t *); +int pthread_condattr_setclock(pthread_condattr_t *, + clockid_t); int pthread_cond_broadcast(pthread_cond_t *); int pthread_cond_destroy(pthread_cond_t *); ==== //depot/projects/hammer/include/time.h#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ /* - * $FreeBSD: src/include/time.h,v 1.31 2003/12/07 21:10:06 marcel Exp $ + * $FreeBSD: src/include/time.h,v 1.32 2005/04/02 12:33:27 das Exp $ */ #ifndef _TIME_H_ @@ -92,6 +92,23 @@ #include #endif /* __POSIX_VISIBLE >= 199309 */ +/* These macros are also in sys/time.h. */ +#if !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 200112 +#define CLOCK_REALTIME 0 +#ifdef __BSD_VISIBLE +#define CLOCK_VIRTUAL 1 +#define CLOCK_PROF 2 +#endif +#define CLOCK_MONOTONIC 4 +#endif /* !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 200112 */ + +#if !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 200112 +#if __BSD_VISIBLE +#define TIMER_RELTIME 0x0 /* relative timer */ +#endif +#define TIMER_ABSTIME 0x1 /* absolute timer */ +#endif /* !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 200112 */ + struct tm { int tm_sec; /* seconds after the minute [0-60] */ int tm_min; /* minutes after the hour [0-59] */ @@ -115,6 +132,7 @@ clock_t clock(void); char *ctime(const time_t *); double difftime(time_t, time_t); +/* XXX missing: getdate() */ struct tm *gmtime(const time_t *); struct tm *localtime(const time_t *); time_t mktime(struct tm *); @@ -130,6 +148,7 @@ int clock_getres(clockid_t, struct timespec *); int clock_gettime(clockid_t, struct timespec *); int clock_settime(clockid_t, const struct timespec *); +/* XXX missing: clock_nanosleep() */ int nanosleep(const struct timespec *, struct timespec *); #endif /* __POSIX_VISIBLE >= 199309 */ @@ -146,7 +165,7 @@ #endif #if __BSD_VISIBLE -char *timezone(int, int); +char *timezone(int, int); /* XXX XSI conflict */ void tzsetwall(void); time_t timelocal(struct tm * const); time_t timegm(struct tm * const); ==== //depot/projects/hammer/lib/Makefile#48 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.201 2005/02/06 16:45:57 phk Exp $ +# $FreeBSD: src/lib/Makefile,v 1.203 2005/04/02 01:40:12 davidxu Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -96,12 +96,12 @@ _libpthread= libpthread .endif -.if ${MACHINE_ARCH} != "arm" && !defined(NO_LIBTHR) -_libthr= libthr +.if !defined(NO_LIBTHR) +_libthr= libthr .endif .if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "powerpc" -_libthread_db= libthread_db +_libthread_db= libthread_db .endif .if !defined(NO_USB) ==== //depot/projects/hammer/lib/libarchive/Makefile#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.31 2005/03/13 02:53:42 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.32 2005/03/29 05:24:08 kientzle Exp $ # # Use "make distfile" to build a conventional tar.gz archive @@ -7,7 +7,7 @@ LIB= archive -VERSION= 1.02.013 +VERSION= 1.02.016 ARCHIVE_API_FEATURE= 2 ARCHIVE_API_VERSION= 1 SHLIB_MAJOR= ${ARCHIVE_API_VERSION} ==== //depot/projects/hammer/lib/libarchive/archive_read_extract.c#20 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.37 2005/03/13 02:53:42 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.38 2005/03/29 05:24:08 kientzle Exp $"); #include #ifdef HAVE_SYS_ACL_H @@ -185,15 +185,16 @@ /* * If pathname is longer than PATH_MAX, record starting directory - * and move to a suitable intermediate dir. + * and chdir to a suitable intermediate dir. */ if (strlen(archive_entry_pathname(entry)) > PATH_MAX) { + char *intdir, *tail; + /* * Yes, the copy here is necessary because we edit * the pathname in-place to create intermediate dirnames. */ original_filename = strdup(archive_entry_pathname(entry)); - char *intdir, *tail; restore_pwd = open(".", O_RDONLY); /* @@ -203,28 +204,28 @@ intdir = tail = original_filename; while (strlen(tail) > PATH_MAX) { intdir = tail; + + /* Locate a dir prefix shorter than PATH_MAX. */ tail = intdir + PATH_MAX - 8; while (tail > intdir && *tail != '/') tail--; if (tail <= intdir) { - close(restore_pwd); archive_set_error(a, EPERM, "Path element too long"); - return (ARCHIVE_WARN); + ret = ARCHIVE_WARN; + goto cleanup; } + + /* Create intdir and chdir to it. */ *tail = '\0'; /* Terminate dir portion */ - if (create_dir(a, intdir, flags) != ARCHIVE_OK) { - fchdir(restore_pwd); - close(restore_pwd); - return (ARCHIVE_WARN); - } - if (chdir(intdir) != 0) { + ret = create_dir(a, intdir, flags); + if (ret == ARCHIVE_OK && chdir(intdir) != 0) { archive_set_error(a, errno, "Couldn't chdir"); - fchdir(restore_pwd); - close(restore_pwd); - return (ARCHIVE_WARN); + ret = ARCHIVE_WARN; } *tail = '/'; /* Restore the / we removed. */ + if (ret != ARCHIVE_OK) + goto cleanup; tail++; } archive_entry_set_pathname(entry, tail); @@ -266,9 +267,12 @@ } } + +cleanup: /* If we changed directory above, restore it here. */ if (restore_pwd >= 0 && original_filename != NULL) { fchdir(restore_pwd); + close(restore_pwd); archive_entry_copy_pathname(entry, original_filename); free(original_filename); } ==== //depot/projects/hammer/lib/libc/gen/errlst.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)errlst.c 8.2 (Berkeley) 11/16/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/errlst.c,v 1.7 2002/10/09 08:04:24 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/errlst.c,v 1.8 2005/04/02 12:33:28 das Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 5 01:27:52 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9CED16A4D0; Tue, 5 Apr 2005 01:27:50 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7F72A16A4CE for ; Tue, 5 Apr 2005 01:27:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 34F4643D48 for ; Tue, 5 Apr 2005 01:27:50 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j351RoxC091917 for ; Tue, 5 Apr 2005 01:27:50 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j351RnY3091914 for perforce@freebsd.org; Tue, 5 Apr 2005 01:27:49 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 5 Apr 2005 01:27:49 GMT Message-Id: <200504050127.j351RnY3091914@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74484 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Apr 2005 01:27:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=74484 Change 74484 by davidxu@davidxu_celeron on 2005/04/05 01:27:47 Export thread address to debugger. Affected files ... .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread_db/libpthread_db.c#2 edit .. //depot/projects/davidxu_thread/src/lib/libthread_db/libthr_db.c#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread_db/thread_db.h#2 edit Differences ... ==== //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#3 (text+ko) ==== @@ -918,13 +918,13 @@ if (ti.ti_lid != 0) { - snprintf (buf, sizeof (buf), "Thread %ld (LWP %d)", - GET_THREAD (ptid), ti.ti_lid); + snprintf (buf, sizeof (buf), "Thread %p (LWP %d)", + th.th_thread, ti.ti_lid); } else { - snprintf (buf, sizeof (buf), "Thread %ld (%s)", - GET_THREAD (ptid), thread_db_state_str (ti.ti_state)); + snprintf (buf, sizeof (buf), "Thread %p (%s)", + th.th_thread, thread_db_state_str (ti.ti_state)); } return buf; ==== //depot/projects/davidxu_thread/src/lib/libthread_db/libpthread_db.c#2 (text+ko) ==== @@ -293,6 +293,7 @@ } th->th_ta = ta; th->th_tid = id; + th->th_thread = pt; return (TD_OK); } @@ -327,6 +328,7 @@ if (th->th_tid == -1) return (TD_MALLOC); pt_unmap_lwp(ta, lwp); + th->th_thread = pt; return (TD_OK); } @@ -371,6 +373,7 @@ while (pt != 0) { th.th_ta = ta; th.th_tid = pt_map_thread(ta, pt, PT_USER); + th.th_thread = pt; /* should we unmap lwp here ? */ if (th.th_tid == -1) return (TD_MALLOC); ==== //depot/projects/davidxu_thread/src/lib/libthread_db/libthr_db.c#3 (text+ko) ==== @@ -296,6 +296,7 @@ } th->th_ta = ta; th->th_tid = id; + th->th_thread = pt; return (TD_OK); } @@ -333,6 +334,7 @@ return (TD_NOTHR); th->th_ta = ta; th->th_tid = pt_map_thread(ta, lwp, pt); + th->th_thread = pt; if (th->th_tid == -1) return (TD_MALLOC); return (TD_OK); @@ -372,6 +374,7 @@ if (tmp_lwp != 0) { th.th_ta = ta; th.th_tid = pt_map_thread(ta, tmp_lwp, pt); + th.th_thread = pt; if (th.th_tid == -1) return (TD_MALLOC); if ((*callback)(&th, cbdata_p)) @@ -518,6 +521,7 @@ info->ti_tid = th->th_tid; info->ti_state = TD_THR_RUN; info->ti_type = TD_THR_SYSTEM; + info->ti_thread = NULL; return (TD_OK); } ret = ps_pread(ta->ph, ta->map[th->th_tid].thr + ta->thread_off_state, @@ -526,6 +530,7 @@ return (P2T(ret)); info->ti_lid = ta->map[th->th_tid].lwp; info->ti_tid = th->th_tid; + info->ti_thread = ta->map[th->th_tid].thr; info->ti_ta_p = th->th_ta; if (state == ta->thread_state_running) info->ti_state = TD_THR_RUN; ==== //depot/projects/davidxu_thread/src/lib/libthread_db/thread_db.h#2 (text+ko) ==== @@ -176,6 +176,7 @@ typedef struct { const td_thragent_t *ti_ta_p; thread_t ti_tid; + psaddr_t ti_thread; td_thr_state_e ti_state; td_thr_type_e ti_type; td_thr_events_t ti_events; From owner-p4-projects@FreeBSD.ORG Tue Apr 5 02:24:01 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0503116A4D0; Tue, 5 Apr 2005 02:24:00 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8B52016A4CE for ; Tue, 5 Apr 2005 02:23:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 131A643D45 for ; Tue, 5 Apr 2005 02:23:59 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j352NxZV094058 for ; Tue, 5 Apr 2005 02:23:59 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j352Nw8l094055 for perforce@freebsd.org; Tue, 5 Apr 2005 02:23:58 GMT (envelope-from peter@freebsd.org) Date: Tue, 5 Apr 2005 02:23:58 GMT Message-Id: <200504050223.j352Nw8l094055@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 74487 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Apr 2005 02:24:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=74487 Change 74487 by peter@peter_daintree on 2005/04/05 02:23:39 Track i386 changes (mostly inline bus_amd64.h into bus.h) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#27 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#121 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#87 integrate .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#34 integrate .. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#18 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#68 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#69 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#60 integrate .. //depot/projects/hammer/sys/amd64/include/bus.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/bus_amd64.h#15 delete .. //depot/projects/hammer/sys/amd64/include/floatingpoint.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/fpu.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/legacyvar.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/md_var.h#30 integrate .. //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/proc.h#16 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#37 integrate .. //depot/projects/hammer/sys/amd64/isa/isa.h#11 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#29 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#27 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#121 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#87 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#34 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#18 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#68 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#69 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/NOTES#60 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1188) +# (XXX from i386:NOTES,v 1.1191) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.27 2005/03/31 20:21:42 scottl Exp $ # @@ -269,6 +269,12 @@ device arcmsr # Areca SATA II RAID # +# Areca 11xx and 12xx series of SATA II RAID controllers. +# CAM is required. +# +device arcmsr # Areca SATA II RAID + +# # 3ware 9000 series PATA/SATA RAID controller driver and options. # The driver is implemented as a SIM, and so, needs the CAM infrastructure. # @@ -571,3 +577,7 @@ # The I/O device device io + +# asr old ioctls support, needed by raidutils + +options ASR_COMPAT ==== //depot/projects/hammer/sys/amd64/include/bus.h#7 (text+ko) ==== @@ -31,10 +31,1228 @@ * $FreeBSD: src/sys/amd64/include/bus.h,v 1.12 2003/05/12 02:44:37 peter Exp $ */ +/* $NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $ */ + +/*- + * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, + * NASA Ames Research Center. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +/*- + * Copyright (c) 1996 Charles M. Hannum. All rights reserved. + * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Christopher G. Demetriou + * for the NetBSD Project. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + #ifndef _AMD64_BUS_H_ #define _AMD64_BUS_H_ -#include +#include + +/* + * To remain compatible with NetBSD's interface, default to both memio and + * pio when neither of them is defined. + */ +#if !defined(_AMD64_BUS_PIO_H_) && !defined(_AMD64_BUS_MEMIO_H_) +#define _AMD64_BUS_PIO_H_ +#define _AMD64_BUS_MEMIO_H_ +#endif + +/* + * Values for the amd64 bus space tag, not to be used directly by MI code. + */ +#define AMD64_BUS_SPACE_IO 0 /* space is i/o space */ +#define AMD64_BUS_SPACE_MEM 1 /* space is mem space */ + +/* + * Bus address and size types + */ +typedef uint64_t bus_addr_t; +typedef uint64_t bus_size_t; + +#define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF +#define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF +#define BUS_SPACE_MAXSIZE 0xFFFFFFFF +#define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF +#define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF +#define BUS_SPACE_MAXADDR 0xFFFFFFFFFFFFFFFFULL + +#define BUS_SPACE_UNRESTRICTED (~0) + +/* + * Access methods for bus resources and address space. + */ +typedef uint64_t bus_space_tag_t; +typedef uint64_t bus_space_handle_t; + +/* + * Map a region of device bus space into CPU virtual address space. + */ + +static __inline int bus_space_map(bus_space_tag_t t, bus_addr_t addr, + bus_size_t size, int flags, + bus_space_handle_t *bshp); + +static __inline int +bus_space_map(bus_space_tag_t t __unused, bus_addr_t addr, + bus_size_t size __unused, int flags __unused, + bus_space_handle_t *bshp) +{ + + *bshp = addr; + return (0); +} + +/* + * Unmap a region of device bus space. + */ + +static __inline void bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, + bus_size_t size); + +static __inline void +bus_space_unmap(bus_space_tag_t t __unused, bus_space_handle_t bsh __unused, + bus_size_t size __unused) +{ +} + +/* + * Get a new handle for a subregion of an already-mapped area of bus space. + */ + +static __inline int bus_space_subregion(bus_space_tag_t t, + bus_space_handle_t bsh, + bus_size_t offset, bus_size_t size, + bus_space_handle_t *nbshp); + +static __inline int +bus_space_subregion(bus_space_tag_t t __unused, bus_space_handle_t bsh, + bus_size_t offset, bus_size_t size __unused, + bus_space_handle_t *nbshp) +{ + + *nbshp = bsh + offset; + return (0); +} + +/* + * Allocate a region of memory that is accessible to devices in bus space. + */ + +int bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart, + bus_addr_t rend, bus_size_t size, bus_size_t align, + bus_size_t boundary, int flags, bus_addr_t *addrp, + bus_space_handle_t *bshp); + +/* + * Free a region of bus space accessible memory. + */ + +static __inline void bus_space_free(bus_space_tag_t t, bus_space_handle_t bsh, + bus_size_t size); + +static __inline void +bus_space_free(bus_space_tag_t t __unused, bus_space_handle_t bsh __unused, + bus_size_t size __unused) +{ +} + + +#if defined(_AMD64_BUS_PIO_H_) || defined(_AMD64_BUS_MEMIO_H_) + +/* + * Read a 1, 2, 4, or 8 byte quantity from bus space + * described by tag/handle/offset. + */ +static __inline u_int8_t bus_space_read_1(bus_space_tag_t tag, + bus_space_handle_t handle, + bus_size_t offset); + +static __inline u_int16_t bus_space_read_2(bus_space_tag_t tag, + bus_space_handle_t handle, + bus_size_t offset); + +static __inline u_int32_t bus_space_read_4(bus_space_tag_t tag, + bus_space_handle_t handle, + bus_size_t offset); + +static __inline u_int8_t +bus_space_read_1(bus_space_tag_t tag, bus_space_handle_t handle, + bus_size_t offset) +{ +#if defined (_AMD64_BUS_PIO_H_) +#if defined (_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) +#endif + return (inb(handle + offset)); +#endif +#if defined (_AMD64_BUS_MEMIO_H_) + return (*(volatile u_int8_t *)(handle + offset)); +#endif +} + +static __inline u_int16_t +bus_space_read_2(bus_space_tag_t tag, bus_space_handle_t handle, + bus_size_t offset) +{ +#if defined(_AMD64_BUS_PIO_H_) +#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) +#endif + return (inw(handle + offset)); +#endif +#if defined(_AMD64_BUS_MEMIO_H_) + return (*(volatile u_int16_t *)(handle + offset)); +#endif +} + +static __inline u_int32_t +bus_space_read_4(bus_space_tag_t tag, bus_space_handle_t handle, + bus_size_t offset) +{ +#if defined(_AMD64_BUS_PIO_H_) +#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) +#endif + return (inl(handle + offset)); +#endif +#if defined(_AMD64_BUS_MEMIO_H_) + return (*(volatile u_int32_t *)(handle + offset)); +#endif +} + +#if 0 /* Cause a link error for bus_space_read_8 */ +#define bus_space_read_8(t, h, o) !!! bus_space_read_8 unimplemented !!! +#endif + +/* + * Read `count' 1, 2, 4, or 8 byte quantities from bus space + * described by tag/handle/offset and copy into buffer provided. + */ +static __inline void bus_space_read_multi_1(bus_space_tag_t tag, + bus_space_handle_t bsh, + bus_size_t offset, u_int8_t *addr, + size_t count); + +static __inline void bus_space_read_multi_2(bus_space_tag_t tag, + bus_space_handle_t bsh, + bus_size_t offset, u_int16_t *addr, + size_t count); + +static __inline void bus_space_read_multi_4(bus_space_tag_t tag, + bus_space_handle_t bsh, + bus_size_t offset, u_int32_t *addr, + size_t count); + +static __inline void +bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, + bus_size_t offset, u_int8_t *addr, size_t count) +{ +#if defined(_AMD64_BUS_PIO_H_) +#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) +#endif + insb(bsh + offset, addr, count); +#endif +#if defined(_AMD64_BUS_MEMIO_H_) +#if defined(_AMD64_BUS_PIO_H_) + else +#endif + { +#ifdef __GNUCLIKE_ASM + __asm __volatile(" \n\ + cld \n\ + 1: movb (%2),%%al \n\ + stosb \n\ + loop 1b" : + "=D" (addr), "=c" (count) : + "r" (bsh + offset), "0" (addr), "1" (count) : + "%eax", "memory"); +#endif + } +#endif +} + +static __inline void +bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, + bus_size_t offset, u_int16_t *addr, size_t count) +{ +#if defined(_AMD64_BUS_PIO_H_) +#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) +#endif + insw(bsh + offset, addr, count); +#endif +#if defined(_AMD64_BUS_MEMIO_H_) +#if defined(_AMD64_BUS_PIO_H_) + else +#endif + { +#ifdef __GNUCLIKE_ASM + __asm __volatile(" \n\ + cld \n\ + 1: movw (%2),%%ax \n\ + stosw \n\ + loop 1b" : + "=D" (addr), "=c" (count) : + "r" (bsh + offset), "0" (addr), "1" (count) : + "%eax", "memory"); +#endif + } +#endif +} + +static __inline void +bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, + bus_size_t offset, u_int32_t *addr, size_t count) +{ +#if defined(_AMD64_BUS_PIO_H_) +#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) +#endif + insl(bsh + offset, addr, count); +#endif +#if defined(_AMD64_BUS_MEMIO_H_) +#if defined(_AMD64_BUS_PIO_H_) + else +#endif + { +#ifdef __GNUCLIKE_ASM + __asm __volatile(" \n\ + cld \n\ + 1: movl (%2),%%eax \n\ + stosl \n\ + loop 1b" : + "=D" (addr), "=c" (count) : + "r" (bsh + offset), "0" (addr), "1" (count) : + "%eax", "memory"); +#endif + } +#endif +} + +#if 0 /* Cause a link error for bus_space_read_multi_8 */ +#define bus_space_read_multi_8 !!! bus_space_read_multi_8 unimplemented !!! +#endif + +/* + * Read `count' 1, 2, 4, or 8 byte quantities from bus space + * described by tag/handle and starting at `offset' and copy into + * buffer provided. + */ +static __inline void bus_space_read_region_1(bus_space_tag_t tag, + bus_space_handle_t bsh, + bus_size_t offset, u_int8_t *addr, + size_t count); + +static __inline void bus_space_read_region_2(bus_space_tag_t tag, + bus_space_handle_t bsh, + bus_size_t offset, u_int16_t *addr, + size_t count); + +static __inline void bus_space_read_region_4(bus_space_tag_t tag, + bus_space_handle_t bsh, + bus_size_t offset, u_int32_t *addr, + size_t count); + + +static __inline void +bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, + bus_size_t offset, u_int8_t *addr, size_t count) +{ +#if defined(_AMD64_BUS_PIO_H_) +#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) +#endif + { + int _port_ = bsh + offset; +#ifdef __GNUCLIKE_ASM + __asm __volatile(" \n\ + cld \n\ + 1: inb %w2,%%al \n\ + stosb \n\ + incl %2 \n\ + loop 1b" : + "=D" (addr), "=c" (count), "=d" (_port_) : + "0" (addr), "1" (count), "2" (_port_) : + "%eax", "memory", "cc"); +#endif + } +#endif +#if defined(_AMD64_BUS_MEMIO_H_) +#if defined(_AMD64_BUS_PIO_H_) + else +#endif + { + bus_space_handle_t _port_ = bsh + offset; +#ifdef __GNUCLIKE_ASM + __asm __volatile(" \n\ + cld \n\ + repne \n\ + movsb" : + "=D" (addr), "=c" (count), "=S" (_port_) : + "0" (addr), "1" (count), "2" (_port_) : + "memory", "cc"); +#endif + } +#endif +} + +static __inline void +bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, + bus_size_t offset, u_int16_t *addr, size_t count) +{ +#if defined(_AMD64_BUS_PIO_H_) +#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) +#endif + { + int _port_ = bsh + offset; +#ifdef __GNUCLIKE_ASM + __asm __volatile(" \n\ + cld \n\ + 1: inw %w2,%%ax \n\ + stosw \n\ + addl $2,%2 \n\ + loop 1b" : + "=D" (addr), "=c" (count), "=d" (_port_) : + "0" (addr), "1" (count), "2" (_port_) : + "%eax", "memory", "cc"); +#endif + } +#endif +#if defined(_AMD64_BUS_MEMIO_H_) +#if defined(_AMD64_BUS_PIO_H_) + else +#endif + { + bus_space_handle_t _port_ = bsh + offset; +#ifdef __GNUCLIKE_ASM + __asm __volatile(" \n\ + cld \n\ + repne \n\ + movsw" : + "=D" (addr), "=c" (count), "=S" (_port_) : + "0" (addr), "1" (count), "2" (_port_) : + "memory", "cc"); +#endif + } +#endif +} + +static __inline void +bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, + bus_size_t offset, u_int32_t *addr, size_t count) +{ +#if defined(_AMD64_BUS_PIO_H_) +#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) +#endif + { + int _port_ = bsh + offset; +#ifdef __GNUCLIKE_ASM + __asm __volatile(" \n\ + cld \n\ + 1: inl %w2,%%eax \n\ + stosl \n\ + addl $4,%2 \n\ + loop 1b" : + "=D" (addr), "=c" (count), "=d" (_port_) : + "0" (addr), "1" (count), "2" (_port_) : + "%eax", "memory", "cc"); +#endif + } +#endif +#if defined(_AMD64_BUS_MEMIO_H_) +#if defined(_AMD64_BUS_PIO_H_) + else +#endif + { + bus_space_handle_t _port_ = bsh + offset; +#ifdef __GNUCLIKE_ASM + __asm __volatile(" \n\ + cld \n\ + repne \n\ + movsl" : + "=D" (addr), "=c" (count), "=S" (_port_) : + "0" (addr), "1" (count), "2" (_port_) : + "memory", "cc"); +#endif + } +#endif +} + +#if 0 /* Cause a link error for bus_space_read_region_8 */ +#define bus_space_read_region_8 !!! bus_space_read_region_8 unimplemented !!! +#endif + +/* + * Write the 1, 2, 4, or 8 byte value `value' to bus space + * described by tag/handle/offset. + */ + +static __inline void bus_space_write_1(bus_space_tag_t tag, + bus_space_handle_t bsh, + bus_size_t offset, u_int8_t value); + +static __inline void bus_space_write_2(bus_space_tag_t tag, + bus_space_handle_t bsh, + bus_size_t offset, u_int16_t value); + +static __inline void bus_space_write_4(bus_space_tag_t tag, + bus_space_handle_t bsh, + bus_size_t offset, u_int32_t value); + +static __inline void +bus_space_write_1(bus_space_tag_t tag, bus_space_handle_t bsh, + bus_size_t offset, u_int8_t value) +{ +#if defined(_AMD64_BUS_PIO_H_) +#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) +#endif + outb(bsh + offset, value); +#endif +#if defined(_AMD64_BUS_MEMIO_H_) +#if defined(_AMD64_BUS_PIO_H_) + else +#endif + *(volatile u_int8_t *)(bsh + offset) = value; +#endif +} + +static __inline void +bus_space_write_2(bus_space_tag_t tag, bus_space_handle_t bsh, + bus_size_t offset, u_int16_t value) +{ +#if defined(_AMD64_BUS_PIO_H_) +#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) +#endif + outw(bsh + offset, value); +#endif +#if defined(_AMD64_BUS_MEMIO_H_) +#if defined(_AMD64_BUS_PIO_H_) + else +#endif + *(volatile u_int16_t *)(bsh + offset) = value; +#endif +} + +static __inline void +bus_space_write_4(bus_space_tag_t tag, bus_space_handle_t bsh, + bus_size_t offset, u_int32_t value) +{ +#if defined(_AMD64_BUS_PIO_H_) +#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) +#endif + outl(bsh + offset, value); +#endif +#if defined(_AMD64_BUS_MEMIO_H_) +#if defined(_AMD64_BUS_PIO_H_) + else +#endif + *(volatile u_int32_t *)(bsh + offset) = value; +#endif +} + +#if 0 /* Cause a link error for bus_space_write_8 */ +#define bus_space_write_8 !!! bus_space_write_8 not implemented !!! +#endif + +/* + * Write `count' 1, 2, 4, or 8 byte quantities from the buffer + * provided to bus space described by tag/handle/offset. + */ + +static __inline void bus_space_write_multi_1(bus_space_tag_t tag, + bus_space_handle_t bsh, + bus_size_t offset, + const u_int8_t *addr, + size_t count); +static __inline void bus_space_write_multi_2(bus_space_tag_t tag, + bus_space_handle_t bsh, + bus_size_t offset, + const u_int16_t *addr, + size_t count); + +static __inline void bus_space_write_multi_4(bus_space_tag_t tag, + bus_space_handle_t bsh, + bus_size_t offset, + const u_int32_t *addr, + size_t count); + +static __inline void +bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, + bus_size_t offset, const u_int8_t *addr, size_t count) +{ +#if defined(_AMD64_BUS_PIO_H_) +#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) +#endif + outsb(bsh + offset, addr, count); +#endif +#if defined(_AMD64_BUS_MEMIO_H_) +#if defined(_AMD64_BUS_PIO_H_) + else +#endif + { +#ifdef __GNUCLIKE_ASM + __asm __volatile(" \n\ + cld \n\ + 1: lodsb \n\ + movb %%al,(%2) \n\ + loop 1b" : + "=S" (addr), "=c" (count) : + "r" (bsh + offset), "0" (addr), "1" (count) : + "%eax", "memory", "cc"); +#endif + } +#endif +} + +static __inline void +bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, + bus_size_t offset, const u_int16_t *addr, size_t count) +{ +#if defined(_AMD64_BUS_PIO_H_) +#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) +#endif + outsw(bsh + offset, addr, count); +#endif +#if defined(_AMD64_BUS_MEMIO_H_) +#if defined(_AMD64_BUS_PIO_H_) + else +#endif + { +#ifdef __GNUCLIKE_ASM + __asm __volatile(" \n\ + cld \n\ + 1: lodsw \n\ + movw %%ax,(%2) \n\ + loop 1b" : + "=S" (addr), "=c" (count) : + "r" (bsh + offset), "0" (addr), "1" (count) : + "%eax", "memory", "cc"); +#endif + } +#endif +} + +static __inline void +bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, + bus_size_t offset, const u_int32_t *addr, size_t count) +{ +#if defined(_AMD64_BUS_PIO_H_) +#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) +#endif + outsl(bsh + offset, addr, count); +#endif +#if defined(_AMD64_BUS_MEMIO_H_) +#if defined(_AMD64_BUS_PIO_H_) + else +#endif + { +#ifdef __GNUCLIKE_ASM + __asm __volatile(" \n\ + cld \n\ + 1: lodsl \n\ + movl %%eax,(%2) \n\ + loop 1b" : + "=S" (addr), "=c" (count) : + "r" (bsh + offset), "0" (addr), "1" (count) : + "%eax", "memory", "cc"); +#endif + } +#endif +} + +#if 0 /* Cause a link error for bus_space_write_multi_8 */ +#define bus_space_write_multi_8(t, h, o, a, c) \ + !!! bus_space_write_multi_8 unimplemented !!! +#endif + +/* + * Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided + * to bus space described by tag/handle starting at `offset'. + */ + +static __inline void bus_space_write_region_1(bus_space_tag_t tag, + bus_space_handle_t bsh, + bus_size_t offset, + const u_int8_t *addr, + size_t count); +static __inline void bus_space_write_region_2(bus_space_tag_t tag, + bus_space_handle_t bsh, + bus_size_t offset, + const u_int16_t *addr, + size_t count); +static __inline void bus_space_write_region_4(bus_space_tag_t tag, + bus_space_handle_t bsh, + bus_size_t offset, + const u_int32_t *addr, + size_t count); + +static __inline void +bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, + bus_size_t offset, const u_int8_t *addr, size_t count) +{ +#if defined(_AMD64_BUS_PIO_H_) +#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) +#endif + { + int _port_ = bsh + offset; +#ifdef __GNUCLIKE_ASM + __asm __volatile(" \n\ + cld \n\ + 1: lodsb \n\ + outb %%al,%w0 \n\ + incl %0 \n\ + loop 1b" : + "=d" (_port_), "=S" (addr), "=c" (count) : + "0" (_port_), "1" (addr), "2" (count) : + "%eax", "memory", "cc"); +#endif + } +#endif +#if defined(_AMD64_BUS_MEMIO_H_) +#if defined(_AMD64_BUS_PIO_H_) + else +#endif + { + bus_space_handle_t _port_ = bsh + offset; +#ifdef __GNUCLIKE_ASM + __asm __volatile(" \n\ + cld \n\ + repne \n\ + movsb" : + "=D" (_port_), "=S" (addr), "=c" (count) : + "0" (_port_), "1" (addr), "2" (count) : + "memory", "cc"); +#endif + } +#endif +} + +static __inline void +bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, + bus_size_t offset, const u_int16_t *addr, size_t count) +{ +#if defined(_AMD64_BUS_PIO_H_) +#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) +#endif + { + int _port_ = bsh + offset; +#ifdef __GNUCLIKE_ASM + __asm __volatile(" \n\ + cld \n\ + 1: lodsw \n\ + outw %%ax,%w0 \n\ + addl $2,%0 \n\ + loop 1b" : + "=d" (_port_), "=S" (addr), "=c" (count) : + "0" (_port_), "1" (addr), "2" (count) : + "%eax", "memory", "cc"); +#endif + } +#endif +#if defined(_AMD64_BUS_MEMIO_H_) +#if defined(_AMD64_BUS_PIO_H_) + else +#endif + { + bus_space_handle_t _port_ = bsh + offset; +#ifdef __GNUCLIKE_ASM + __asm __volatile(" \n\ + cld \n\ + repne \n\ + movsw" : + "=D" (_port_), "=S" (addr), "=c" (count) : + "0" (_port_), "1" (addr), "2" (count) : + "memory", "cc"); +#endif + } +#endif +} + +static __inline void +bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, + bus_size_t offset, const u_int32_t *addr, size_t count) +{ +#if defined(_AMD64_BUS_PIO_H_) +#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) +#endif + { + int _port_ = bsh + offset; +#ifdef __GNUCLIKE_ASM + __asm __volatile(" \n\ + cld \n\ + 1: lodsl \n\ + outl %%eax,%w0 \n\ + addl $4,%0 \n\ + loop 1b" : + "=d" (_port_), "=S" (addr), "=c" (count) : + "0" (_port_), "1" (addr), "2" (count) : + "%eax", "memory", "cc"); +#endif + } +#endif +#if defined(_AMD64_BUS_MEMIO_H_) +#if defined(_AMD64_BUS_PIO_H_) + else +#endif + { + bus_space_handle_t _port_ = bsh + offset; +#ifdef __GNUCLIKE_ASM + __asm __volatile(" \n\ + cld \n\ + repne \n\ + movsl" : + "=D" (_port_), "=S" (addr), "=c" (count) : + "0" (_port_), "1" (addr), "2" (count) : + "memory", "cc"); +#endif + } +#endif +} + +#if 0 /* Cause a link error for bus_space_write_region_8 */ +#define bus_space_write_region_8 \ + !!! bus_space_write_region_8 unimplemented !!! +#endif + +/* + * Write the 1, 2, 4, or 8 byte value `val' to bus space described + * by tag/handle/offset `count' times. + */ + +static __inline void bus_space_set_multi_1(bus_space_tag_t tag, + bus_space_handle_t bsh, + bus_size_t offset, + u_int8_t value, size_t count); +static __inline void bus_space_set_multi_2(bus_space_tag_t tag, + bus_space_handle_t bsh, + bus_size_t offset, + u_int16_t value, size_t count); +static __inline void bus_space_set_multi_4(bus_space_tag_t tag, + bus_space_handle_t bsh, + bus_size_t offset, + u_int32_t value, size_t count); + +static __inline void +bus_space_set_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, + bus_size_t offset, u_int8_t value, size_t count) +{ + bus_space_handle_t addr = bsh + offset; + +#if defined(_AMD64_BUS_PIO_H_) +#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) +#endif + while (count--) + outb(addr, value); +#endif +#if defined(_AMD64_BUS_MEMIO_H_) +#if defined(_AMD64_BUS_PIO_H_) + else +#endif + while (count--) + *(volatile u_int8_t *)(addr) = value; +#endif +} + +static __inline void +bus_space_set_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, + bus_size_t offset, u_int16_t value, size_t count) +{ + bus_space_handle_t addr = bsh + offset; + +#if defined(_AMD64_BUS_PIO_H_) +#if defined(_AMD64_BUS_MEMIO_H_) + if (tag == AMD64_BUS_SPACE_IO) +#endif + while (count--) + outw(addr, value); +#endif +#if defined(_AMD64_BUS_MEMIO_H_) +#if defined(_AMD64_BUS_PIO_H_) + else +#endif + while (count--) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 5 02:57:20 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B697416A4FD; Tue, 5 Apr 2005 02:57:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 49DA216A569 for ; Tue, 5 Apr 2005 02:57:19 +0000 (GMT) Received: from mail28.sea5.speakeasy.net (mail28.sea5.speakeasy.net [69.17.117.30]) by mx1.FreeBSD.org (Postfix) with ESMTP id A27CC43D4C for ; Tue, 5 Apr 2005 02:57:18 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: (qmail 20095 invoked from network); 5 Apr 2005 02:57:18 -0000 Received: from server.baldwin.cx ([216.27.160.63]) (envelope-sender )AES256-SHA encrypted SMTP for ; 5 Apr 2005 02:57:18 -0000 Received: from [192.168.0.15] (osx.baldwin.cx [192.168.0.15]) (authenticated bits=0) by server.baldwin.cx (8.13.1/8.13.1) with ESMTP id j352v9s0061557; Mon, 4 Apr 2005 22:57:10 -0400 (EDT) (envelope-from jhb@FreeBSD.org) In-Reply-To: <200504042234.j34MYDgE077866@repoman.freebsd.org> References: <200504042234.j34MYDgE077866@repoman.freebsd.org> Mime-Version: 1.0 (Apple Message framework v619.2) Content-Type: text/plain; charset=US-ASCII; format=flowed Message-Id: <6208fe7f3dbf41c482ed0c5be7e90ab4@FreeBSD.org> Content-Transfer-Encoding: 7bit From: John Baldwin Date: Mon, 4 Apr 2005 22:57:11 -0400 To: Peter Wemm X-Mailer: Apple Mail (2.619.2) X-Spam-Status: No, score=-2.8 required=4.2 tests=ALL_TRUSTED autolearn=failed version=3.0.2 X-Spam-Checker-Version: SpamAssassin 3.0.2 (2004-11-16) on server.baldwin.cx cc: Perforce Change Reviews Subject: Re: PERFORCE change 74473 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Apr 2005 02:57:21 -0000 On Apr 4, 2005, at 6:34 PM, Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=74473 > > Change 74473 by peter@peter_daintree on 2005/04/04 22:33:56 > > Set the iobase offset Oops. :) -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Tue Apr 5 11:27:02 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A174F16A4D0; Tue, 5 Apr 2005 11:27:01 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7951D16A4CE for ; Tue, 5 Apr 2005 11:27:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DBFA43D2F for ; Tue, 5 Apr 2005 11:27:01 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j35BR1VU031788 for ; Tue, 5 Apr 2005 11:27:01 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j35BR1jn031785 for perforce@freebsd.org; Tue, 5 Apr 2005 11:27:01 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 5 Apr 2005 11:27:01 GMT Message-Id: <200504051127.j35BR1jn031785@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74506 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Apr 2005 11:27:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=74506 Change 74506 by davidxu@davidxu_alona on 2005/04/05 11:26:41 MFC Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread_db/thread_db.c#3 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread_db/thread_db.c#3 (text+ko) ==== @@ -44,13 +44,11 @@ extern struct ta_ops libc_r_db_ops; extern struct ta_ops libpthread_db_ops; extern struct ta_ops libthr_db_ops; -extern struct ta_ops libpthread2_db_ops; static struct ta_ops *ops[] = { &libpthread_db_ops, &libthr_db_ops, - &libc_r_db_ops, - &libpthread2_db_ops + &libc_r_db_ops }; td_err_e From owner-p4-projects@FreeBSD.ORG Tue Apr 5 11:28:03 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65EB416A4D0; Tue, 5 Apr 2005 11:28:03 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 413ED16A4CE for ; Tue, 5 Apr 2005 11:28:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1300F43D39 for ; Tue, 5 Apr 2005 11:28:03 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j35BS2QH031846 for ; Tue, 5 Apr 2005 11:28:02 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j35BS2r7031834 for perforce@freebsd.org; Tue, 5 Apr 2005 11:28:02 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 5 Apr 2005 11:28:02 GMT Message-Id: <200504051128.j35BS2r7031834@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74507 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Apr 2005 11:28:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=74507 Change 74507 by davidxu@davidxu_alona on 2005/04/05 11:27:54 MFC. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread_db/Makefile#3 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread_db/Makefile#3 (text+ko) ==== @@ -6,7 +6,6 @@ SHLIB_MAJOR= 1 SRCS= thread_db.c SRCS+= libpthread_db.c libpthread_md.c -SRCS+= libpthread2_db.c SRCS+= libc_r_db.c libc_r_md.c SRCS+= libthr_db.c INCS= thread_db.h From owner-p4-projects@FreeBSD.ORG Tue Apr 5 18:33:52 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A571116A4D0; Tue, 5 Apr 2005 18:33:51 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 49D4816A4CE for ; Tue, 5 Apr 2005 18:33:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C1E943D58 for ; Tue, 5 Apr 2005 18:33:50 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j35IXotw063518 for ; Tue, 5 Apr 2005 18:33:50 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j35IXn8M063515 for perforce@freebsd.org; Tue, 5 Apr 2005 18:33:49 GMT (envelope-from jhb@freebsd.org) Date: Tue, 5 Apr 2005 18:33:49 GMT Message-Id: <200504051833.j35IXn8M063515@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 74533 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Apr 2005 18:33:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=74533 Change 74533 by jhb@jhb_slimer on 2005/04/05 18:33:47 IFC @74532. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/critical.c#6 delete .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#80 integrate .. //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#33 integrate .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#39 integrate .. //depot/projects/smpng/sys/alpha/include/critical.h#7 delete .. //depot/projects/smpng/sys/alpha/include/proc.h#9 integrate .. //depot/projects/smpng/sys/alpha/osf1/imgact_osf1.c#14 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#37 integrate .. //depot/projects/smpng/sys/amd64/amd64/critical.c#7 delete .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#38 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#18 integrate .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#25 integrate .. //depot/projects/smpng/sys/amd64/include/critical.h#8 delete .. //depot/projects/smpng/sys/amd64/include/floatingpoint.h#2 integrate .. //depot/projects/smpng/sys/amd64/include/proc.h#5 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#7 integrate .. //depot/projects/smpng/sys/arm/arm/critical.c#3 delete .. //depot/projects/smpng/sys/arm/arm/machdep.c#12 integrate .. //depot/projects/smpng/sys/arm/arm/vm_machdep.c#10 integrate .. //depot/projects/smpng/sys/arm/include/critical.h#3 delete .. //depot/projects/smpng/sys/arm/include/proc.h#5 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/Makefile#14 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#55 integrate .. //depot/projects/smpng/sys/compat/svr4/imgact_svr4.c#13 integrate .. //depot/projects/smpng/sys/conf/Makefile.alpha#23 integrate .. //depot/projects/smpng/sys/conf/Makefile.amd64#9 integrate .. //depot/projects/smpng/sys/conf/Makefile.arm#7 integrate .. //depot/projects/smpng/sys/conf/Makefile.i386#21 integrate .. //depot/projects/smpng/sys/conf/Makefile.ia64#28 integrate .. //depot/projects/smpng/sys/conf/Makefile.pc98#20 integrate .. //depot/projects/smpng/sys/conf/Makefile.powerpc#28 integrate .. //depot/projects/smpng/sys/conf/Makefile.sparc64#24 integrate .. //depot/projects/smpng/sys/conf/NOTES#96 integrate .. //depot/projects/smpng/sys/conf/files.alpha#34 integrate .. //depot/projects/smpng/sys/conf/files.amd64#30 integrate .. //depot/projects/smpng/sys/conf/files.arm#4 integrate .. //depot/projects/smpng/sys/conf/files.i386#80 integrate .. //depot/projects/smpng/sys/conf/files.ia64#47 integrate .. //depot/projects/smpng/sys/conf/files.pc98#72 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#22 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#49 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#44 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#45 integrate .. //depot/projects/smpng/sys/conf/options#97 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#32 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_if.m#6 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#55 integrate .. //depot/projects/smpng/sys/dev/asr/asr.c#28 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#50 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#26 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#53 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#28 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#22 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/amrr/amrr.c#5 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/onoe/onoe.c#5 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#25 integrate .. //depot/projects/smpng/sys/dev/ath/if_athrate.h#4 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#14 integrate .. //depot/projects/smpng/sys/dev/drm/drm_bufs.h#11 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#46 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_sbus.c#12 integrate .. //depot/projects/smpng/sys/dev/ieee488/upd7210.c#4 integrate .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.c#7 integrate .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.h#4 integrate .. //depot/projects/smpng/sys/dev/pci/pcireg.h#8 integrate .. //depot/projects/smpng/sys/dev/sio/sio_pci.c#16 integrate .. //depot/projects/smpng/sys/dev/syscons/apm/apm_saver.c#6 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#27 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.c#12 integrate .. //depot/projects/smpng/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/smpng/sys/i386/i386/critical.c#11 delete .. //depot/projects/smpng/sys/i386/i386/machdep.c#91 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#80 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#64 integrate .. //depot/projects/smpng/sys/i386/ibcs2/imgact_coff.c#19 integrate .. //depot/projects/smpng/sys/i386/include/apm_bios.h#4 integrate .. //depot/projects/smpng/sys/i386/include/bus.h#4 integrate .. //depot/projects/smpng/sys/i386/include/bus_at386.h#14 delete .. //depot/projects/smpng/sys/i386/include/bus_pc98.h#11 delete .. //depot/projects/smpng/sys/i386/include/critical.h#10 delete .. //depot/projects/smpng/sys/i386/include/floatingpoint.h#4 integrate .. //depot/projects/smpng/sys/i386/include/legacyvar.h#4 integrate .. //depot/projects/smpng/sys/i386/include/md_var.h#27 integrate .. //depot/projects/smpng/sys/i386/include/pci_cfgreg.h#9 integrate .. //depot/projects/smpng/sys/i386/include/proc.h#15 integrate .. //depot/projects/smpng/sys/i386/linux/imgact_linux.c#17 integrate .. //depot/projects/smpng/sys/ia64/ia64/critical.c#5 delete .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#93 integrate .. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#28 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#46 integrate .. //depot/projects/smpng/sys/ia64/include/critical.h#7 delete .. //depot/projects/smpng/sys/ia64/include/proc.h#10 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#42 integrate .. //depot/projects/smpng/sys/kern/imgact_gzip.c#12 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#93 integrate .. //depot/projects/smpng/sys/kern/kern_idle.c#25 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#38 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#40 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#97 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#74 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#56 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#50 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#39 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#27 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#100 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#61 integrate .. //depot/projects/smpng/sys/libkern/strspn.c#2 integrate .. //depot/projects/smpng/sys/modules/ata/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/ata/atapicam/Makefile#1 branch .. //depot/projects/smpng/sys/modules/cpufreq/Makefile#4 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto.h#4 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.h#4 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#17 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.h#11 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#21 integrate .. //depot/projects/smpng/sys/netgraph/ng_source.c#13 integrate .. //depot/projects/smpng/sys/netgraph/ng_source.h#6 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#54 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#35 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#80 integrate .. //depot/projects/smpng/sys/pc98/include/_inttypes.h#1 branch .. //depot/projects/smpng/sys/pc98/include/_limits.h#1 branch .. //depot/projects/smpng/sys/pc98/include/_stdint.h#1 branch .. //depot/projects/smpng/sys/pc98/include/_types.h#1 branch .. //depot/projects/smpng/sys/pc98/include/apm_bios.h#1 branch .. //depot/projects/smpng/sys/pc98/include/apm_segments.h#1 branch .. //depot/projects/smpng/sys/pc98/include/asm.h#1 branch .. //depot/projects/smpng/sys/pc98/include/asmacros.h#1 branch .. //depot/projects/smpng/sys/pc98/include/atomic.h#1 branch .. //depot/projects/smpng/sys/pc98/include/bootinfo.h#1 branch .. //depot/projects/smpng/sys/pc98/include/bus.h#1 branch .. //depot/projects/smpng/sys/pc98/include/bus_dma.h#1 branch .. //depot/projects/smpng/sys/pc98/include/bus_memio.h#1 branch .. //depot/projects/smpng/sys/pc98/include/bus_pio.h#1 branch .. //depot/projects/smpng/sys/pc98/include/clock.h#1 branch .. //depot/projects/smpng/sys/pc98/include/cpu.h#1 branch .. //depot/projects/smpng/sys/pc98/include/cpufunc.h#1 branch .. //depot/projects/smpng/sys/pc98/include/cputypes.h#1 branch .. //depot/projects/smpng/sys/pc98/include/cserial.h#1 branch .. //depot/projects/smpng/sys/pc98/include/db_machdep.h#1 branch .. //depot/projects/smpng/sys/pc98/include/elf.h#1 branch .. //depot/projects/smpng/sys/pc98/include/endian.h#1 branch .. //depot/projects/smpng/sys/pc98/include/exec.h#1 branch .. //depot/projects/smpng/sys/pc98/include/float.h#1 branch .. //depot/projects/smpng/sys/pc98/include/floatingpoint.h#1 branch .. //depot/projects/smpng/sys/pc98/include/frame.h#1 branch .. //depot/projects/smpng/sys/pc98/include/gdb_machdep.h#1 branch .. //depot/projects/smpng/sys/pc98/include/i4b_cause.h#1 branch .. //depot/projects/smpng/sys/pc98/include/i4b_debug.h#1 branch .. //depot/projects/smpng/sys/pc98/include/i4b_ioctl.h#1 branch .. //depot/projects/smpng/sys/pc98/include/i4b_rbch_ioctl.h#1 branch .. //depot/projects/smpng/sys/pc98/include/i4b_tel_ioctl.h#1 branch .. //depot/projects/smpng/sys/pc98/include/i4b_trace.h#1 branch .. //depot/projects/smpng/sys/pc98/include/ieeefp.h#1 branch .. //depot/projects/smpng/sys/pc98/include/in_cksum.h#1 branch .. //depot/projects/smpng/sys/pc98/include/intr_machdep.h#1 branch .. //depot/projects/smpng/sys/pc98/include/iodev.h#1 branch .. //depot/projects/smpng/sys/pc98/include/kdb.h#1 branch .. //depot/projects/smpng/sys/pc98/include/legacyvar.h#1 branch .. //depot/projects/smpng/sys/pc98/include/limits.h#1 branch .. //depot/projects/smpng/sys/pc98/include/md_var.h#1 branch .. //depot/projects/smpng/sys/pc98/include/memdev.h#1 branch .. //depot/projects/smpng/sys/pc98/include/metadata.h#1 branch .. //depot/projects/smpng/sys/pc98/include/mp_watchdog.h#1 branch .. //depot/projects/smpng/sys/pc98/include/mptable.h#1 branch .. //depot/projects/smpng/sys/pc98/include/mutex.h#1 branch .. //depot/projects/smpng/sys/pc98/include/npx.h#1 branch .. //depot/projects/smpng/sys/pc98/include/param.h#1 branch .. //depot/projects/smpng/sys/pc98/include/pc/bios.h#1 branch .. //depot/projects/smpng/sys/pc98/include/pc/display.h#1 branch .. //depot/projects/smpng/sys/pc98/include/pc/vesa.h#1 branch .. //depot/projects/smpng/sys/pc98/include/pcaudio.h#1 branch .. //depot/projects/smpng/sys/pc98/include/pcb.h#1 branch .. //depot/projects/smpng/sys/pc98/include/pcb_ext.h#1 branch .. //depot/projects/smpng/sys/pc98/include/pci_cfgreg.h#1 branch .. //depot/projects/smpng/sys/pc98/include/pcpu.h#1 branch .. //depot/projects/smpng/sys/pc98/include/pecoff_machdep.h#1 branch .. //depot/projects/smpng/sys/pc98/include/perfmon.h#1 branch .. //depot/projects/smpng/sys/pc98/include/pmap.h#1 branch .. //depot/projects/smpng/sys/pc98/include/privatespace.h#1 branch .. //depot/projects/smpng/sys/pc98/include/proc.h#1 branch .. //depot/projects/smpng/sys/pc98/include/profile.h#1 branch .. //depot/projects/smpng/sys/pc98/include/psl.h#1 branch .. //depot/projects/smpng/sys/pc98/include/ptrace.h#1 branch .. //depot/projects/smpng/sys/pc98/include/pvct_ioctl.h#1 branch .. //depot/projects/smpng/sys/pc98/include/reg.h#1 branch .. //depot/projects/smpng/sys/pc98/include/reloc.h#1 branch .. //depot/projects/smpng/sys/pc98/include/resource.h#1 branch .. //depot/projects/smpng/sys/pc98/include/runq.h#1 branch .. //depot/projects/smpng/sys/pc98/include/segments.h#1 branch .. //depot/projects/smpng/sys/pc98/include/setjmp.h#1 branch .. //depot/projects/smpng/sys/pc98/include/sf_buf.h#1 branch .. //depot/projects/smpng/sys/pc98/include/sigframe.h#1 branch .. //depot/projects/smpng/sys/pc98/include/signal.h#1 branch .. //depot/projects/smpng/sys/pc98/include/smapi.h#1 branch .. //depot/projects/smpng/sys/pc98/include/smp.h#1 branch .. //depot/projects/smpng/sys/pc98/include/speaker.h#1 branch .. //depot/projects/smpng/sys/pc98/include/specialreg.h#1 branch .. //depot/projects/smpng/sys/pc98/include/stdarg.h#1 branch .. //depot/projects/smpng/sys/pc98/include/sysarch.h#1 branch .. //depot/projects/smpng/sys/pc98/include/trap.h#1 branch .. //depot/projects/smpng/sys/pc98/include/tss.h#1 branch .. //depot/projects/smpng/sys/pc98/include/ucontext.h#1 branch .. //depot/projects/smpng/sys/pc98/include/varargs.h#1 branch .. //depot/projects/smpng/sys/pc98/include/vm86.h#1 branch .. //depot/projects/smpng/sys/pc98/include/vmparam.h#1 branch .. //depot/projects/smpng/sys/pc98/linux/linux.h#1 branch .. //depot/projects/smpng/sys/pc98/linux/linux_ipc64.h#1 branch .. //depot/projects/smpng/sys/pc98/linux/linux_proto.h#1 branch .. //depot/projects/smpng/sys/pci/agp_amd64.c#4 integrate .. //depot/projects/smpng/sys/pci/agp_nvidia.c#5 integrate .. //depot/projects/smpng/sys/powerpc/include/critical.h#9 delete .. //depot/projects/smpng/sys/powerpc/include/proc.h#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/critical.c#6 delete .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#61 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#42 integrate .. //depot/projects/smpng/sys/sparc64/include/critical.h#7 delete .. //depot/projects/smpng/sys/sparc64/include/proc.h#12 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#74 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#24 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#48 integrate .. //depot/projects/smpng/sys/sys/bus.h#22 integrate .. //depot/projects/smpng/sys/sys/errno.h#11 integrate .. //depot/projects/smpng/sys/sys/lock.h#30 integrate .. //depot/projects/smpng/sys/sys/mman.h#10 integrate .. //depot/projects/smpng/sys/sys/mutex.h#54 integrate .. //depot/projects/smpng/sys/sys/shm.h#8 integrate .. //depot/projects/smpng/sys/sys/time.h#18 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#19 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#24 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#49 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#44 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#71 integrate .. //depot/projects/smpng/sys/vm/vm.h#9 integrate .. //depot/projects/smpng/sys/vm/vm_extern.h#27 integrate .. //depot/projects/smpng/sys/vm/vm_meter.c#25 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#53 integrate .. //depot/projects/smpng/sys/vm/vm_object.h#29 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#52 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#80 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.234 2005/04/01 10:59:13 des Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.235 2005/04/04 21:53:51 jhb Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -2397,3 +2397,27 @@ pcpu->pc_idlepcb.apcb_ptbr = thread0.td_pcb->pcb_hw.apcb_ptbr; pcpu->pc_current_asngen = 1; } + +void +spinlock_enter(void) +{ + struct thread *td; + + td = curthread; + if (td->td_md.md_spinlock_count == 0) + td->td_md.md_saved_ipl = intr_disable(); + td->td_md.md_spinlock_count++; + critical_enter(); +} + +void +spinlock_exit(void) +{ + struct thread *td; + + td = curthread; + critical_exit(); + td->td_md.md_spinlock_count--; + if (td->td_md.md_spinlock_count == 0) + intr_restore(td->td_md.md_saved_ipl); +} ==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#33 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.55 2004/11/27 06:51:32 das Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.56 2005/04/04 21:53:51 jhb Exp $"); #include "opt_kstack_pages.h" @@ -144,6 +144,10 @@ /* Clear userland thread pointer. */ alpha_pal_wrunique(0); + /* Initialize curthread. */ + KASSERT(PCPU_GET(idlethread) != NULL, ("no idle thread")); + PCPU_SET(curthread, PCPU_GET(idlethread)); + /* * Point interrupt/exception vectors to our own. */ @@ -205,11 +209,24 @@ while (smp_started == 0) ; /* nothing */ + /* ok, now grab sched_lock and enter the scheduler */ + mtx_lock_spin(&sched_lock); + + /* + * Correct spinlock nesting. The idle thread context that we are + * borrowing was created so that it would start out with a single + * spin lock (sched_lock) held in fork_trampoline(). Since we've + * explicitly acquired locks in this function, the nesting count + * is now 2 rather than 1. Since we are nested, calling + * spinlock_exit() will simply adjust the counts without allowing + * spin lock using code to interrupt us. + */ + spinlock_exit(); + KASSERT(curthread->td_md.md_spinlock_count == 1, ("invalid count")); + binuptime(PCPU_PTR(switchtime)); PCPU_SET(switchticks, ticks); - /* ok, now grab sched_lock and enter the scheduler */ - mtx_lock_spin(&sched_lock); cpu_throw(NULL, choosethread()); /* doesn't return */ panic("scheduler returned us to %s", __func__); ==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#39 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.107 2005/01/14 20:13:04 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.108 2005/04/04 21:53:51 jhb Exp $"); #include #include @@ -202,6 +202,10 @@ */ td2->td_md.md_kernnest = 1; #endif + + /* Setup to release sched_lock in fork_exit(). */ + td2->td_md.md_spinlock_count = 1; + td2->td_md.md_saved_ipl = ALPHA_PSL_IPL_0; } /* @@ -319,6 +323,10 @@ */ td->td_md.md_kernnest = 1; #endif + + /* Setup to release sched_lock in fork_exit(). */ + td->td_md.md_spinlock_count = 1; + td->td_md.md_saved_ipl = ALPHA_PSL_IPL_0; } void ==== //depot/projects/smpng/sys/alpha/include/proc.h#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/proc.h,v 1.17 2005/01/05 20:05:50 imp Exp $ */ +/* $FreeBSD: src/sys/alpha/include/proc.h,v 1.18 2005/04/04 21:53:51 jhb Exp $ */ /* From: NetBSD: proc.h,v 1.3 1997/04/06 08:47:36 cgd Exp */ /*- @@ -52,7 +52,8 @@ u_int64_t md_hae; /* user HAE register value */ void *osf_sigtramp; /* user-level signal trampoline */ u_int md_kernnest; /* nesting level in the kernel */ - register_t md_savecrit; /* save PSL for critical section */ + register_t md_saved_ipl; /* save IPL for critical section */ + u_int md_spinlock_count; }; #define MDP_UAC_NOPRINT 0x0010 /* Don't print unaligned traps */ ==== //depot/projects/smpng/sys/alpha/osf1/imgact_osf1.c#14 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/imgact_osf1.c,v 1.22 2005/01/29 23:11:57 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/imgact_osf1.c,v 1.23 2005/04/01 20:00:10 jhb Exp $"); #include #include @@ -189,14 +189,14 @@ /* set up text segment */ if ((error = vm_mmap(&vmspace->vm_map, &taddr, tsize, VM_PROT_READ|VM_PROT_EXECUTE, VM_PROT_ALL, MAP_FIXED|MAP_COPY, - (caddr_t)imgp->vp, ECOFF_TXTOFF(execp)))) { + OBJT_VNODE, imgp->vp, ECOFF_TXTOFF(execp)))) { DPRINTF(("%s(%d): error = %d\n", __FILE__, __LINE__, error)); goto bail; } /* .. data .. */ if ((error = vm_mmap(&vmspace->vm_map, &daddr, dsize, VM_PROT_READ|VM_PROT_EXECUTE|VM_PROT_WRITE, VM_PROT_ALL, - MAP_FIXED|MAP_COPY, (caddr_t)imgp->vp, ECOFF_DATOFF(execp)))) { + MAP_FIXED|MAP_COPY, OBJT_VNODE, imgp->vp, ECOFF_DATOFF(execp)))) { DPRINTF(("%s(%d): error = %d\n", __FILE__, __LINE__, error)); goto bail; } ==== //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#37 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.54 2005/03/31 22:56:14 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.55 2005/04/01 20:00:10 jhb Exp $"); #include #include @@ -1458,7 +1458,8 @@ if (uap->mask & OSF1_USW_NULLP) { rv = vm_mmap(&(p->p_vmspace->vm_map), &zero, PAGE_SIZE, VM_PROT_READ, VM_PROT_ALL, - MAP_PRIVATE | MAP_FIXED | MAP_ANON, NULL, 0); + MAP_PRIVATE | MAP_FIXED | MAP_ANON, OBJT_DEFAULT, + NULL, 0); if (!rv) return(KERN_SUCCESS); else { ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#38 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.632 2005/03/05 18:57:30 des Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.633 2005/04/04 21:53:52 jhb Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1302,6 +1302,30 @@ pcpu->pc_acpi_id = 0xffffffff; } +void +spinlock_enter(void) +{ + struct thread *td; + + td = curthread; + if (td->td_md.md_spinlock_count == 0) + td->td_md.md_saved_flags = intr_disable(); + td->td_md.md_spinlock_count++; + critical_enter(); +} + +void +spinlock_exit(void) +{ + struct thread *td; + + td = curthread; + critical_exit(); + td->td_md.md_spinlock_count--; + if (td->td_md.md_spinlock_count == 0) + intr_restore(td->td_md.md_saved_flags); +} + /* * Construct a PCB from a trapframe. This is called from kdb_trap() where * we want to start a backtrace from the function that caused us to enter ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.250 2005/02/28 23:37:35 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.251 2005/04/04 21:53:52 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -452,6 +452,10 @@ panic("cpuid mismatch! boom!!"); } + /* Initialize curthread. */ + KASSERT(PCPU_GET(idlethread) != NULL, ("no idle thread")); + PCPU_SET(curthread, PCPU_GET(idlethread)); + mtx_lock_spin(&ap_boot_mtx); /* Init local apic for irq's */ @@ -490,6 +494,18 @@ /* ok, now grab sched_lock and enter the scheduler */ mtx_lock_spin(&sched_lock); + /* + * Correct spinlock nesting. The idle thread context that we are + * borrowing was created so that it would start out with a single + * spin lock (sched_lock) held in fork_trampoline(). Since we've + * explicitly acquired locks in this function, the nesting count + * is now 2 rather than 1. Since we are nested, calling + * spinlock_exit() will simply adjust the counts without allowing + * spin lock using code to interrupt us. + */ + spinlock_exit(); + KASSERT(curthread->td_md.md_spinlock_count == 1, ("invalid count")); + binuptime(PCPU_PTR(switchtime)); PCPU_SET(switchticks, ticks); ==== //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#25 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.244 2005/01/21 05:57:45 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.245 2005/04/04 21:53:52 jhb Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -163,6 +163,10 @@ * pcb2->pcb_[fg]sbase: cloned above */ + /* Setup to release sched_lock in fork_exit(). */ + td2->td_md.md_spinlock_count = 1; + td2->td_md.md_saved_flags = PSL_KERNEL | PSL_I; + /* * Now, cpu_switch() can schedule the new process. * pcb_rsp is loaded pointing to the cpu_switch() stack frame @@ -294,6 +298,10 @@ * pcb2->pcb_onfault: cloned above (always NULL here?). * pcb2->pcb_[fg]sbase: cloned above */ + + /* Setup to release sched_lock in fork_exit(). */ + td->td_md.md_spinlock_count = 1; + td->td_md.md_saved_flags = PSL_KERNEL | PSL_I; } /* ==== //depot/projects/smpng/sys/amd64/include/floatingpoint.h#2 (text+ko) ==== @@ -31,12 +31,13 @@ * SUCH DAMAGE. * * from: @(#) floatingpoint.h 1.0 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/amd64/include/floatingpoint.h,v 1.13 2003/01/19 06:01:33 marcel Exp $ + * $FreeBSD: src/sys/amd64/include/floatingpoint.h,v 1.14 2005/04/02 17:31:42 netchild Exp $ */ #ifndef _FLOATINGPOINT_H_ #define _FLOATINGPOINT_H_ +#include #include #endif /* !_FLOATINGPOINT_H_ */ ==== //depot/projects/smpng/sys/amd64/include/proc.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)proc.h 7.1 (Berkeley) 5/15/91 - * $FreeBSD: src/sys/amd64/include/proc.h,v 1.23 2005/01/05 20:17:20 imp Exp $ + * $FreeBSD: src/sys/amd64/include/proc.h,v 1.24 2005/04/04 21:53:52 jhb Exp $ */ #ifndef _MACHINE_PROC_H_ @@ -37,7 +37,8 @@ * Machine-dependent part of the proc structure for AMD64. */ struct mdthread { - register_t md_savecrit; + int md_spinlock_count; /* (k) */ + register_t md_saved_flags; /* (k) */ }; struct mdproc { ==== //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.8 2005/03/31 22:57:21 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.9 2005/04/05 15:28:06 jhb Exp $"); #include #include @@ -590,7 +590,7 @@ printf(ARGS(mmap, "%p, %d, %d, 0x%08x, %d, %d"), (void *)(intptr_t)linux_args.addr, linux_args.len, linux_args.prot, linux_args.flags, linux_args.fd, - linux_args.pos); + linux_args.pgoff); #endif if ((linux_args.pgoff % PAGE_SIZE) != 0) return (EINVAL); ==== //depot/projects/smpng/sys/arm/arm/machdep.c#12 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.15 2005/03/01 20:12:52 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.16 2005/04/04 21:53:52 jhb Exp $"); #include #include @@ -390,6 +390,30 @@ { } +void +spinlock_enter(void) +{ + struct thread *td; + + td = curthread; + if (td->td_md.md_spinlock_count == 0) + td->td_md.md_saved_cspr = disable_interrupts(I32_bit | F32_bit); + td->td_md.md_spinlock_count++; + critical_enter(); +} + +void +spinlock_exit(void) +{ + struct thread *td; + + td = curthread; + critical_exit(); + td->td_md.md_spinlock_count--; + if (td->td_md.md_spinlock_count == 0) + restore_interrupts(td->td_md.md_saved_cspr); +} + /* * Clear registers on exec */ ==== //depot/projects/smpng/sys/arm/arm/vm_machdep.c#10 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.10 2005/01/05 21:58:47 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.11 2005/04/04 21:53:52 jhb Exp $"); #include #include @@ -129,6 +129,10 @@ tf->tf_r0 = 0; tf->tf_r1 = 0; pcb2->un_32.pcb32_sp = (u_int)sf; + + /* Setup to release sched_lock in fork_exit(). */ + td2->td_md.md_spinlock_count = 1; + td2->td_md.md_saved_cspr = 0; } void @@ -263,6 +267,10 @@ td->td_pcb->un_32.pcb32_sp = (u_int)sf; td->td_pcb->un_32.pcb32_und_sp = td->td_kstack + td->td_kstack_pages * PAGE_SIZE + USPACE_UNDEF_STACK_TOP; + + /* Setup to release sched_lock in fork_exit(). */ + td->td_md.md_spinlock_count = 1; + td->td_md.md_saved_cspr = 0; } /* ==== //depot/projects/smpng/sys/arm/include/proc.h#5 (text+ko) ==== @@ -32,7 +32,7 @@ * * from: @(#)proc.h 7.1 (Berkeley) 5/15/91 * from: FreeBSD: src/sys/i386/include/proc.h,v 1.11 2001/06/29 - * $FreeBSD: src/sys/arm/include/proc.h,v 1.4 2005/02/26 00:02:14 cognet Exp $ + * $FreeBSD: src/sys/arm/include/proc.h,v 1.5 2005/04/04 21:53:52 jhb Exp $ */ #ifndef _MACHINE_PROC_H_ @@ -46,7 +46,8 @@ }; struct mdthread { - register_t md_savecrit; + int md_spinlock_count; /* (k) */ + register_t md_saved_cspr; /* (k) */ int md_ptrace_instr; int md_ptrace_addr; void *md_tp; ==== //depot/projects/smpng/sys/boot/pc98/boot2/Makefile#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/boot2/Makefile,v 1.21 2004/12/21 09:59:44 ru Exp $ +# $FreeBSD: src/sys/boot/pc98/boot2/Makefile,v 1.22 2005/04/03 04:58:15 imp Exp $ # PROG= boot @@ -92,15 +92,23 @@ boot1 boot2 ${DESTDIR}${BINDIR} # If it's not there, don't consider it a target -.if exists(${.CURDIR}/../../../i386/include) +.if exists(${.CURDIR}/../../../pc98/include) beforedepend ${OBJS}: machine machine: - ln -sf ${.CURDIR}/../../../i386/include machine + ln -sf ${.CURDIR}/../../../pc98/include machine + +.endif + +.if exists(${.CURDIR}/../../../i386/include) +beforedepend ${OBJS}: i386 + +i386: + ln -sf ${.CURDIR}/../../../i386/include i386 .endif -CLEANFILES+= machine +CLEANFILES+= machine i386 .include "${.CURDIR}/../../../conf/kern.mk" .include ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#55 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.166 2005/03/07 00:18:06 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.167 2005/04/01 20:00:10 jhb Exp $"); #include "opt_mac.h" @@ -333,7 +333,7 @@ /* Pull in executable header into kernel_map */ error = vm_mmap(kernel_map, (vm_offset_t *)&a_out, PAGE_SIZE, - VM_PROT_READ, VM_PROT_READ, 0, (caddr_t)vp, 0); + VM_PROT_READ, VM_PROT_READ, 0, OBJT_VNODE, vp, 0); /* * Lock no longer needed */ @@ -422,7 +422,7 @@ /* map file into kernel_map */ error = vm_mmap(kernel_map, &buffer, round_page(a_out->a_text + a_out->a_data + file_offset), - VM_PROT_READ, VM_PROT_READ, 0, (caddr_t)vp, + VM_PROT_READ, VM_PROT_READ, 0, OBJT_VNODE, vp, trunc_page(file_offset)); if (error) goto cleanup; @@ -453,7 +453,7 @@ */ error = vm_mmap(&td->td_proc->p_vmspace->vm_map, &vmaddr, a_out->a_text + a_out->a_data, VM_PROT_ALL, VM_PROT_ALL, - MAP_PRIVATE | MAP_FIXED, (caddr_t)vp, file_offset); + MAP_PRIVATE | MAP_FIXED, OBJT_VNODE, vp, file_offset); if (error) goto cleanup; } ==== //depot/projects/smpng/sys/compat/svr4/imgact_svr4.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.24 2005/01/29 23:11:58 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.25 2005/04/01 20:00:10 jhb Exp $"); #include #include @@ -145,7 +145,7 @@ error = vm_mmap(kernel_map, &buffer, round_page(a_out->a_text + a_out->a_data + file_offset), VM_PROT_READ, VM_PROT_READ, 0, - (caddr_t) imgp->vp, trunc_page(file_offset)); + OBJT_VNODE, imgp->vp, trunc_page(file_offset)); if (error) goto fail; @@ -182,7 +182,7 @@ VM_PROT_READ | VM_PROT_EXECUTE, VM_PROT_ALL, MAP_PRIVATE | MAP_FIXED, - (caddr_t)imgp->vp, file_offset); + OBJT_VNODE, imgp->vp, file_offset); if (error) goto fail; ==== //depot/projects/smpng/sys/conf/Makefile.alpha#23 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.alpha -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.alpha 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.132 2005/02/10 21:15:31 jmg Exp $ +# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.133 2005/04/01 22:56:10 imp Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600001 +%VERSREQ= 600002 .if !defined(S) .if exists(./@/.) ==== //depot/projects/smpng/sys/conf/Makefile.amd64#9 (text+ko) ==== @@ -2,7 +2,7 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 # from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49 -# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.13 2005/02/10 21:15:31 jmg Exp $ +# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.14 2005/04/01 22:56:10 imp Exp $ # # Makefile for FreeBSD # @@ -18,7 +18,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600001 +%VERSREQ= 600002 STD8X16FONT?= iso ==== //depot/projects/smpng/sys/conf/Makefile.arm#7 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.arm -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.arm,v 1.6 2005/02/10 21:15:31 jmg Exp $ +# $FreeBSD: src/sys/conf/Makefile.arm,v 1.7 2005/04/01 22:56:10 imp Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600001 +%VERSREQ= 600002 # Temporary stuff while we're still embryonic NO_MODULES= ==== //depot/projects/smpng/sys/conf/Makefile.i386#21 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.i386,v 1.262 2005/02/10 21:15:31 jmg Exp $ +# $FreeBSD: src/sys/conf/Makefile.i386,v 1.263 2005/04/01 22:56:10 imp Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600001 +%VERSREQ= 600002 STD8X16FONT?= iso ==== //depot/projects/smpng/sys/conf/Makefile.ia64#28 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.ia64 -- with config changes. # Copyright 1990 W. Jolitz # from: src/sys/conf/Makefile.alpha,v 1.76 -# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.59 2005/02/10 21:15:31 jmg Exp $ +# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.60 2005/04/01 22:56:10 imp Exp $ # # Makefile for FreeBSD # @@ -19,7 +19,7 @@ GCC3= you bet # Which version of config(8) is required. -%VERSREQ= 600001 +%VERSREQ= 600002 STD8X16FONT?= iso ==== //depot/projects/smpng/sys/conf/Makefile.pc98#20 (text+ko) ==== @@ -3,7 +3,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.163 2005/02/10 21:15:31 jmg Exp $ +# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.165 2005/04/03 04:33:42 imp Exp $ # # Makefile for FreeBSD # @@ -19,7 +19,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600001 +%VERSREQ= 600002 .if !defined(S) .if exists(./@/.) @@ -30,7 +30,6 @@ .endif .include "$S/conf/kern.pre.mk" -EXTRA_KERNELDEP=rm -f ./machine ; ln -s $S/$M/include ./machine MKMODULESENV+= MACHINE=pc98 %BEFORE_DEPEND ==== //depot/projects/smpng/sys/conf/Makefile.powerpc#28 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.powerpc -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.274 2005/02/10 21:15:31 jmg Exp $ +# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.275 2005/04/01 22:56:10 imp Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600001 +%VERSREQ= 600002 STD8X16FONT?= iso ==== //depot/projects/smpng/sys/conf/Makefile.sparc64#24 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.sparc64 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.30 2005/02/10 21:15:31 jmg Exp $ +# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.31 2005/04/01 22:56:10 imp Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600001 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 5 18:37:56 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E17516A4D0; Tue, 5 Apr 2005 18:37:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 48B7A16A4CE for ; Tue, 5 Apr 2005 18:37:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE91543D54 for ; Tue, 5 Apr 2005 18:37:55 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j35IbtBL063768 for ; Tue, 5 Apr 2005 18:37:55 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j35IbtGt063764 for perforce@freebsd.org; Tue, 5 Apr 2005 18:37:55 GMT (envelope-from jhb@freebsd.org) Date: Tue, 5 Apr 2005 18:37:55 GMT Message-Id: <200504051837.j35IbtGt063764@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 74535 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Apr 2005 18:37:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=74535 Change 74535 by jhb@jhb_slimer on 2005/04/05 18:37:49 Replay these diffs since the files moved on me. Affected files ... .. //depot/projects/smpng/sys/i386/include/bus.h#5 edit .. //depot/projects/smpng/sys/pc98/include/bus.h#2 edit Differences ... ==== //depot/projects/smpng/sys/i386/include/bus.h#5 (text+ko) ==== @@ -330,8 +330,8 @@ 1: movb (%2),%%al \n\ stosb \n\ loop 1b" : - "=D" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : + "+D" (addr), "+c" (count) : + "r" (bsh + offset) : "%eax", "memory"); #else # ifndef lint @@ -363,8 +363,8 @@ 1: movw (%2),%%ax \n\ stosw \n\ loop 1b" : - "=D" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : + "+D" (addr), "+c" (count) : + "r" (bsh + offset) : "%eax", "memory"); #else # ifndef lint @@ -396,8 +396,8 @@ 1: movl (%2),%%eax \n\ stosl \n\ loop 1b" : - "=D" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : + "+D" (addr), "+c" (count) : + "r" (bsh + offset) : "%eax", "memory"); #else # ifndef lint @@ -450,9 +450,8 @@ stosb \n\ incl %2 \n\ loop 1b" : - "=D" (addr), "=c" (count), "=d" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : - "%eax", "memory", "cc"); + "+D" (addr), "+c" (count), "+d" (_port_) : : + "%eax", "memory"); #else # ifndef lint # error "no assembler code for your compiler" @@ -471,9 +470,8 @@ cld \n\ repne \n\ movsb" : - "=D" (addr), "=c" (count), "=S" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : - "memory", "cc"); + "+D" (addr), "+c" (count), "+S" (_port_) : : + "memory"); #else # ifndef lint # error "no assembler code for your compiler" @@ -500,9 +498,8 @@ stosw \n\ addl $2,%2 \n\ loop 1b" : - "=D" (addr), "=c" (count), "=d" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : - "%eax", "memory", "cc"); + "+D" (addr), "+c" (count), "+d" (_port_) : : + "%eax", "memory"); #else # ifndef lint # error "no assembler code for your compiler" @@ -521,9 +518,8 @@ cld \n\ repne \n\ movsw" : - "=D" (addr), "=c" (count), "=S" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : - "memory", "cc"); + "+D" (addr), "+c" (count), "+S" (_port_) : : + "memory"); #else # ifndef lint # error "no assembler code for your compiler" @@ -550,9 +546,8 @@ stosl \n\ addl $4,%2 \n\ loop 1b" : - "=D" (addr), "=c" (count), "=d" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : - "%eax", "memory", "cc"); + "+D" (addr), "+c" (count), "+d" (_port_) : : + "%eax", "memory"); #else # ifndef lint # error "no assembler code for your compiler" @@ -571,9 +566,8 @@ cld \n\ repne \n\ movsl" : - "=D" (addr), "=c" (count), "=S" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : - "memory", "cc"); + "+D" (addr), "+c" (count), "+S" (_port_) : : + "memory"); #else # ifndef lint # error "no assembler code for your compiler" @@ -705,9 +699,9 @@ 1: lodsb \n\ movb %%al,(%2) \n\ loop 1b" : - "=S" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : - "%eax", "memory", "cc"); + "+S" (addr), "+c" (count) : + "r" (bsh + offset) : + "%eax", "memory"); #else # ifndef lint # error "no assembler code for your compiler" @@ -738,9 +732,9 @@ 1: lodsw \n\ movw %%ax,(%2) \n\ loop 1b" : - "=S" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : - "%eax", "memory", "cc"); + "+S" (addr), "+c" (count) : + "r" (bsh + offset) : + "%eax", "memory"); #else # ifndef lint # error "no assembler code for your compiler" @@ -771,9 +765,9 @@ 1: lodsl \n\ movl %%eax,(%2) \n\ loop 1b" : - "=S" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : - "%eax", "memory", "cc"); + "+S" (addr), "+c" (count) : + "r" (bsh + offset) : + "%eax", "memory"); #else # ifndef lint # error "no assembler code for your compiler" @@ -826,9 +820,8 @@ outb %%al,%w0 \n\ incl %0 \n\ loop 1b" : - "=d" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : - "%eax", "memory", "cc"); + "+d" (_port_), "+S" (addr), "+c" (count) : : + "%eax", "memory"); #else # ifndef lint # error "no assembler code for your compiler" @@ -847,9 +840,8 @@ cld \n\ repne \n\ movsb" : - "=D" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : - "memory", "cc"); + "+D" (_port_), "+S" (addr), "+c" (count) : : + "memory"); #else # ifndef lint # error "no assembler code for your compiler" @@ -876,9 +868,8 @@ outw %%ax,%w0 \n\ addl $2,%0 \n\ loop 1b" : - "=d" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : - "%eax", "memory", "cc"); + "+d" (_port_), "+S" (addr), "+c" (count) : : + "%eax", "memory"); #else # ifndef lint # error "no assembler code for your compiler" @@ -897,9 +888,8 @@ cld \n\ repne \n\ movsw" : - "=D" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : - "memory", "cc"); + "+D" (_port_), "+S" (addr), "+c" (count) : : + "memory"); #else # ifndef lint # error "no assembler code for your compiler" @@ -926,9 +916,8 @@ outl %%eax,%w0 \n\ addl $4,%0 \n\ loop 1b" : - "=d" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : - "%eax", "memory", "cc"); + "+d" (_port_), "+S" (addr), "+c" (count) : : + "%eax", "memory"); #else # ifndef lint # error "no assembler code for your compiler" @@ -947,9 +936,8 @@ cld \n\ repne \n\ movsl" : - "=D" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : - "memory", "cc"); + "+D" (_port_), "+S" (addr), "+c" (count) : : + "memory"); #else # ifndef lint # error "no assembler code for your compiler" @@ -1329,7 +1317,7 @@ if (flags & BUS_SPACE_BARRIER_READ) __asm __volatile("lock; addl $0,0(%%esp)" : : : "memory"); else - __asm __volatile("" : : : "memory"); + /* nothing */; #else # ifndef lint # error "no assembler code for your compiler" ==== //depot/projects/smpng/sys/pc98/include/bus.h#2 (text+ko) ==== @@ -301,11 +301,10 @@ \ __asm __volatile("call *%2" \ :"=a" (result), \ - "=d" (offset) \ + "+d" (offset) \ :"o" (bsh->bsh_bam.bs_read_##BWN), \ - "b" (bsh), \ - "1" (offset) \ - ); \ + "b" (bsh) \ + :"ecx","memory"); \ \ return result; \ } @@ -327,12 +326,11 @@ { \ \ __asm __volatile("call *%1" \ - :"=d" (offset) \ + :"+d" (offset) \ :"o" (bsh->bsh_bam.bs_write_##BWN), \ "a" (val), \ - "b" (bsh), \ - "0" (offset) \ - ); \ + "b" (bsh) \ + :"ecx","memory"); \ } _BUS_SPACE_WRITE(u_int8_t,1) @@ -353,15 +351,12 @@ { \ \ __asm __volatile("call *%3" \ - :"=c" (cnt), \ - "=d" (offset), \ - "=D" (buf) \ + :"+c" (cnt), \ + "+d" (offset), \ + "+D" (buf) \ :"o" (bsh->bsh_bam.bs_read_multi_##BWN), \ - "b" (bsh), \ - "0" (cnt), \ - "1" (offset), \ - "2" (buf) \ - :"memory"); \ + "b" (bsh) \ + :"eax","memory"); \ } _BUS_SPACE_READ_MULTI(u_int8_t,1) @@ -382,15 +377,12 @@ { \ \ __asm __volatile("call *%3" \ - :"=c" (cnt), \ - "=d" (offset), \ - "=S" (buf) \ + :"+c" (cnt), \ + "+d" (offset), \ + "+S" (buf) \ :"o" (bsh->bsh_bam.bs_write_multi_##BWN), \ - "b" (bsh), \ - "0" (cnt), \ - "1" (offset), \ - "2" (buf) \ - ); \ + "b" (bsh) \ + :"eax","memory"); \ } _BUS_SPACE_WRITE_MULTI(u_int8_t,1) @@ -406,20 +398,17 @@ bus_space_tag_t tag; \ bus_space_handle_t bsh; \ bus_size_t offset; \ - TYPE *buf; \ + TYPE *buf; \ size_t cnt; \ { \ \ __asm __volatile("call *%3" \ - :"=c" (cnt), \ - "=d" (offset), \ - "=D" (buf) \ + :"+c" (cnt), \ + "+d" (offset), \ + "+D" (buf) \ :"o" (bsh->bsh_bam.bs_read_region_##BWN), \ - "b" (bsh), \ - "0" (cnt), \ - "1" (offset), \ - "2" (buf) \ - :"memory"); \ + "b" (bsh) \ + :"eax","memory"); \ } _BUS_SPACE_READ_REGION(u_int8_t,1) @@ -440,15 +429,12 @@ { \ \ __asm __volatile("call *%3" \ - :"=c" (cnt), \ - "=d" (offset), \ - "=S" (buf) \ + :"+c" (cnt), \ + "+d" (offset), \ + "+S" (buf) \ :"o" (bsh->bsh_bam.bs_write_region_##BWN), \ - "b" (bsh), \ - "0" (cnt), \ - "1" (offset), \ - "2" (buf) \ - ); \ + "b" (bsh) \ + :"eax","memory"); \ } _BUS_SPACE_WRITE_REGION(u_int8_t,1) @@ -469,14 +455,12 @@ { \ \ __asm __volatile("call *%2" \ - :"=c" (cnt), \ - "=d" (offset) \ + :"+c" (cnt), \ + "+d" (offset) \ :"o" (bsh->bsh_bam.bs_set_multi_##BWN), \ "a" (val), \ - "b" (bsh), \ - "0" (cnt), \ - "1" (offset) \ - ); \ + "b" (bsh) \ + :"memory"); \ } _BUS_SPACE_SET_MULTI(u_int8_t,1) @@ -497,14 +481,12 @@ { \ \ __asm __volatile("call *%2" \ - :"=c" (cnt), \ - "=d" (offset) \ + :"+c" (cnt), \ + "+d" (offset) \ :"o" (bsh->bsh_bam.bs_set_region_##BWN), \ "a" (val), \ - "b" (bsh), \ - "0" (cnt), \ - "1" (offset) \ - ); \ + "b" (bsh) \ + :"memory"); \ } _BUS_SPACE_SET_REGION(u_int8_t,1) @@ -529,16 +511,13 @@ panic("bus_space_copy_region: funcs mismatch (ENOSUPPORT)");\ \ __asm __volatile("call *%3" \ - :"=c" (cnt), \ - "=S" (src), \ - "=D" (dst) \ + :"+c" (cnt), \ + "+S" (src), \ + "+D" (dst) \ :"o" (dbsh->bsh_bam.bs_copy_region_##BWN), \ "a" (sbsh), \ - "b" (dbsh), \ - "0" (cnt), \ - "1" (src), \ - "2" (dst) \ - ); \ + "b" (dbsh) \ + :"edx","memory"); \ } _BUS_SPACE_COPY_REGION(1) From owner-p4-projects@FreeBSD.ORG Tue Apr 5 18:39:59 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A7AE16A4D0; Tue, 5 Apr 2005 18:39:59 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 17D4416A4CE for ; Tue, 5 Apr 2005 18:39:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E226643D49 for ; Tue, 5 Apr 2005 18:39:58 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j35Idwaw063912 for ; Tue, 5 Apr 2005 18:39:58 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j35Idwwg063909 for perforce@freebsd.org; Tue, 5 Apr 2005 18:39:58 GMT (envelope-from jhb@freebsd.org) Date: Tue, 5 Apr 2005 18:39:58 GMT Message-Id: <200504051839.j35Idwwg063909@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 74536 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Apr 2005 18:39:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=74536 Change 74536 by jhb@jhb_slimer on 2005/04/05 18:39:14 IFC @74534. Affected files ... .. //depot/projects/smpng/sys/sparc64/sparc64/critical.c#8 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 5 18:42:02 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35B7616A4D0; Tue, 5 Apr 2005 18:42:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1252316A4CE for ; Tue, 5 Apr 2005 18:42:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB06A43D31 for ; Tue, 5 Apr 2005 18:42:01 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j35Ig1Fd064088 for ; Tue, 5 Apr 2005 18:42:01 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j35Ig1wa064085 for perforce@freebsd.org; Tue, 5 Apr 2005 18:42:01 GMT (envelope-from jhb@freebsd.org) Date: Tue, 5 Apr 2005 18:42:01 GMT Message-Id: <200504051842.j35Ig1wa064085@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 74537 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Apr 2005 18:42:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=74537 Change 74537 by jhb@jhb_slimer on 2005/04/05 18:41:23 Update. Affected files ... .. //depot/projects/smpng/sys/notes#35 edit Differences ... ==== //depot/projects/smpng/sys/notes#35 (text+ko) ==== @@ -91,7 +91,7 @@ Active child branches: - jhb_intr - intr_vector stuff - jhb_ktrace - kernel debugging stuff, possibly per-thread ktrace -- jhb_lock - critical section optimization + rwlocks +- jhb_lock - rwlocks - jhb_needresched - scheduler fun - jhb_preemption - preemption - jhb_proc - proc locking, ABI stuff From owner-p4-projects@FreeBSD.ORG Tue Apr 5 22:37:03 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D0BD16A4D0; Tue, 5 Apr 2005 22:37:03 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7268316A4CE for ; Tue, 5 Apr 2005 22:37:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A9A843D4C for ; Tue, 5 Apr 2005 22:37:03 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j35Mb32D083707 for ; Tue, 5 Apr 2005 22:37:03 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j35Mb2aH083702 for perforce@freebsd.org; Tue, 5 Apr 2005 22:37:02 GMT (envelope-from peter@freebsd.org) Date: Tue, 5 Apr 2005 22:37:02 GMT Message-Id: <200504052237.j35Mb2aH083702@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 74553 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Apr 2005 22:37:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=74553 Change 74553 by peter@peter_melody on 2005/04/05 22:37:02 Fix 32 bit signals. Oops! I was causing 32 bit values to be sign extended. This didn't matter when being loaded in 32 bit mode, because they'd be truncated and saved for next time. However... if there were two back-to-back signals and there was a pending signal when sigreturn was exiting, we'd try and deliver it. Except we'd use the sign extended stack location and of course, copyout would fail. Affected files ... .. //depot/projects/hammer/sys/compat/ia32/ia32_signal.h#9 edit Differences ... ==== //depot/projects/hammer/sys/compat/ia32/ia32_signal.h#9 (text+ko) ==== @@ -36,36 +36,36 @@ }; struct ia32_mcontext { - int mc_onstack; /* XXX - sigcontext compat. */ - int mc_gs; /* machine state (struct trapframe) */ - int mc_fs; - int mc_es; - int mc_ds; - int mc_edi; - int mc_esi; - int mc_ebp; - int mc_isp; - int mc_ebx; - int mc_edx; - int mc_ecx; - int mc_eax; - int mc_trapno; - int mc_err; - int mc_eip; - int mc_cs; - int mc_eflags; - int mc_esp; - int mc_ss; - int mc_len; /* sizeof(struct ia32_mcontext) */ + u_int32_t mc_onstack; /* XXX - sigcontext compat. */ + u_int32_t mc_gs; /* machine state (struct trapframe) */ + u_int32_t mc_fs; + u_int32_t mc_es; + u_int32_t mc_ds; + u_int32_t mc_edi; + u_int32_t mc_esi; + u_int32_t mc_ebp; + u_int32_t mc_isp; + u_int32_t mc_ebx; + u_int32_t mc_edx; + u_int32_t mc_ecx; + u_int32_t mc_eax; + u_int32_t mc_trapno; + u_int32_t mc_err; + u_int32_t mc_eip; + u_int32_t mc_cs; + u_int32_t mc_eflags; + u_int32_t mc_esp; + u_int32_t mc_ss; + u_int32_t mc_len; /* sizeof(struct ia32_mcontext) */ /* We use the same values for fpformat and ownedfp */ - int mc_fpformat; - int mc_ownedfp; - int mc_spare1[1]; /* align next field to 16 bytes */ + u_int32_t mc_fpformat; + u_int32_t mc_ownedfp; + u_int32_t mc_spare1[1]; /* align next field to 16 bytes */ /* * See for the internals of mc_fpstate[]. */ - int mc_fpstate[128] __aligned(16); - int mc_spare2[8]; + u_int32_t mc_fpstate[128] __aligned(16); + u_int32_t mc_spare2[8]; }; struct ia32_ucontext { @@ -73,35 +73,35 @@ struct ia32_mcontext uc_mcontext; u_int32_t uc_link; struct ia32_sigaltstack uc_stack; - int uc_flags; - int __spare__[4]; + u_int32_t uc_flags; + u_int32_t __spare__[4]; }; #if defined(COMPAT_FREEBSD4) struct ia32_mcontext4 { - int mc_onstack; /* XXX - sigcontext compat. */ - int mc_gs; /* machine state (struct trapframe) */ - int mc_fs; - int mc_es; - int mc_ds; - int mc_edi; - int mc_esi; - int mc_ebp; - int mc_isp; - int mc_ebx; - int mc_edx; - int mc_ecx; - int mc_eax; - int mc_trapno; - int mc_err; - int mc_eip; - int mc_cs; - int mc_eflags; - int mc_esp; - int mc_ss; - int mc_fpregs[28]; - int __spare__[17]; + u_int32_t mc_onstack; /* XXX - sigcontext compat. */ + u_int32_t mc_gs; /* machine state (struct trapframe) */ + u_int32_t mc_fs; + u_int32_t mc_es; + u_int32_t mc_ds; + u_int32_t mc_edi; + u_int32_t mc_esi; + u_int32_t mc_ebp; + u_int32_t mc_isp; + u_int32_t mc_ebx; + u_int32_t mc_edx; + u_int32_t mc_ecx; + u_int32_t mc_eax; + u_int32_t mc_trapno; + u_int32_t mc_err; + u_int32_t mc_eip; + u_int32_t mc_cs; + u_int32_t mc_eflags; + u_int32_t mc_esp; + u_int32_t mc_ss; + u_int32_t mc_fpregs[28]; + u_int32_t __spare__[17]; }; struct ia32_ucontext4 { @@ -109,33 +109,33 @@ struct ia32_mcontext4 uc_mcontext; u_int32_t uc_link; struct ia32_sigaltstack uc_stack; - int __spare__[8]; + u_int32_t __spare__[8]; }; #endif #ifdef COMPAT_FREEBSD3 struct ia32_sigcontext3 { - int sc_onstack; - u_int32_t sc_mask; - int sc_esp; - int sc_ebp; - int sc_isp; - int sc_eip; - int sc_eflags; - int sc_es; - int sc_ds; - int sc_cs; - int sc_ss; - int sc_edi; - int sc_esi; - int sc_ebx; - int sc_edx; - int sc_ecx; - int sc_eax; - int sc_gs; - int sc_fs; - int sc_trapno; - int sc_err; + u_int32_t sc_onstack; + u_int32_t sc_mask; + u_int32_t sc_esp; + u_int32_t sc_ebp; + u_int32_t sc_isp; + u_int32_t sc_eip; + u_int32_t sc_eflags; + u_int32_t sc_es; + u_int32_t sc_ds; + u_int32_t sc_cs; + u_int32_t sc_ss; + u_int32_t sc_edi; + u_int32_t sc_esi; + u_int32_t sc_ebx; + u_int32_t sc_edx; + u_int32_t sc_ecx; + u_int32_t sc_eax; + u_int32_t sc_gs; + u_int32_t sc_fs; + u_int32_t sc_trapno; + u_int32_t sc_err; }; #endif From owner-p4-projects@FreeBSD.ORG Wed Apr 6 01:21:28 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A634B16A4EE; Wed, 6 Apr 2005 01:21:27 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A195D16A4D5 for ; Wed, 6 Apr 2005 01:21:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C56843D45 for ; Wed, 6 Apr 2005 01:21:26 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j361LQwr097095 for ; Wed, 6 Apr 2005 01:21:26 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j361LPJE097092 for perforce@freebsd.org; Wed, 6 Apr 2005 01:21:25 GMT (envelope-from peter@freebsd.org) Date: Wed, 6 Apr 2005 01:21:25 GMT Message-Id: <200504060121.j361LPJE097092@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 74564 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Apr 2005 01:21:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=74564 Change 74564 by peter@peter_melody on 2005/04/06 01:21:02 Make this compile again, oops. Affected files ... .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#30 edit Differences ... ==== //depot/projects/hammer/libexec/rtld-elf/rtld.c#30 (text+ko) ==== @@ -870,7 +870,7 @@ return NULL; } #ifdef COMPAT_32BIT - name = lm_find(NULL, xname)); + name = lm_find(NULL, xname); if (name) return xstrdup(name); else From owner-p4-projects@FreeBSD.ORG Wed Apr 6 01:22:28 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AEBA16A4D0; Wed, 6 Apr 2005 01:22:28 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2EDA016A4CE for ; Wed, 6 Apr 2005 01:22:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0003043D41 for ; Wed, 6 Apr 2005 01:22:27 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j361MRkc097126 for ; Wed, 6 Apr 2005 01:22:27 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j361MR05097123 for perforce@freebsd.org; Wed, 6 Apr 2005 01:22:27 GMT (envelope-from peter@freebsd.org) Date: Wed, 6 Apr 2005 01:22:27 GMT Message-Id: <200504060122.j361MR05097123@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 74565 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Apr 2005 01:22:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=74565 Change 74565 by peter@peter_melody on 2005/04/06 01:22:06 Warner's commit from a few days ago to src/include/Makefile exposed the fact that I wasn't overriding $MACHINE for make, and it was defaulting to "amd64". Affected files ... .. //depot/projects/hammer/Makefile.inc1#88 edit Differences ... ==== //depot/projects/hammer/Makefile.inc1#88 (text+ko) ==== @@ -223,6 +223,7 @@ # Yes, the flags are redundant. LIB32MAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ _SHLIBDIRPREFIX=${LIB32TMP} \ + MACHINE=i386 \ MACHINE_ARCH=i386 \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} \ From owner-p4-projects@FreeBSD.ORG Wed Apr 6 21:12:50 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 856AE16A4D0; Wed, 6 Apr 2005 21:12:50 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B41016A4CE for ; Wed, 6 Apr 2005 21:12:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2251643D58 for ; Wed, 6 Apr 2005 21:12:50 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j36LCnVa082392 for ; Wed, 6 Apr 2005 21:12:50 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j36LCngY082389 for perforce@freebsd.org; Wed, 6 Apr 2005 21:12:49 GMT (envelope-from cognet@freebsd.org) Date: Wed, 6 Apr 2005 21:12:49 GMT Message-Id: <200504062112.j36LCngY082389@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Subject: PERFORCE change 74614 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Apr 2005 21:12:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=74614 Change 74614 by cognet@cognet on 2005/04/06 21:12:08 Attempt to get more love from gcc. I don't think this is the right fix, and I should poke gcc people about that, but it seems to make an arm -O/-O2 world usable. Approved by: mux (mentor) Affected files ... .. //depot/projects/arm/contrib-arm.diff#3 edit Differences ... ==== //depot/projects/arm/contrib-arm.diff#3 (text+ko) ==== @@ -13,6 +13,53 @@ + +unset STACK_ADDR +unset EMBEDDED +Index: contrib/gcc/config/arm/arm.md +=================================================================== +RCS file: /home/ncvs/src/contrib/gcc/config/arm/arm.md,v +retrieving revision 1.1.1.6 +diff -u -p -r1.1.1.6 arm.md +--- contrib/gcc/config/arm/arm.md 28 Jul 2004 03:11:35 -0000 1.1.1.6 ++++ contrib/gcc/config/arm/arm.md 6 Apr 2005 20:06:06 -0000 +@@ -8834,12 +8834,12 @@ + ldm[2] = operands[4]; + } + if (GET_CODE (XEXP (operands[2], 0)) != REG) +- val1 = INTVAL (XEXP (XEXP (operands[2], 0), 1)); ++ val1 = INTVAL (XEXP (XEXP (operands[2], 0), 1)); + if (GET_CODE (XEXP (operands[3], 0)) != REG) +- val2 = INTVAL (XEXP (XEXP (operands[3], 0), 1)); ++ val2 = INTVAL (XEXP (XEXP (operands[3], 0), 1)); + arith[0] = operands[0]; + arith[3] = operands[1]; +- if (val1 < val2) ++ if (val1 <= val2) + { + arith[1] = ldm[1]; + arith[2] = ldm[2]; +@@ -8869,7 +8869,7 @@ + else + output_asm_insn (\"ldm%?ia\\t%0, {%1, %2}\", ldm); + } +- else ++ else if (val2) + { + ldm[0] = XEXP (operands[2], 0); + if (val1 < val2) +@@ -8877,6 +8877,14 @@ + else + output_asm_insn (\"ldm%?da\\t%0, {%1, %2}\", ldm); + } ++ else { ++ ldm[0] = operands[0]; ++ ldm[1] = XEXP(operands[2], 0); ++ output_asm_insn(\"ldr\\t%0, [%1]\", ldm); ++ ldm[0] = operands[4]; ++ ldm[1] = XEXP(operands[3], 0); ++ output_asm_insn(\"ldr\\t%0, [%1]\", ldm); ++ } + output_asm_insn (\"%I3%?\\t%0, %1, %2\", arith); + return \"\"; + }" Index: contrib/gcc/config/arm/freebsd.h =================================================================== RCS file: /home/ncvs/src/contrib/gcc/config/arm/freebsd.h,v From owner-p4-projects@FreeBSD.ORG Thu Apr 7 06:28:57 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78CA516A4D0; Thu, 7 Apr 2005 06:28:57 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 232D316A4CE for ; Thu, 7 Apr 2005 06:28:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3365D43D3F for ; Thu, 7 Apr 2005 06:28:56 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j376SuKW018503 for ; Thu, 7 Apr 2005 06:28:56 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j376Sosn018482 for perforce@freebsd.org; Thu, 7 Apr 2005 06:28:50 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 7 Apr 2005 06:28:50 GMT Message-Id: <200504070628.j376Sosn018482@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74639 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2005 06:28:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=74639 Change 74639 by davidxu@davidxu_celeron on 2005/04/07 06:28:43 IFC. Affected files ... .. //depot/projects/davidxu_thread/src/Makefile.inc1#12 integrate .. //depot/projects/davidxu_thread/src/etc/defaults/rc.conf#9 integrate .. //depot/projects/davidxu_thread/src/etc/rc.d/dumpon#2 integrate .. //depot/projects/davidxu_thread/src/etc/rc.d/pf#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#4 integrate .. //depot/projects/davidxu_thread/src/include/Makefile#8 integrate .. //depot/projects/davidxu_thread/src/include/pthread.h#3 integrate .. //depot/projects/davidxu_thread/src/lib/libalias/alias.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libarchive/archive_private.h#2 integrate .. //depot/projects/davidxu_thread/src/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/davidxu_thread/src/lib/libarchive/archive_read_support_format_cpio.c#4 integrate .. //depot/projects/davidxu_thread/src/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libarchive/archive_read_support_format_tar.c#5 integrate .. //depot/projects/davidxu_thread/src/lib/libarchive/archive_read_support_format_zip.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/net/Makefile.inc#3 integrate .. //depot/projects/davidxu_thread/src/lib/libc/net/gai_strerror.c#1 branch .. //depot/projects/davidxu_thread/src/lib/libc/net/getaddrinfo.c#3 integrate .. //depot/projects/davidxu_thread/src/lib/libc/net/name6.c#4 integrate .. //depot/projects/davidxu_thread/src/lib/libc/yp/yplib.c#4 integrate .. //depot/projects/davidxu_thread/src/lib/libthr/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/lib/libthr/pthread.map#2 integrate .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_barrier.c#3 integrate .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_init.c#6 integrate .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_list.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_private.h#6 integrate .. //depot/projects/davidxu_thread/src/lib/libthread_db/libpthread_db.c#3 integrate .. //depot/projects/davidxu_thread/src/lib/libthread_db/libthr_db.c#4 integrate .. //depot/projects/davidxu_thread/src/lib/libthread_db/thread_db.h#3 integrate .. //depot/projects/davidxu_thread/src/lib/msun/Makefile#7 integrate .. //depot/projects/davidxu_thread/src/lib/msun/man/exp.3#4 integrate .. //depot/projects/davidxu_thread/src/lib/msun/man/math.3#6 integrate .. //depot/projects/davidxu_thread/src/lib/msun/src/k_rem_pio2f.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/msun/src/math.h#6 integrate .. //depot/projects/davidxu_thread/src/lib/msun/src/s_exp2.c#1 branch .. //depot/projects/davidxu_thread/src/lib/msun/src/s_exp2f.c#1 branch .. //depot/projects/davidxu_thread/src/libexec/getty/chat.c#2 integrate .. //depot/projects/davidxu_thread/src/libexec/getty/extern.h#2 integrate .. //depot/projects/davidxu_thread/src/libexec/getty/init.c#2 integrate .. //depot/projects/davidxu_thread/src/libexec/getty/main.c#2 integrate .. //depot/projects/davidxu_thread/src/libexec/rexecd/rexecd.c#7 integrate .. //depot/projects/davidxu_thread/src/libexec/rtld-aout/shlib.c#2 edit .. //depot/projects/davidxu_thread/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#8 integrate .. //depot/projects/davidxu_thread/src/release/doc/share/sgml/release.ent#3 integrate .. //depot/projects/davidxu_thread/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#3 integrate .. //depot/projects/davidxu_thread/src/release/doc/zh_CN.GB2312/installation/common/install.sgml#3 integrate .. //depot/projects/davidxu_thread/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#3 integrate .. //depot/projects/davidxu_thread/src/sbin/devfs/devfs.8#5 integrate .. //depot/projects/davidxu_thread/src/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/davidxu_thread/src/sbin/restore/dirs.c#3 integrate .. //depot/projects/davidxu_thread/src/sbin/restore/restore.h#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/ng_source.4#4 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/devclass_get_drivers.9#1 branch .. //depot/projects/davidxu_thread/src/share/man/man9/devclass_get_maxunit.9#2 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/alpha/critical.c#2 delete .. //depot/projects/davidxu_thread/src/sys/alpha/alpha/machdep.c#8 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/alpha/mp_machdep.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/alpha/vm_machdep.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/include/critical.h#4 delete .. //depot/projects/davidxu_thread/src/sys/alpha/include/proc.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/amd64/critical.c#2 delete .. //depot/projects/davidxu_thread/src/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/amd64/vm_machdep.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/include/critical.h#4 delete .. //depot/projects/davidxu_thread/src/sys/amd64/include/proc.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/include/tss.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/linux32/linux32_machdep.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/critical.c#2 delete .. //depot/projects/davidxu_thread/src/sys/arm/arm/machdep.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/vm_machdep.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/arm/include/critical.h#2 delete .. //depot/projects/davidxu_thread/src/sys/arm/include/proc.h#4 integrate .. //depot/projects/davidxu_thread/src/sys/boot/pc98/boot2/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/conf/Makefile.pc98#4 integrate .. //depot/projects/davidxu_thread/src/sys/conf/NOTES#9 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files.alpha#4 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files.amd64#9 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files.arm#3 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files.i386#10 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files.ia64#3 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files.pc98#5 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files.powerpc#2 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files.sparc64#5 integrate .. //depot/projects/davidxu_thread/src/sys/conf/kern.post.mk#5 integrate .. //depot/projects/davidxu_thread/src/sys/conf/kmod.mk#6 integrate .. //depot/projects/davidxu_thread/src/sys/conf/options#8 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi_if.m#5 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi_perf.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpivar.h#9 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-card.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-cbus.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-isa.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-lowlevel.c#8 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-pci.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ath/if_ath.c#8 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/davidxu_thread/src/sys/dev/em/if_em.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/dev/hme/if_hme_sbus.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ieee488/upd7210.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ixgb/if_ixgb.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ixgb/if_ixgb.h#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/sio/sio_pci.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/syscons/apm/apm_saver.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/uftdi.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/davidxu_thread/src/sys/fs/unionfs/union_vnops.c#8 integrate .. //depot/projects/davidxu_thread/src/sys/geom/concat/g_concat.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/critical.c#2 delete .. //depot/projects/davidxu_thread/src/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/mp_machdep.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/i386/include/apm_bios.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/i386/include/bus.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/include/bus_at386.h#5 delete .. //depot/projects/davidxu_thread/src/sys/i386/include/bus_pc98.h#3 delete .. //depot/projects/davidxu_thread/src/sys/i386/include/critical.h#4 delete .. //depot/projects/davidxu_thread/src/sys/i386/include/legacyvar.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/include/md_var.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/include/pci_cfgreg.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/i386/include/proc.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/ia64/ia64/critical.c#2 delete .. //depot/projects/davidxu_thread/src/sys/ia64/ia64/machdep.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/ia64/ia64/vm_machdep.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/ia64/include/critical.h#4 delete .. //depot/projects/davidxu_thread/src/sys/ia64/include/proc.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_fork.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_idle.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_jail.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_lock.c#8 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_proc.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_switch.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/kern/subr_bus.c#9 integrate .. //depot/projects/davidxu_thread/src/sys/kern/subr_prf.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_default.c#8 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_lookup.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_vnops.c#8 integrate .. //depot/projects/davidxu_thread/src/sys/modules/ata/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/modules/ata/atapicam/Makefile#1 branch .. //depot/projects/davidxu_thread/src/sys/modules/cpufreq/Makefile#4 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_crypto.h#4 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_freebsd.h#4 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_input.c#8 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_node.h#4 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_proto.h#4 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/bluetooth/socket/ng_btsocket.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/ng_iface.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/ng_source.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/ng_source.h#5 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/ip_dummynet.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/ip_fw_pfil.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/pc98/i386/machdep.c#8 integrate .. //depot/projects/davidxu_thread/src/sys/pc98/include/apm_bios.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/pc98/include/bus.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/pc98/include/bus_pc98.h#2 delete .. //depot/projects/davidxu_thread/src/sys/pc98/include/critical.h#2 delete .. //depot/projects/davidxu_thread/src/sys/pc98/include/md_var.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/pc98/include/pci_cfgreg.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/powerpc/include/critical.h#4 delete .. //depot/projects/davidxu_thread/src/sys/powerpc/include/proc.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/powerpc/powerpc/critical.c#2 delete .. //depot/projects/davidxu_thread/src/sys/powerpc/powerpc/machdep.c#8 integrate .. //depot/projects/davidxu_thread/src/sys/powerpc/powerpc/vm_machdep.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/include/critical.h#4 delete .. //depot/projects/davidxu_thread/src/sys/sparc64/include/proc.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/critical.c#2 delete .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/machdep.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/vm_machdep.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/sys/bus.h#7 integrate .. //depot/projects/davidxu_thread/src/sys/sys/lock.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sys/mutex.h#5 integrate .. //depot/projects/davidxu_thread/src/sys/sys/systm.h#8 integrate .. //depot/projects/davidxu_thread/src/sys/ufs/ffs/ffs_extern.h#4 integrate .. //depot/projects/davidxu_thread/src/sys/ufs/ffs/ffs_inode.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/ufs/ffs/ffs_snapshot.c#8 integrate .. //depot/projects/davidxu_thread/src/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/ufs/ffs/ffs_vfsops.c#8 integrate .. //depot/projects/davidxu_thread/src/sys/vm/vm_meter.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/vm/vnode_pager.c#8 integrate .. //depot/projects/davidxu_thread/src/usr.bin/calendar/calendars/calendar.birthday#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/job.c#11 integrate .. //depot/projects/davidxu_thread/src/usr.bin/mt/mt.1#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/top/machine.c#2 integrate Differences ... ==== //depot/projects/davidxu_thread/src/Makefile.inc1#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.490 2005/03/27 19:35:09 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.492 2005/04/06 01:55:43 peter Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -223,6 +223,7 @@ # Yes, the flags are redundant. LIB32MAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ _SHLIBDIRPREFIX=${LIB32TMP} \ + MACHINE=i386 \ MACHINE_ARCH=i386 \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} \ @@ -454,7 +455,7 @@ WMAKE_TGTS+= _cross-tools .endif WMAKE_TGTS+= _includes _libraries _depend everything -.if ${TARGET_ARCH} == "amd64" && defined(WITH_LIB32) +.if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32) WMAKE_TGTS+= build32 .endif @@ -540,7 +541,7 @@ @echo ">>> Installing everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install -.if ${TARGET_ARCH} == "amd64" && defined(WITH_LIB32) +.if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32) ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32 .endif ==== //depot/projects/davidxu_thread/src/etc/defaults/rc.conf#9 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.243 2005/03/12 21:09:15 trhodes Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.244 2005/04/03 21:45:20 njl Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -474,9 +474,9 @@ devfs_set_rulesets="" # A list of /mount/dev=ruleset_name settings to # apply (must be mounted already, i.e. fstab(5)) performance_cx_lowest="HIGH" # Online CPU idle state -performance_cpu_freq="NONE" # Online CPU frequency +performance_cpu_freq="HIGH" # Online CPU frequency economy_cx_lowest="HIGH" # Offline CPU idle state -economy_cpu_freq="NONE" # Offline CPU frequency +economy_cpu_freq="HIGH" # Offline CPU frequency virecover_enable="YES" # Perform housekeeping for the vi(1) editor ugidfw_enable="NO" # Load mac_bsdextended(4) rules on boot bsdextended_script="/etc/rc.bsdextended" # Default mac_bsdextended(4) ==== //depot/projects/davidxu_thread/src/etc/rc.d/dumpon#2 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/dumpon,v 1.7 2004/10/18 23:40:13 thomas Exp $ +# $FreeBSD: src/etc/rc.d/dumpon,v 1.8 2005/04/05 18:59:24 obrien Exp $ # # PROVIDE: dumpon -# REQUIRE: initrandom -# BEFORE: disks savecore +# REQUIRE: rcconf +# BEFORE: disks savecore initrandom # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/davidxu_thread/src/etc/rc.d/pf#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/pf,v 1.6 2004/10/25 08:12:28 pjd Exp $ +# $FreeBSD: src/etc/rc.d/pf,v 1.7 2005/04/04 23:06:10 seanc Exp $ # # PROVIDE: pf @@ -75,7 +75,9 @@ echo "Reloading pf rules." ${pf_program:-/sbin/pfctl} -n -f "${pf_rules}" || return 1 - ${pf_program:-/sbin/pfctl} -Fa > /dev/null 2>&1 + # Flush everything but existing state entries that way when + # rules are read in, it doesn't break established connections. + ${pf_program:-/sbin/pfctl} -Fnat -Fqueue -Frules -FSources -Finfo -FTables -Fosfp > /dev/null 2>&1 ${pf_program:-/sbin/pfctl} -f "${pf_rules}" ${pf_flags} } ==== //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.9 2005/01/11 14:53:16 peadar Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.10 2005/04/05 11:40:58 davidxu Exp $ */ /* FreeBSD libthread_db assisted debugging support. Copyright 1999, 2000, 2001 Free Software Foundation, Inc. ==== //depot/projects/davidxu_thread/src/include/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.238 2005/04/01 23:22:01 imp Exp $ +# $FreeBSD: src/include/Makefile,v 1.239 2005/04/03 04:53:23 imp Exp $ # # Doing a "make install" builds /usr/include. @@ -162,10 +162,14 @@ ${DESTDIR}${INCLUDEDIR}/machine/pc .endif .if defined(_MARCH) + ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \ + ${DESTDIR}${INCLUDEDIR}/${_MARCH}; \ cd ${.CURDIR}/../sys/${_MARCH}/include; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/${_MARCH} .if exists(${.CURDIR}/../sys/${_MARCH}/include/pc) + ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \ + ${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \ cd ${.CURDIR}/../sys/${_MARCH}/include/pc; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc @@ -240,12 +244,16 @@ done .endif .if defined(_MARCH) + ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \ + ${DESTDIR}${INCLUDEDIR}/${_MARCH}; \ cd ${.CURDIR}/../sys/${_MARCH}/include; \ for h in *.h; do \ ln -fs ../../../sys/${_MARCH}/include/$$h \ ${DESTDIR}${INCLUDEDIR}/${_MARCH}; \ done .if exists(${.CURDIR}/../sys/${_MARCH}/include/pc) + ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \ + ${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \ cd ${.CURDIR}/../sys/${_MARCH}/include/pc; \ for h in *.h; do \ ln -fs ../../../../sys/${_MARCH}/include/pc/$$h \ ==== //depot/projects/davidxu_thread/src/include/pthread.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/pthread.h,v 1.33 2005/01/08 11:07:13 davidxu Exp $ + * $FreeBSD: src/include/pthread.h,v 1.34 2005/04/03 23:55:02 davidxu Exp $ */ #ifndef _PTHREAD_H_ #define _PTHREAD_H_ @@ -225,6 +225,10 @@ void pthread_cleanup_push(void (*) (void *), void *routine_arg); int pthread_condattr_destroy(pthread_condattr_t *); int pthread_condattr_init(pthread_condattr_t *); +int pthread_condattr_getclock(const pthread_condattr_t *, + clockid_t *); +int pthread_condattr_setclock(pthread_condattr_t *, + clockid_t); int pthread_cond_broadcast(pthread_cond_t *); int pthread_cond_destroy(pthread_cond_t *); ==== //depot/projects/davidxu_thread/src/lib/libalias/alias.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libalias/alias.c,v 1.49 2004/08/14 14:21:09 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libalias/alias.c,v 1.50 2005/04/05 13:04:35 phk Exp $"); /* Alias.c provides supervisory control for the functions of the @@ -1170,7 +1170,7 @@ if (la->packetAliasMode & PKT_ALIAS_REVERSE) { la->packetAliasMode &= ~PKT_ALIAS_REVERSE; - iresult = PacketAliasOut(ptr, maxpacketsize); + iresult = LibAliasOut(la, ptr, maxpacketsize); la->packetAliasMode |= PKT_ALIAS_REVERSE; return (iresult); } @@ -1264,7 +1264,7 @@ if (la->packetAliasMode & PKT_ALIAS_REVERSE) { la->packetAliasMode &= ~PKT_ALIAS_REVERSE; - iresult = PacketAliasIn(ptr, maxpacketsize); + iresult = LibAliasIn(la, ptr, maxpacketsize); la->packetAliasMode |= PKT_ALIAS_REVERSE; return (iresult); } ==== //depot/projects/davidxu_thread/src/lib/libarchive/archive_private.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.16 2004/11/06 05:25:53 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.17 2005/04/06 04:19:30 kientzle Exp $ */ #ifndef ARCHIVE_PRIVATE_H_INCLUDED @@ -156,6 +156,7 @@ int (*bid)(struct archive *); int (*read_header)(struct archive *, struct archive_entry *); int (*read_data)(struct archive *, const void **, size_t *, off_t *); + int (*read_data_skip)(struct archive *); int (*cleanup)(struct archive *); void *format_data; /* Format-specific data for readers. */ } formats[4]; @@ -229,6 +230,7 @@ int (*bid)(struct archive *), int (*read_header)(struct archive *, struct archive_entry *), int (*read_data)(struct archive *, const void **, size_t *, off_t *), + int (*read_data_skip)(struct archive *), int (*cleanup)(struct archive *)); int __archive_read_register_compression(struct archive *a, ==== //depot/projects/davidxu_thread/src/lib/libarchive/archive_read.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.13 2005/01/08 18:28:11 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.14 2005/04/06 04:19:30 kientzle Exp $"); #include #include @@ -226,6 +226,8 @@ a->state = ARCHIVE_STATE_FATAL; return (ARCHIVE_FATAL); } + if (ret != ARCHIVE_OK) + return (ret); } /* Record start-of-header. */ @@ -405,9 +407,13 @@ archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_DATA); - while ((r = archive_read_data_block(a, &buff, &size, &offset)) == - ARCHIVE_OK) - ; + if (a->format->read_data_skip != NULL) + r = (a->format->read_data_skip)(a); + else { + while ((r = archive_read_data_block(a, &buff, &size, &offset)) + == ARCHIVE_OK) + ; + } if (r == ARCHIVE_EOF) r = ARCHIVE_OK; @@ -505,6 +511,7 @@ int (*bid)(struct archive *), int (*read_header)(struct archive *, struct archive_entry *), int (*read_data)(struct archive *, const void **, size_t *, off_t *), + int (*read_data_skip)(struct archive *), int (*cleanup)(struct archive *)) { int i, number_slots; @@ -520,6 +527,7 @@ a->formats[i].bid = bid; a->formats[i].read_header = read_header; a->formats[i].read_data = read_data; + a->formats[i].read_data_skip = read_data_skip; a->formats[i].cleanup = cleanup; a->formats[i].format_data = format_data; return (ARCHIVE_OK); ==== //depot/projects/davidxu_thread/src/lib/libarchive/archive_read_support_format_cpio.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.12 2005/03/13 01:52:35 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.13 2005/04/06 04:19:30 kientzle Exp $"); #include @@ -142,6 +142,7 @@ archive_read_format_cpio_bid, archive_read_format_cpio_read_header, archive_read_format_cpio_read_data, + NULL, archive_read_format_cpio_cleanup); if (r != ARCHIVE_OK) ==== //depot/projects/davidxu_thread/src/lib/libarchive/archive_read_support_format_iso9660.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.7 2005/02/12 22:48:38 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.8 2005/04/06 04:19:30 kientzle Exp $"); #include @@ -212,6 +212,7 @@ archive_read_format_iso9660_bid, archive_read_format_iso9660_read_header, archive_read_format_iso9660_read_data, + NULL, archive_read_format_iso9660_cleanup); if (r != ARCHIVE_OK) { ==== //depot/projects/davidxu_thread/src/lib/libarchive/archive_read_support_format_tar.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.31 2005/03/13 02:35:52 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.32 2005/04/06 04:19:30 kientzle Exp $"); #include #include @@ -216,6 +216,7 @@ archive_read_format_tar_bid, archive_read_format_tar_read_header, archive_read_format_tar_read_data, + NULL, archive_read_format_tar_cleanup); if (r != ARCHIVE_OK) ==== //depot/projects/davidxu_thread/src/lib/libarchive/archive_read_support_format_zip.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.4 2005/02/12 23:00:31 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.5 2005/04/06 04:19:30 kientzle Exp $"); #include #include @@ -41,16 +41,30 @@ #include "archive_private.h" struct zip { + /* entry_bytes_remaining is the number of bytes we expect. */ off_t entry_bytes_remaining; off_t entry_offset; + /* These count the number of bytes actually read for the entry. */ + off_t entry_compressed_bytes_read; + off_t entry_uncompressed_bytes_read; + unsigned version; unsigned system; unsigned flags; unsigned compression; const char * compression_name; time_t mtime; + time_t ctime; + time_t atime; + mode_t mode; + uid_t uid; + gid_t gid; + + /* Flags to mark progress of decompression. */ + char decompress_init; char end_of_entry; + char end_of_entry_cleanup; long crc32; ssize_t filename_length; @@ -73,8 +87,7 @@ struct zip_file_header { char signature[4]; - char version[1]; - char reserved[1]; + char version[2]; char flags[2]; char compression[2]; char timedate[4]; @@ -101,17 +114,22 @@ static int archive_read_format_zip_cleanup(struct archive *); static int archive_read_format_zip_read_data(struct archive *, const void **, size_t *, off_t *); +static int archive_read_format_zip_read_data_skip(struct archive *a); static int archive_read_format_zip_read_header(struct archive *, struct archive_entry *); static int i2(const char *); static int i4(const char *); +static unsigned int u2(const char *); +static unsigned int u4(const char *); +static uint64_t u8(const char *); static int zip_read_data_deflate(struct archive *a, const void **buff, size_t *size, off_t *offset); static int zip_read_data_none(struct archive *a, const void **buff, size_t *size, off_t *offset); -static int zip_read_data_skip(struct archive *a, const void **buff, - size_t *size, off_t *offset); +static int zip_read_file_header(struct archive *a, + struct archive_entry *entry, struct zip *zip); static time_t zip_time(const char *); +static void process_extra(const void* extra, struct zip* zip); int archive_read_support_format_zip(struct archive *a) @@ -127,6 +145,7 @@ archive_read_format_zip_bid, archive_read_format_zip_read_header, archive_read_format_zip_read_data, + archive_read_format_zip_read_data_skip, archive_read_format_zip_cleanup); if (r != ARCHIVE_OK) @@ -171,7 +190,7 @@ { int bytes_read; const void *h; - const struct zip_file_header *p; + const char *signature; struct zip *zip; a->archive_format = ARCHIVE_FORMAT_ZIP; @@ -179,40 +198,70 @@ a->archive_format_name = "ZIP"; zip = *(a->pformat_data); + zip->decompress_init = 0; zip->end_of_entry = 0; - bytes_read = - (a->compression_read_ahead)(a, &h, sizeof(struct zip_file_header)); + zip->end_of_entry_cleanup = 0; + zip->entry_uncompressed_bytes_read = 0; + zip->entry_compressed_bytes_read = 0; + bytes_read = (a->compression_read_ahead)(a, &h, 4); if (bytes_read < 4) return (ARCHIVE_FATAL); - p = h; - if (p->signature[0] != 'P' || p->signature[1] != 'K') { + signature = h; + if (signature[0] != 'P' || signature[1] != 'K') { archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT, "Bad ZIP file"); return (ARCHIVE_FATAL); } - if (p->signature[2] == '\001' && p->signature[3] == '\002') { + if (signature[2] == '\001' && signature[3] == '\002') { /* Beginning of central directory. */ return (ARCHIVE_EOF); - } else if (p->signature[2] == '\003' && p->signature[3] == '\004') { - /* Regular file entry; fall through. */ - } else if (p->signature[2] == '\005' && p->signature[3] == '\006') { + } + + if (signature[2] == '\003' && signature[3] == '\004') { + /* Regular file entry. */ + return (zip_read_file_header(a, entry, zip)); + } + + if (signature[2] == '\005' && signature[3] == '\006') { /* End-of-archive record. */ return (ARCHIVE_EOF); - } else if (p->signature[2] == '\007' && p->signature[3] == '\010') { - /* ??? Need to research this. ??? */ - } else { - archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT, - "Damaged ZIP file or unsupported format variant (%d,%d)", p->signature[2], p->signature[3]); + } + + if (signature[2] == '\007' && signature[3] == '\010') { + /* + * We should never encounter this record here; + * see ZIP_LENGTH_AT_END handling below for details. + */ + archive_set_error(a, ARCHIVE_ERRNO_MISC, + "Bad ZIP file: Unexpected end-of-entry record"); return (ARCHIVE_FATAL); } + archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT, + "Damaged ZIP file or unsupported format variant (%d,%d)", + signature[2], signature[3]); + return (ARCHIVE_FATAL); +} + +int +zip_read_file_header(struct archive *a, struct archive_entry *entry, + struct zip *zip) +{ + const struct zip_file_header *p; + const void *h; + int bytes_read; + struct stat st; + + bytes_read = + (a->compression_read_ahead)(a, &h, sizeof(struct zip_file_header)); if (bytes_read < (int)sizeof(struct zip_file_header)) { archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT, "Truncated ZIP file header"); return (ARCHIVE_FATAL); } + p = h; zip->version = p->version[0]; zip->system = p->version[1]; @@ -224,11 +273,16 @@ else zip->compression_name = "??"; zip->mtime = zip_time(p->timedate); + zip->ctime = 0; + zip->atime = 0; + zip->mode = 0; + zip->uid = 0; + zip->gid = 0; zip->crc32 = i4(p->crc32); zip->filename_length = i2(p->filename_length); zip->extra_length = i2(p->extra_length); - zip->uncompressed_size = i4(p->uncompressed_size); - zip->compressed_size = i4(p->compressed_size); + zip->uncompressed_size = u4(p->uncompressed_size); + zip->compressed_size = u4(p->compressed_size); (a->compression_read_consume)(a, sizeof(struct zip_file_header)); @@ -245,6 +299,11 @@ (a->compression_read_consume)(a, zip->filename_length); archive_entry_set_pathname(entry, zip->pathname.s); + if (zip->pathname.s[archive_strlen(&zip->pathname) - 1] == '/') + zip->mode = S_IFDIR | 0777; + else + zip->mode = S_IFREG | 0777; + /* Read the extra data. */ bytes_read = (a->compression_read_ahead)(a, &h, zip->extra_length); if (bytes_read < zip->extra_length) { @@ -252,16 +311,20 @@ "Truncated ZIP file header"); return (ARCHIVE_FATAL); } - /* TODO: Store the extra data somewhere? */ + process_extra(h, zip); (a->compression_read_consume)(a, zip->extra_length); /* Populate some additional entry fields: */ - archive_entry_set_mtime(entry, zip->mtime, 0); - if (zip->pathname.s[archive_strlen(&zip->pathname) - 1] == '/') - archive_entry_set_mode(entry, S_IFDIR | 0777); - else - archive_entry_set_mode(entry, S_IFREG | 0777); - archive_entry_set_size(entry, zip->uncompressed_size); + memset(&st, 0, sizeof(st)); + st.st_mode = zip->mode; + st.st_uid = zip->uid; + st.st_gid = zip->gid; + st.st_mtime = zip->mtime; + st.st_ctime = zip->ctime; + st.st_atime = zip->atime; + st.st_size = zip->uncompressed_size; + archive_entry_copy_stat(entry, &st); + zip->entry_bytes_remaining = zip->compressed_size; zip->entry_offset = 0; @@ -304,34 +367,101 @@ zip = *(a->pformat_data); - if (!zip->end_of_entry) { - switch(zip->compression) { - case 0: /* No compression. */ - r = zip_read_data_none(a, buff, size, offset); - break; - case 8: /* Deflate compression. */ - r = zip_read_data_deflate(a, buff, size, offset); - break; - default: /* Unsupported compression. */ - r = zip_read_data_skip(a, buff, size, offset); - /* Return a warning. */ - archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT, - "Unsupported ZIP compression method (%s)", - zip->compression_name); - r = ARCHIVE_WARN; - break; + /* + * If we hit end-of-entry last time, clean up and return + * ARCHIVE_EOF this time. + */ + if (zip->end_of_entry) { + if (!zip->end_of_entry_cleanup) { + if (zip->flags & ZIP_LENGTH_AT_END) { + const void *h; + const char *p; + int bytes_read = + (a->compression_read_ahead)(a, &h, 16); + if (bytes_read < 16) { + archive_set_error(a, + ARCHIVE_ERRNO_FILE_FORMAT, + "Truncated ZIP end-of-file record"); + return (ARCHIVE_FATAL); + } + p = h; + zip->crc32 = i4(p + 4); + zip->compressed_size = u4(p + 8); + zip->uncompressed_size = u4(p + 12); + bytes_read = (a->compression_read_consume)(a, 16); + } + + /* Check file size, CRC against these values. */ + if (zip->compressed_size != zip->entry_compressed_bytes_read) { + archive_set_error(a, ARCHIVE_ERRNO_MISC, + "ZIP compressed data is wrong size"); + return (ARCHIVE_WARN); + } + if (zip->uncompressed_size != zip->entry_uncompressed_bytes_read) { + archive_set_error(a, ARCHIVE_ERRNO_MISC, + "ZIP uncompressed data is wrong size"); + return (ARCHIVE_WARN); + } +/* TODO: Compute CRC. */ +/* + if (zip->crc32 != zip->entry_crc32_calculated) { + archive_set_error(a, ARCHIVE_ERRNO_MISC, + "ZIP data CRC error"); + return (ARCHIVE_WARN); + } +*/ + /* End-of-entry cleanup done. */ + zip->end_of_entry_cleanup = 1; } - } else { - r = ARCHIVE_EOF; + return (ARCHIVE_EOF); + } + + switch(zip->compression) { + case 0: /* No compression. */ + r = zip_read_data_none(a, buff, size, offset); + break; + case 8: /* Deflate compression. */ + r = zip_read_data_deflate(a, buff, size, offset); + break; + default: /* Unsupported compression. */ + *buff = NULL; + *size = 0; + *offset = 0; + /* Return a warning. */ + archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT, + "Unsupported ZIP compression method (%s)", + zip->compression_name); if (zip->flags & ZIP_LENGTH_AT_END) { - /* TODO: Read the "PK\007\008" trailer that follows. */ + /* + * ZIP_LENGTH_AT_END requires us to + * decompress the entry in order to + * skip it, but we don't know this + * compression method, so we give up. + */ + r = ARCHIVE_FATAL; + } else { + /* We know compressed size; just skip it. */ + archive_read_format_zip_read_data_skip(a); + r = ARCHIVE_WARN; } + break; } - if (r == ARCHIVE_EOF) - zip->end_of_entry = 1; return (r); } +/* + * Read "uncompressed" data. According to the current specification, + * if ZIP_LENGTH_AT_END is specified, then the size fields in the + * initial file header are supposed to be set to zero. This would, of + * course, make it impossible for us to read the archive, since we + * couldn't determine the end of the file data. Info-ZIP seems to + * include the real size fields both before and after the data in this + * case (the CRC only appears afterwards), so this works as you would + * expect. + * + * Returns ARCHIVE_OK if successful, ARCHIVE_FATAL otherwise, sets + * zip->end_of_entry if it consumes all of the data. + */ static int zip_read_data_none(struct archive *a, const void **buff, size_t *size, off_t *offset) @@ -345,7 +475,8 @@ *buff = NULL; *size = 0; *offset = zip->entry_offset; - return (ARCHIVE_EOF); + zip->end_of_entry = 1; + return (ARCHIVE_OK); } /* * Note: '1' here is a performance optimization. @@ -366,6 +497,8 @@ *offset = zip->entry_offset; zip->entry_offset += *size; zip->entry_bytes_remaining -= *size; + zip->entry_uncompressed_bytes_read += *size; + zip->entry_compressed_bytes_read += *size; return (ARCHIVE_OK); } @@ -394,7 +527,7 @@ } /* If we haven't yet read any data, initialize the decompressor. */ - if (zip->entry_bytes_remaining == zip->compressed_size) { + if (!zip->decompress_init) { r = inflateInit2(&zip->stream, -15 /* Don't check for zlib header */); if (r != Z_OK) { @@ -402,6 +535,7 @@ "Can't initialize ZIP decompression."); return (ARCHIVE_FATAL); } + zip->decompress_init = 1; } /* @@ -416,8 +550,6 @@ "Truncated ZIP file body"); return (ARCHIVE_FATAL); } - if (bytes_avail > zip->entry_bytes_remaining) - bytes_avail = zip->entry_bytes_remaining; /* * A bug in zlib.h: stream.next_in should be marked 'const' @@ -453,10 +585,11 @@ bytes_avail = zip->stream.total_in; (a->compression_read_consume)(a, bytes_avail); zip->entry_bytes_remaining -= bytes_avail; - + zip->entry_compressed_bytes_read += bytes_avail; *offset = zip->entry_offset; *size = zip->stream.total_out; + zip->entry_uncompressed_bytes_read += *size; *buff = zip->uncompressed_buffer; zip->entry_offset += *size; return (ARCHIVE_OK); @@ -468,31 +601,45 @@ { int r; - r = zip_read_data_skip(a, buff, size, offset); + *buff = NULL; + *size = 0; + *offset = 0; archive_set_error(a, ARCHIVE_ERRNO_MISC, "libarchive compiled without deflate support (no libz)"); - return (ARCHIVE_WARN); + return (ARCHIVE_FATAL); } #endif static int -zip_read_data_skip(struct archive *a, const void **buff, - size_t *size, off_t *offset) +archive_read_format_zip_read_data_skip(struct archive *a) { struct zip *zip; + const void *buff = NULL; ssize_t bytes_avail; zip = *(a->pformat_data); - /* Return nothing gracefully. */ - *buff = NULL; - *size = 0; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 7 07:21:04 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F288816A4D0; Thu, 7 Apr 2005 07:21:03 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B521816A4CE for ; Thu, 7 Apr 2005 07:21:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88BAD43D2D for ; Thu, 7 Apr 2005 07:21:03 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j377L3LO020747 for ; Thu, 7 Apr 2005 07:21:03 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j377L3EQ020743 for perforce@freebsd.org; Thu, 7 Apr 2005 07:21:03 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 7 Apr 2005 07:21:03 GMT Message-Id: <200504070721.j377L3EQ020743@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74642 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2005 07:21:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=74642 Change 74642 by davidxu@davidxu_celeron on 2005/04/07 07:20:51 Add code to support event reporting. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthr/pthread.map#3 edit .. //depot/projects/davidxu_thread/src/lib/libthr/thread/Makefile.inc#3 edit .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_init.c#7 edit .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_private.h#7 edit .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_symbols.c#2 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthr/pthread.map#3 (text+ko) ==== @@ -362,6 +362,8 @@ _thread_size_key; _thread_state_running; _thread_state_zoombie; + _thread_off_per_thread_event_mask; + _thread_event_mask; local: *; }; ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/Makefile.inc#3 (text+ko) ==== @@ -15,6 +15,7 @@ thr_create.c \ thr_detach.c \ thr_equal.c \ + thr_event.c \ thr_exit.c \ thr_fork.c \ thr_getprio.c \ ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_init.c#7 (text+ko) ==== @@ -384,6 +384,7 @@ _thr_umtx_init(&_rwlock_static_lock); _thr_umtx_init(&_keytable_lock); _thr_umtx_init(&_thr_atfork_lock); + _thr_umtx_init(&_thr_event_lock); _thr_spinlock_init(); _thr_list_init(); ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_private.h#7 (text+ko) ==== @@ -491,6 +491,9 @@ /* Cleanup handlers Link List */ struct pthread_cleanup *cleanup; + + /* Event reporting mask */ + int event_mask; }; #define THR_UMTX_TRYLOCK(thrd, lck) \ @@ -573,6 +576,17 @@ #define THR_IN_SYNCQ(thrd) (((thrd)->sflags & THR_FLAGS_IN_SYNCQ) != 0) +struct pthread_event +{ + int event; + struct pthread *thread; + void *data; +}; + +/* XXX this must match thread_db.h */ +#define TD_CREATE 0x0004 +#define TD_DEATH 0x0008 + extern int __isthreaded; /* @@ -581,9 +595,12 @@ SCLASS void *_usrstack SCLASS_PRESET(NULL); SCLASS struct pthread *_thr_initial SCLASS_PRESET(NULL); +SCLASS int _thr_scope_system SCLASS_PRESET(0); + /* For debugger */ SCLASS int _libthr_debug SCLASS_PRESET(0); -SCLASS int _thr_scope_system SCLASS_PRESET(0); +SCLASS int _thread_event_mask SCLASS_PRESET(0); +SCLASS struct pthread_event _thread_event; /* List of all threads: */ SCLASS TAILQ_HEAD(, pthread) _thread_list @@ -643,6 +660,7 @@ SCLASS umtx_t _rwlock_static_lock; SCLASS umtx_t _keytable_lock; SCLASS umtx_t _thr_list_lock; +SCLASS umtx_t _thr_event_lock; /* Undefine the storage class and preset specifiers: */ #undef SCLASS @@ -720,6 +738,11 @@ void _thr_unlink(struct pthread *curthread, struct pthread *thread); void _thr_suspend_check(struct pthread *curthread); void _thr_assert_lock_level() __dead2; +void _thr_report_create(struct pthread *curthread); +void _thr_report_death(struct pthread *curthread); +void _thr_report_event(struct pthread *curthread, int event); +int _thr_create_bp(void); +int _thr_death_bp(void); /* #include */ #ifdef _SYS_AIO_H_ ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_symbols.c#2 (text+ko) ==== @@ -49,6 +49,7 @@ int _thread_off_linkmap = offsetof(Obj_Entry, linkmap); int _thread_off_tlsindex = offsetof(Obj_Entry, tlsindex); int _thread_off_isdead = offsetof(struct pthread, terminated); +int _thread_off_per_thread_event_mask = offsetof(struct pthread, event_mask); int _thread_size_key = sizeof(struct pthread_key); int _thread_off_key_allocated = offsetof(struct pthread_key, allocated); int _thread_off_key_destructor = offsetof(struct pthread_key, destructor); From owner-p4-projects@FreeBSD.ORG Thu Apr 7 07:22:05 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BBA716A4D0; Thu, 7 Apr 2005 07:22:05 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 768CF16A4CE for ; Thu, 7 Apr 2005 07:22:05 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B2B043D53 for ; Thu, 7 Apr 2005 07:22:05 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j377M5Dj020826 for ; Thu, 7 Apr 2005 07:22:05 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j377M4pe020823 for perforce@freebsd.org; Thu, 7 Apr 2005 07:22:04 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 7 Apr 2005 07:22:04 GMT Message-Id: <200504070722.j377M4pe020823@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74643 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2005 07:22:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=74643 Change 74643 by davidxu@davidxu_celeron on 2005/04/07 07:21:26 Add code to support event reporting. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_event.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Apr 7 07:29:15 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEAC516A4D0; Thu, 7 Apr 2005 07:29:14 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C34F616A4CE for ; Thu, 7 Apr 2005 07:29:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A420E43D1D for ; Thu, 7 Apr 2005 07:29:14 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j377TEi9021133 for ; Thu, 7 Apr 2005 07:29:14 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j377TEiQ021130 for perforce@freebsd.org; Thu, 7 Apr 2005 07:29:14 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 7 Apr 2005 07:29:14 GMT Message-Id: <200504070729.j377TEiQ021130@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74644 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2005 07:29:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=74644 Change 74644 by davidxu@davidxu_celeron on 2005/04/07 07:29:11 Change some names. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthr/pthread.map#4 edit .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_event.c#2 edit .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_private.h#8 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthr/pthread.map#4 (text+ko) ==== @@ -359,11 +359,14 @@ _thread_off_thr_locklevel; _thread_off_tlsindex; _thread_off_isdead; + _thread_off_per_thread_event_mask; _thread_size_key; _thread_state_running; _thread_state_zoombie; - _thread_off_per_thread_event_mask; + _thread_event; _thread_event_mask; + _thread_create_bp; + _thread_death_bp; local: *; }; ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_event.c#2 (text+ko) ==== @@ -34,13 +34,13 @@ #include "thr_private.h" int -_thr_create_bp(void) +_thread_create_bp(void) { return (0); } int -_thr_death_bp(void) +_thread_death_bp(void) { return (0); } @@ -68,10 +68,10 @@ _thread_event.data = 0; switch (event) { case TD_CREATE: - _thr_create_bp(); + _thread_create_bp(); break; case TD_DEATH: - _thr_death_bp(); + _thread_death_bp(); break; } THR_UMTX_UNLOCK(curthread, &_thr_event_lock); ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_private.h#8 (text+ko) ==== @@ -741,8 +741,8 @@ void _thr_report_create(struct pthread *curthread); void _thr_report_death(struct pthread *curthread); void _thr_report_event(struct pthread *curthread, int event); -int _thr_create_bp(void); -int _thr_death_bp(void); +int _thread_create_bp(void); +int _thread_death_bp(void); /* #include */ #ifdef _SYS_AIO_H_ From owner-p4-projects@FreeBSD.ORG Thu Apr 7 07:42:02 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3ABC16A4E7; Thu, 7 Apr 2005 07:42:01 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7CDEB16A4CF for ; Thu, 7 Apr 2005 07:42:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6226943D3F for ; Thu, 7 Apr 2005 07:42:01 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j377g1Sd021642 for ; Thu, 7 Apr 2005 07:42:01 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j377g1aD021638 for perforce@freebsd.org; Thu, 7 Apr 2005 07:42:01 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 7 Apr 2005 07:42:01 GMT Message-Id: <200504070742.j377g1aD021638@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74648 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2005 07:42:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=74648 Change 74648 by davidxu@davidxu_celeron on 2005/04/07 07:41:20 Report thread creating and death event to debugger. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_create.c#3 edit .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_exit.c#3 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_create.c#3 (text+ko) ==== @@ -212,6 +212,9 @@ /* Thread was created with all signals blocked, unblock them. */ __sys_sigprocmask(SIG_SETMASK, &curthread->sigmask, NULL); + if (__predict_false(_libthr_debug)) + _thr_report_create(curthread); + if (curthread->flags & THR_FLAGS_NEED_SUSPEND) _thr_suspend_check(curthread); ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_exit.c#3 (text+ko) ==== @@ -130,6 +130,8 @@ THREAD_LIST_UNLOCK(curthread); if (curthread->joiner) _thr_umtx_wake(&curthread->state, INT_MAX); + if (__predict_false(_libthr_debug)) + _thr_report_death(curthread); thr_exit(&curthread->terminated); PANIC("thr_exit() returned"); /* Never reach! */ From owner-p4-projects@FreeBSD.ORG Thu Apr 7 08:29:01 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8C0416A4D0; Thu, 7 Apr 2005 08:29:00 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 77E2116A4CE for ; Thu, 7 Apr 2005 08:29:00 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D51A43D2F for ; Thu, 7 Apr 2005 08:29:00 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j378T04h023538 for ; Thu, 7 Apr 2005 08:29:00 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j378SxeJ023535 for perforce@freebsd.org; Thu, 7 Apr 2005 08:28:59 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 7 Apr 2005 08:28:59 GMT Message-Id: <200504070828.j378SxeJ023535@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74653 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2005 08:29:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=74653 Change 74653 by davidxu@davidxu_celeron on 2005/04/07 08:28:59 change _thread_off_per_thread_event_mask to _thread_off_enable_event. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthr/pthread.map#5 edit .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_event.c#3 edit .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_private.h#9 edit .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_symbols.c#3 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthr/pthread.map#5 (text+ko) ==== @@ -359,7 +359,7 @@ _thread_off_thr_locklevel; _thread_off_tlsindex; _thread_off_isdead; - _thread_off_per_thread_event_mask; + _thread_off_enable_event; _thread_size_key; _thread_state_running; _thread_state_zoombie; ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_event.c#3 (text+ko) ==== @@ -59,7 +59,7 @@ _thr_report_event(struct pthread *curthread, int event) { if (!_libthr_debug || - !(curthread->event_mask & event) || + !(curthread->enable_event) || !(_thread_event_mask & event)) return; THR_UMTX_LOCK(curthread, &_thr_event_lock); ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_private.h#9 (text+ko) ==== @@ -493,7 +493,7 @@ struct pthread_cleanup *cleanup; /* Event reporting mask */ - int event_mask; + int enable_event; }; #define THR_UMTX_TRYLOCK(thrd, lck) \ ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_symbols.c#3 (text+ko) ==== @@ -49,7 +49,7 @@ int _thread_off_linkmap = offsetof(Obj_Entry, linkmap); int _thread_off_tlsindex = offsetof(Obj_Entry, tlsindex); int _thread_off_isdead = offsetof(struct pthread, terminated); -int _thread_off_per_thread_event_mask = offsetof(struct pthread, event_mask); +int _thread_off_enable_event = offsetof(struct pthread, enable_event); int _thread_size_key = sizeof(struct pthread_key); int _thread_off_key_allocated = offsetof(struct pthread_key, allocated); int _thread_off_key_destructor = offsetof(struct pthread_key, destructor); From owner-p4-projects@FreeBSD.ORG Thu Apr 7 09:31:18 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACA3A16A4D0; Thu, 7 Apr 2005 09:31:17 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6469816A4CE for ; Thu, 7 Apr 2005 09:31:17 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2738343D2F for ; Thu, 7 Apr 2005 09:31:17 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j379VHD2033001 for ; Thu, 7 Apr 2005 09:31:17 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j379VGg2032997 for perforce@freebsd.org; Thu, 7 Apr 2005 09:31:16 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 7 Apr 2005 09:31:16 GMT Message-Id: <200504070931.j379VGg2032997@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74657 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2005 09:31:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=74657 Change 74657 by davidxu@davidxu_celeron on 2005/04/07 09:30:51 Add event reporting code. Affected files ... .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#5 edit Differences ... ==== //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#5 (text+ko) ==== @@ -130,6 +130,11 @@ static td_err_e (*td_thr_dbsuspend_p) (const td_thrhandle_t *); static td_err_e (*td_thr_dbresume_p) (const td_thrhandle_t *); +static CORE_ADDR td_create_bp_addr; + +/* Location of the thread death event breakpoint. */ +static CORE_ADDR td_death_bp_addr; + /* Prototypes for local functions. */ static void fbsd_thread_find_new_threads (void); static int fbsd_thread_alive (ptid_t ptid); @@ -319,7 +324,99 @@ init_thread_list (); } +static td_err_e +enable_thread_event (td_thragent_t *thread_agent, int event, CORE_ADDR *bp) +{ + td_notify_t notify; + td_err_e err; + + /* Get the breakpoint address for thread EVENT. */ + err = td_ta_event_addr_p (thread_agent, event, ¬ify); + if (err != TD_OK) + return err; + + /* Set up the breakpoint. */ + (*bp) = gdbarch_convert_from_func_ptr_addr (current_gdbarch, + (CORE_ADDR) notify.u.bptaddr, + ¤t_target); + create_thread_event_breakpoint ((*bp)); + + return TD_OK; +} + +static void +enable_thread_event_reporting (void) +{ + td_thr_events_t events; + td_notify_t notify; + td_err_e err; + + /* We cannot use the thread event reporting facility if these + functions aren't available. */ + if (td_ta_event_addr_p == NULL || td_ta_set_event_p == NULL + || td_ta_event_getmsg_p == NULL || td_thr_event_enable_p == NULL) + return; + + /* Set the process wide mask saying which events we're interested in. */ + td_event_emptyset (&events); + td_event_addset (&events, TD_CREATE); +#if 0 + /* FIXME: kettenis/2000-04-23: The event reporting facility is + broken for TD_DEATH events in glibc 2.1.3, so don't enable it for + now. */ + td_event_addset (&events, TD_DEATH); +#endif + + err = td_ta_set_event_p (thread_agent, &events); + if (err != TD_OK) + { + warning ("Unable to set global thread event mask: %s", + thread_db_err_str (err)); + return; + } + + /* Delete previous thread event breakpoints, if any. */ + remove_thread_event_breakpoints (); + td_create_bp_addr = 0; + td_death_bp_addr = 0; + + /* Set up the thread creation event. */ + err = enable_thread_event (thread_agent, TD_CREATE, &td_create_bp_addr); + if (err != TD_OK) + { + warning ("Unable to get location for thread creation breakpoint: %s", + thread_db_err_str (err)); + return; + } + + /* Set up the thread death event. */ + err = enable_thread_event (thread_agent, TD_DEATH, &td_death_bp_addr); + if (err != TD_OK) + { + warning ("Unable to get location for thread death breakpoint: %s", + thread_db_err_str (err)); + return; + } +} + static void +disable_thread_event_reporting (void) +{ + td_thr_events_t events; + + /* Set the process wide mask saying we aren't interested in any + events anymore. */ + td_event_emptyset (&events); + td_ta_set_event_p (thread_agent, &events); + + /* Delete thread event breakpoints, if any. */ + remove_thread_event_breakpoints (); + td_create_bp_addr = 0; + td_death_bp_addr = 0; +} + + +static void fbsd_thread_new_objfile (struct objfile *objfile) { td_err_e err; @@ -544,6 +641,85 @@ perror_with_name ("PT_CONTINUE"); } +static void +attach_thread (ptid_t ptid, const td_thrhandle_t *th_p, + const td_thrinfo_t *ti_p, int verbose) +{ + td_err_e err; + + /* Add the thread to GDB's thread list. */ + add_thread (ptid); + + if (verbose) + printf_unfiltered ("[New %s]\n", target_pid_to_str (ptid)); + + if (ti_p->ti_state == TD_THR_UNKNOWN || ti_p->ti_state == TD_THR_ZOMBIE) + return; /* A zombie thread -- do not attach. */ + + /* Enable thread event reporting for this thread. */ + err = td_thr_event_enable_p (th_p, 1); + if (err != TD_OK) + error ("Cannot enable thread event reporting for %s: %s", + target_pid_to_str (ptid), thread_db_err_str (err)); +} + +static void +detach_thread (ptid_t ptid, int verbose) +{ + if (verbose) + printf_unfiltered ("[%s exited]\n", target_pid_to_str (ptid)); +} + +static void +check_event (ptid_t ptid) +{ + td_event_msg_t msg; + td_thrinfo_t ti; + td_err_e err; + CORE_ADDR stop_pc; + int loop = 0; + + /* Bail out early if we're not at a thread event breakpoint. */ + stop_pc = read_pc_pid (ptid) - DECR_PC_AFTER_BREAK; + if (stop_pc != td_create_bp_addr && stop_pc != td_death_bp_addr) + return; + + loop = 1; + + do + { + err = td_ta_event_getmsg_p (thread_agent, &msg); + if (err != TD_OK) + { + if (err == TD_NOMSG) + return; + error ("Cannot get thread event message: %s", thread_db_err_str (err)); + } + err = td_thr_get_info_p (msg.th_p, &ti); + if (err != TD_OK) + error ("Cannot get thread info: %s", thread_db_err_str (err)); + ptid = BUILD_THREAD (ti.ti_tid, GET_PID (ptid)); + switch (msg.event) + { + case TD_CREATE: + /* We may already know about this thread, for instance when the + user has issued the `info threads' command before the SIGTRAP + for hitting the thread creation breakpoint was reported. */ + if (!in_thread_list (ptid)) + attach_thread (ptid, msg.th_p, &ti, 1); + break; + case TD_DEATH: + if (!in_thread_list (ptid)) + error ("Spurious thread death event."); + detach_thread (ptid, 1); + break; + default: + error ("Spurious thread event."); + } + } + while (loop); +} + static ptid_t fbsd_thread_wait (ptid_t ptid, struct target_waitstatus *ourstatus) { @@ -554,6 +730,8 @@ ret = child_ops.to_wait (ptid, ourstatus); if (GET_PID(ret) >= 0 && ourstatus->kind == TARGET_WAITKIND_STOPPED) { + if (ourstatus->value.sig == TARGET_SIGNAL_TRAP) + check_event(ptid); lwp = get_current_lwp (GET_PID(ret)); ret = thread_from_lwp (BUILD_LWP (lwp, GET_PID (ret))); if (!in_thread_list (ret)) @@ -567,7 +745,7 @@ { delete_thread (inferior_ptid); inferior_ptid = ret; - } + } } return (ret); @@ -1180,6 +1358,13 @@ return 0; } + /* These are not essential. */ + td_ta_event_addr_p = dlsym (handle, "td_ta_event_addr"); + td_ta_set_event_p = dlsym (handle, "td_ta_set_event"); + td_ta_event_getmsg_p = dlsym (handle, "td_ta_event_getmsg"); + td_thr_event_enable_p = dlsym (handle, "td_thr_event_enable"); + td_thr_tls_get_addr_p = dlsym (handle, "td_thr_tls_get_addr"); + return 1; } From owner-p4-projects@FreeBSD.ORG Thu Apr 7 09:32:19 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6191A16A4D0; Thu, 7 Apr 2005 09:32:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 271D316A4CE for ; Thu, 7 Apr 2005 09:32:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F1EBA43D41 for ; Thu, 7 Apr 2005 09:32:18 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j379WI8b033051 for ; Thu, 7 Apr 2005 09:32:18 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j379WItj033048 for perforce@freebsd.org; Thu, 7 Apr 2005 09:32:18 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 7 Apr 2005 09:32:18 GMT Message-Id: <200504070932.j379WItj033048@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74658 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2005 09:32:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=74658 Change 74658 by davidxu@davidxu_celeron on 2005/04/07 09:31:42 rename _thread_off_per_thread_event_mask to _thread_off_enable_event. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread_db/libthr_db.c#5 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread_db/libthr_db.c#5 (text+ko) ==== @@ -52,6 +52,10 @@ psaddr_t thread_listgen_addr; psaddr_t thread_active_threads_addr; psaddr_t thread_keytable_addr; + psaddr_t thread_event_addr; + psaddr_t thread_event_mask_addr; + psaddr_t thread_create_bp_addr; + psaddr_t thread_death_bp_addr; int thread_inited; int thread_off_dtv; int thread_off_tlsindex; @@ -69,6 +73,7 @@ int thread_off_key_destructor; int thread_state_zoombie; int thread_state_running; + int thread_off_enable_event; struct pt_map *map; int map_len; }; @@ -195,6 +200,10 @@ LOOKUP_SYM(ph, "_thread_list", &ta->thread_list_addr); LOOKUP_SYM(ph, "_thread_active_threads",&ta->thread_active_threads_addr); LOOKUP_SYM(ph, "_thread_keytable", &ta->thread_keytable_addr); + LOOKUP_SYM(ph, "_thread_event", &ta->thread_event_addr); + LOOKUP_SYM(ph, "_thread_event_mask", &ta->thread_event_mask_addr); + LOOKUP_SYM(ph, "_thread_create_bp", &ta->thread_create_bp_addr); + LOOKUP_SYM(ph, "_thread_death_bp", &ta->thread_death_bp_addr); LOOKUP_VAL(ph, "_thread_off_dtv", &ta->thread_off_dtv); LOOKUP_VAL(ph, "_thread_off_tlsindex", &ta->thread_off_tlsindex); LOOKUP_VAL(ph, "_thread_off_attr_flags", &ta->thread_off_attr_flags); @@ -211,6 +220,7 @@ LOOKUP_VAL(ph, "_thread_off_key_destructor", &ta->thread_off_key_destructor); LOOKUP_VAL(ph, "_thread_state_running", &ta->thread_state_running); LOOKUP_VAL(ph, "_thread_state_zoombie", &ta->thread_state_zoombie); + LOOKUP_VAL(ph, "_thread_off_enable_event", &ta->thread_off_enable_event); dbg = getpid(); /* * If this fails it probably means we're debugging a core file and @@ -429,28 +439,78 @@ pt_ta_event_addr(const td_thragent_t *ta, td_event_e event, td_notify_t *ptr) { TDBG_FUNC(); - return (TD_NOEVENT); + + switch (event) { + case TD_CREATE: + ptr->type = NOTIFY_BPT; + ptr->u.bptaddr = ta->thread_create_bp_addr; + return (0); + case TD_DEATH: + ptr->type = NOTIFY_BPT; + ptr->u.bptaddr = ta->thread_death_bp_addr; + return (0); + default: + return (TD_NOEVENT); + } } static td_err_e pt_ta_set_event(const td_thragent_t *ta, td_thr_events_t *events) { + int ret; + int mask; + TDBG_FUNC(); - return (TD_ERR); + ret = ps_pread(ta->ph, ta->thread_event_mask_addr, &mask, + sizeof(int)); + if (ret != 0) + return (P2T(ret)); + mask |= *events; + ret = ps_pwrite(ta->ph, ta->thread_event_mask_addr, &mask, + sizeof(int)); + return (P2T(ret)); } static td_err_e pt_ta_clear_event(const td_thragent_t *ta, td_thr_events_t *events) { + int ret; + int mask; + TDBG_FUNC(); - return (TD_ERR); + ret = ps_pread(ta->ph, ta->thread_event_mask_addr, &mask, + sizeof(int)); + if (ret != 0) + return (P2T(ret)); + mask &= ~*events; + ret = ps_pwrite(ta->ph, ta->thread_event_mask_addr, &mask, + sizeof(int)); + return (P2T(ret)); } static td_err_e pt_ta_event_getmsg(const td_thragent_t *ta, td_event_msg_t *msg) { + static td_thrhandle_t handle; + + psaddr_t pt; + long lwp; + int ret; + TDBG_FUNC(); - return (TD_NOMSG); + + ret = ps_pread(ta->ph, ta->thread_event_addr, msg, sizeof(*msg)); + if (ret != 0) + return (P2T(ret)); + pt = (psaddr_t)msg->th_p; + ret = ps_pread(ta->ph, pt + ta->thread_off_tid, &lwp, sizeof(lwp)); + if (ret != 0) + return (P2T(ret)); + handle.th_ta = ta; + handle.th_tid = pt_map_thread(ta, lwp, pt); + handle.th_thread = pt; + msg->th_p = &handle; + return (0); } static td_err_e @@ -610,8 +670,13 @@ static td_err_e pt_thr_event_enable(const td_thrhandle_t *th, int en) { + const td_thragent_t *ta = th->th_ta; + int ret; + TDBG_FUNC(); - return (TD_ERR); + ret = ps_pwrite(ta->ph, th->th_thread + ta->thread_off_enable_event, + &en, sizeof(int)); + return (P2T(ret)); } static td_err_e From owner-p4-projects@FreeBSD.ORG Thu Apr 7 11:24:35 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B109416A4D0; Thu, 7 Apr 2005 11:24:34 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 879D916A4CE for ; Thu, 7 Apr 2005 11:24:34 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6775743D1F for ; Thu, 7 Apr 2005 11:24:34 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j37BOYOQ037005 for ; Thu, 7 Apr 2005 11:24:34 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j37BOYUg037002 for perforce@freebsd.org; Thu, 7 Apr 2005 11:24:34 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 7 Apr 2005 11:24:34 GMT Message-Id: <200504071124.j37BOYUg037002@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74659 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2005 11:24:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=74659 Change 74659 by davidxu@davidxu_alona on 2005/04/07 11:23:45 1. TD_CREATE event should only be masked by global event mask. 2. Allow _thr_report_event to accept data pointer. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_event.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_private.h#10 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_event.c#4 (text+ko) ==== @@ -47,25 +47,25 @@ void _thr_report_create(struct pthread *curthread) { - _thr_report_event(curthread, TD_CREATE); + _thr_report_event(curthread, TD_CREATE, 0); } void _thr_report_death(struct pthread *curthread) { - _thr_report_event(curthread, TD_DEATH); + _thr_report_event(curthread, TD_DEATH, 0); } void -_thr_report_event(struct pthread *curthread, int event) +_thr_report_event(struct pthread *curthread, int event, void *data) { if (!_libthr_debug || - !(curthread->enable_event) || + (curthread->enable_event == 0 && event != TD_CREATE) || !(_thread_event_mask & event)) return; THR_UMTX_LOCK(curthread, &_thr_event_lock); _thread_event.event = event; _thread_event.thread = curthread; - _thread_event.data = 0; + _thread_event.data = data; switch (event) { case TD_CREATE: _thread_create_bp(); ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_private.h#10 (text+ko) ==== @@ -740,7 +740,7 @@ void _thr_assert_lock_level() __dead2; void _thr_report_create(struct pthread *curthread); void _thr_report_death(struct pthread *curthread); -void _thr_report_event(struct pthread *curthread, int event); +void _thr_report_event(struct pthread *curthread, int event, void *data); int _thread_create_bp(void); int _thread_death_bp(void); From owner-p4-projects@FreeBSD.ORG Thu Apr 7 14:16:01 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CAC116A4D0; Thu, 7 Apr 2005 14:16:01 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C25316A4CE for ; Thu, 7 Apr 2005 14:16:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E2E8A43D1F for ; Thu, 7 Apr 2005 14:16:00 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j37EG0IW049948 for ; Thu, 7 Apr 2005 14:16:00 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j37EG0rh049945 for perforce@freebsd.org; Thu, 7 Apr 2005 14:16:00 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 7 Apr 2005 14:16:00 GMT Message-Id: <200504071416.j37EG0rh049945@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74661 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2005 14:16:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=74661 Change 74661 by davidxu@davidxu_alona on 2005/04/07 14:15:29 call enable_thread_event_reporting in fbsd_thread_activate and call disable_thread_event_reporting in fbsd_thread_deactivate, comment out some old hack. Affected files ... .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#6 edit Differences ... ==== //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#6 (text+ko) ==== @@ -303,27 +303,6 @@ inferior_ptid = ptid; } -static void -fbsd_thread_activate (void) -{ - fbsd_thread_active = 1; - init_thread_list(); - fbsd_thread_find_new_threads (); - get_current_thread (); -} - -static void -fbsd_thread_deactivate (void) -{ - td_ta_delete_p (thread_agent); - - inferior_ptid = pid_to_ptid (proc_handle.pid); - proc_handle.pid = 0; - fbsd_thread_active = 0; - fbsd_thread_present = 0; - init_thread_list (); -} - static td_err_e enable_thread_event (td_thragent_t *thread_agent, int event, CORE_ADDR *bp) { @@ -360,12 +339,7 @@ /* Set the process wide mask saying which events we're interested in. */ td_event_emptyset (&events); td_event_addset (&events, TD_CREATE); -#if 0 - /* FIXME: kettenis/2000-04-23: The event reporting facility is - broken for TD_DEATH events in glibc 2.1.3, so don't enable it for - now. */ td_event_addset (&events, TD_DEATH); -#endif err = td_ta_set_event_p (thread_agent, &events); if (err != TD_OK) @@ -415,8 +389,32 @@ td_death_bp_addr = 0; } +static void +fbsd_thread_activate (void) +{ + fbsd_thread_active = 1; + init_thread_list(); + fbsd_thread_find_new_threads (); + get_current_thread (); + if (fbsd_thread_core == 0) + enable_thread_event_reporting (); +} static void +fbsd_thread_deactivate (void) +{ + if (fbsd_thread_core == 0) + disable_thread_event_reporting(); + td_ta_delete_p (thread_agent); + + inferior_ptid = pid_to_ptid (proc_handle.pid); + proc_handle.pid = 0; + fbsd_thread_active = 0; + fbsd_thread_present = 0; + init_thread_list (); +} + +static void fbsd_thread_new_objfile (struct objfile *objfile) { td_err_e err; @@ -730,10 +728,12 @@ ret = child_ops.to_wait (ptid, ourstatus); if (GET_PID(ret) >= 0 && ourstatus->kind == TARGET_WAITKIND_STOPPED) { + lwp = get_current_lwp (GET_PID(ret)); + ret = BUILD_LWP(lwp, GET_PID(ret)); if (ourstatus->value.sig == TARGET_SIGNAL_TRAP) - check_event(ptid); - lwp = get_current_lwp (GET_PID(ret)); - ret = thread_from_lwp (BUILD_LWP (lwp, GET_PID (ret))); + check_event(ret); + ret = thread_from_lwp (ret); +#if 0 if (!in_thread_list (ret)) add_thread (ret); /* this is a hack, if an event won't cause gdb to stop, for example, @@ -746,6 +746,7 @@ delete_thread (inferior_ptid); inferior_ptid = ret; } +#endif } return (ret); From owner-p4-projects@FreeBSD.ORG Thu Apr 7 14:17:03 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16A0F16A4D1; Thu, 7 Apr 2005 14:17:03 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E77C616A4CE for ; Thu, 7 Apr 2005 14:17:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A38C043D5A for ; Thu, 7 Apr 2005 14:17:02 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j37EH293050040 for ; Thu, 7 Apr 2005 14:17:02 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j37EH2fY050037 for perforce@freebsd.org; Thu, 7 Apr 2005 14:17:02 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 7 Apr 2005 14:17:02 GMT Message-Id: <200504071417.j37EH2fY050037@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74662 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2005 14:17:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=74662 Change 74662 by davidxu@davidxu_alona on 2005/04/07 14:16:12 MFC. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread_db/libpthread2_db.c#3 delete .. //depot/projects/davidxu_thread/src/lib/libthread_db/libpthread2_db.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Apr 7 14:17:04 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E2DD216A4CE; Thu, 7 Apr 2005 14:17:03 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3211916A4E3 for ; Thu, 7 Apr 2005 14:17:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0957B43D5A for ; Thu, 7 Apr 2005 14:17:02 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j37EH2S4050046 for ; Thu, 7 Apr 2005 14:17:02 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j37EH2ko050043 for perforce@freebsd.org; Thu, 7 Apr 2005 14:17:02 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 7 Apr 2005 14:17:02 GMT Message-Id: <200504071417.j37EH2ko050043@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74663 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2005 14:17:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=74663 Change 74663 by davidxu@davidxu_alona on 2005/04/07 14:16:50 Return 0 for event setting functions. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread_db/libpthread_db.c#4 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread_db/libpthread_db.c#4 (text+ko) ==== @@ -435,14 +435,14 @@ pt_ta_set_event(const td_thragent_t *ta, td_thr_events_t *events) { TDBG_FUNC(); - return (TD_ERR); + return (0); } static td_err_e pt_ta_clear_event(const td_thragent_t *ta, td_thr_events_t *events) { TDBG_FUNC(); - return (TD_ERR); + return (0); } static td_err_e From owner-p4-projects@FreeBSD.ORG Thu Apr 7 14:18:05 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B85F16A4D0; Thu, 7 Apr 2005 14:18:05 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EA7FA16A4CE for ; Thu, 7 Apr 2005 14:18:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B463E43D39 for ; Thu, 7 Apr 2005 14:18:04 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j37EI4v8050082 for ; Thu, 7 Apr 2005 14:18:04 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j37EI4u5050079 for perforce@freebsd.org; Thu, 7 Apr 2005 14:18:04 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 7 Apr 2005 14:18:04 GMT Message-Id: <200504071418.j37EI4u5050079@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74664 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2005 14:18:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=74664 Change 74664 by davidxu@davidxu_alona on 2005/04/07 14:17:31 Wait child to report event. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_create.c#4 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_create.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ static void free_thread(struct pthread *curthread, struct pthread *thread); static int create_stack(struct pthread_attr *pattr); static void free_stack(struct pthread *curthread, struct pthread_attr *pattr); -static void thread_start(struct pthread *curthread); +static void thread_start(struct pthread *curthread, umtx_t *p); __weak_reference(_pthread_create, pthread_create); @@ -56,6 +56,7 @@ ucontext_t uc; sigset_t sigmask, oldsigmask; struct pthread *curthread, *new_thread; + umtx_t wait_child, *umtxp; int ret = 0; _thr_check_init(); @@ -111,8 +112,13 @@ SIGFILLSET(uc.uc_sigmask); uc.uc_stack.ss_sp = new_thread->attr.stackaddr_attr; uc.uc_stack.ss_size = new_thread->attr.stacksize_attr; - makecontext(&uc, (void (*)(void))thread_start, 1, new_thread); - + if (!_libthr_debug) + umtxp = NULL; + else { + umtxp = &wait_child; + _thr_umtx_init(umtxp); + } + makecontext(&uc, (void (*)(void))thread_start, 2, new_thread, umtxp); /* * Check if this thread is to inherit the scheduling * attributes from its parent: @@ -165,6 +171,9 @@ free_thread(curthread, new_thread); (*thread) = 0; ret = EAGAIN; + } else if (umtxp != NULL) { + while (*umtxp == 0) + _thr_umtx_wait(umtxp, 0, NULL); } return (ret); } @@ -205,15 +214,18 @@ } static void -thread_start(struct pthread *curthread) +thread_start(struct pthread *curthread, umtx_t *umtxp) { _tcb_set(curthread->tcb); /* Thread was created with all signals blocked, unblock them. */ __sys_sigprocmask(SIG_SETMASK, &curthread->sigmask, NULL); - if (__predict_false(_libthr_debug)) + if (umtxp != NULL) { _thr_report_create(curthread); + (*umtxp)++; + _thr_umtx_wake(umtxp, 1); + } if (curthread->flags & THR_FLAGS_NEED_SUSPEND) _thr_suspend_check(curthread); From owner-p4-projects@FreeBSD.ORG Thu Apr 7 14:20:08 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10AC616A4E3; Thu, 7 Apr 2005 14:20:08 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C30B416A4FB for ; Thu, 7 Apr 2005 14:20:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA66E43D39 for ; Thu, 7 Apr 2005 14:20:07 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j37EK7pI050192 for ; Thu, 7 Apr 2005 14:20:07 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j37EK7f2050189 for perforce@freebsd.org; Thu, 7 Apr 2005 14:20:07 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 7 Apr 2005 14:20:07 GMT Message-Id: <200504071420.j37EK7f2050189@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74665 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2005 14:20:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=74665 Change 74665 by davidxu@davidxu_alona on 2005/04/07 14:19:12 Return TD_ERR not TD_NOEVENT, clear event buffer. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread_db/libthr_db.c#6 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread_db/libthr_db.c#6 (text+ko) ==== @@ -450,7 +450,7 @@ ptr->u.bptaddr = ta->thread_death_bp_addr; return (0); default: - return (TD_NOEVENT); + return (TD_ERR); } } @@ -496,12 +496,18 @@ psaddr_t pt; long lwp; int ret; + int tmp; TDBG_FUNC(); ret = ps_pread(ta->ph, ta->thread_event_addr, msg, sizeof(*msg)); if (ret != 0) return (P2T(ret)); + if (msg->event == 0) + return (TD_NOMSG); + /* clear event */ + tmp = 0; + ps_pwrite(ta->ph, ta->thread_event_addr, &tmp, sizeof(int)); pt = (psaddr_t)msg->th_p; ret = ps_pread(ta->ph, pt + ta->thread_off_tid, &lwp, sizeof(lwp)); if (ret != 0) From owner-p4-projects@FreeBSD.ORG Thu Apr 7 22:37:13 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3EA0B16A4D0; Thu, 7 Apr 2005 22:37:13 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 149F416A4CE for ; Thu, 7 Apr 2005 22:37:13 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CB6ED43D1F for ; Thu, 7 Apr 2005 22:37:12 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j37MbCC0086864 for ; Thu, 7 Apr 2005 22:37:12 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j37MbCas086861 for perforce@freebsd.org; Thu, 7 Apr 2005 22:37:12 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 7 Apr 2005 22:37:12 GMT Message-Id: <200504072237.j37MbCas086861@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74695 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2005 22:37:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=74695 Change 74695 by davidxu@davidxu_alona on 2005/04/07 22:37:08 Reuse tid as a state indicating if the thread is exited by kernel, thr_exit will write a value into user given address, but there is a mistake that it writes out 1. :( fortunately, thread id 1 is never assigned to user thread, so we are safe to test if a thread is dead by comparing it with 1. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthr/pthread.map#6 edit .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_create.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_exit.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_private.h#11 edit .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_symbols.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread_db/libthr_db.c#7 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthr/pthread.map#6 (text+ko) ==== @@ -358,7 +358,6 @@ _thread_off_state; _thread_off_thr_locklevel; _thread_off_tlsindex; - _thread_off_isdead; _thread_off_enable_event; _thread_size_key; _thread_state_running; ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_create.c#5 (text+ko) ==== @@ -93,9 +93,10 @@ else if (_thr_scope_system < 0) new_thread->attr.flags &= ~PTHREAD_SCOPE_SYSTEM; + new_thread->tid = TID_TERMINATED; + if (create_stack(&new_thread->attr) != 0) { /* Insufficient memory to create a stack: */ - new_thread->terminated = 1; _thr_free(curthread, new_thread); return (EAGAIN); } @@ -182,7 +183,7 @@ free_thread(struct pthread *curthread, struct pthread *thread) { free_stack(curthread, &thread->attr); - curthread->terminated = 1; + curthread->tid = TID_TERMINATED; _thr_free(curthread, thread); } ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_exit.c#4 (text+ko) ==== @@ -132,7 +132,7 @@ _thr_umtx_wake(&curthread->state, INT_MAX); if (__predict_false(_libthr_debug)) _thr_report_death(curthread); - thr_exit(&curthread->terminated); + thr_exit(&curthread->tid); PANIC("thr_exit() returned"); /* Never reach! */ } ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_private.h#11 (text+ko) ==== @@ -345,11 +345,9 @@ */ umtx_t lock; - /* Thread is terminated in kernel, written by kernel. */ - long terminated; - /* Kernel thread id. */ long tid; +#define TID_TERMINATED 1 /* Internal condition variable cycle number. */ umtx_t cycle; ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_symbols.c#4 (text+ko) ==== @@ -48,7 +48,6 @@ int _thread_off_thr_locklevel = offsetof(struct pthread, locklevel); int _thread_off_linkmap = offsetof(Obj_Entry, linkmap); int _thread_off_tlsindex = offsetof(Obj_Entry, tlsindex); -int _thread_off_isdead = offsetof(struct pthread, terminated); int _thread_off_enable_event = offsetof(struct pthread, enable_event); int _thread_size_key = sizeof(struct pthread_key); int _thread_off_key_allocated = offsetof(struct pthread_key, allocated); ==== //depot/projects/davidxu_thread/src/lib/libthread_db/libthr_db.c#7 (text+ko) ==== @@ -66,7 +66,6 @@ int thread_off_thr_locklevel; int thread_off_next; int thread_off_state; - int thread_off_isdead; int thread_off_tid; int thread_max_keys; int thread_off_key_allocated; @@ -214,7 +213,6 @@ LOOKUP_VAL(ph, "_thread_off_thr_locklevel", &ta->thread_off_thr_locklevel); LOOKUP_VAL(ph, "_thread_off_next", &ta->thread_off_next); LOOKUP_VAL(ph, "_thread_off_state", &ta->thread_off_state); - LOOKUP_VAL(ph, "_thread_off_isdead", &ta->thread_off_isdead); LOOKUP_VAL(ph, "_thread_max_keys", &ta->thread_max_keys); LOOKUP_VAL(ph, "_thread_off_key_allocated", &ta->thread_off_key_allocated); LOOKUP_VAL(ph, "_thread_off_key_destructor", &ta->thread_off_key_destructor); @@ -260,7 +258,8 @@ prgregset_t gregs; TAILQ_HEAD(, pthread) thread_list; psaddr_t pt; - int ret, isdead; + int ret; + long lwp; TDBG_FUNC(); @@ -295,11 +294,11 @@ return (TD_NOTHR); } ret = ps_pread(ta->ph, - pt + ta->thread_off_isdead, - &isdead, sizeof(isdead)); + pt + ta->thread_off_tid, + &lwp, sizeof(long)); if (ret != 0) return (P2T(ret)); - if (isdead) { + if (lwp == 1) { ta->map[id].used = 0; return (TD_NOTHR); } @@ -372,24 +371,18 @@ pt = (psaddr_t)thread_list.tqh_first; while (pt != 0) { - ret = ps_pread(ta->ph, pt + ta->thread_off_isdead, &isdead, - sizeof(isdead)); + ret = ps_pread(ta->ph, pt + ta->thread_off_tid, &tmp_lwp, + sizeof(tmp_lwp)); if (ret != 0) return (P2T(ret)); - if (!isdead) { - ret = ps_pread(ta->ph, pt + ta->thread_off_tid, &tmp_lwp, - sizeof(tmp_lwp)); - if (ret != 0) - return (P2T(ret)); - if (tmp_lwp != 0) { - th.th_ta = ta; - th.th_tid = pt_map_thread(ta, tmp_lwp, pt); - th.th_thread = pt; - if (th.th_tid == -1) - return (TD_MALLOC); - if ((*callback)(&th, cbdata_p)) - return (TD_DBERR); - } + if (tmp_lwp != 0 && tmp_lwp != 1) { + th.th_ta = ta; + th.th_tid = pt_map_thread(ta, tmp_lwp, pt); + th.th_thread = pt; + if (th.th_tid == -1) + return (TD_MALLOC); + if ((*callback)(&th, cbdata_p)) + return (TD_DBERR); } /* get next thread */ ret = ps_pread(ta->ph, pt + ta->thread_off_next, &pt, From owner-p4-projects@FreeBSD.ORG Thu Apr 7 22:48:27 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81B1516A4D0; Thu, 7 Apr 2005 22:48:27 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D8A516A4CE for ; Thu, 7 Apr 2005 22:48:27 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 44E4543D3F for ; Thu, 7 Apr 2005 22:48:27 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j37MmRpk087244 for ; Thu, 7 Apr 2005 22:48:27 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j37MmQSw087241 for perforce@freebsd.org; Thu, 7 Apr 2005 22:48:26 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 7 Apr 2005 22:48:26 GMT Message-Id: <200504072248.j37MmQSw087241@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74697 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2005 22:48:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=74697 Change 74697 by davidxu@davidxu_alona on 2005/04/07 22:47:39 Kill unused members. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread_db/libthr_db.c#8 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread_db/libthr_db.c#8 (text+ko) ==== @@ -49,7 +49,6 @@ TD_THRAGENT_FIELDS; psaddr_t libthr_debug_addr; psaddr_t thread_list_addr; - psaddr_t thread_listgen_addr; psaddr_t thread_active_threads_addr; psaddr_t thread_keytable_addr; psaddr_t thread_event_addr; @@ -63,7 +62,6 @@ int thread_size_key; int thread_off_tcb; int thread_off_linkmap; - int thread_off_thr_locklevel; int thread_off_next; int thread_off_state; int thread_off_tid; @@ -210,7 +208,6 @@ LOOKUP_VAL(ph, "_thread_off_tcb", &ta->thread_off_tcb); LOOKUP_VAL(ph, "_thread_off_tid", &ta->thread_off_tid); LOOKUP_VAL(ph, "_thread_off_linkmap", &ta->thread_off_linkmap); - LOOKUP_VAL(ph, "_thread_off_thr_locklevel", &ta->thread_off_thr_locklevel); LOOKUP_VAL(ph, "_thread_off_next", &ta->thread_off_next); LOOKUP_VAL(ph, "_thread_off_state", &ta->thread_off_state); LOOKUP_VAL(ph, "_thread_max_keys", &ta->thread_max_keys); From owner-p4-projects@FreeBSD.ORG Thu Apr 7 22:52:33 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08E1B16A4D1; Thu, 7 Apr 2005 22:52:33 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BCF9016A4CE for ; Thu, 7 Apr 2005 22:52:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A431843D2D for ; Thu, 7 Apr 2005 22:52:32 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j37MqWqA087429 for ; Thu, 7 Apr 2005 22:52:32 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j37MqWb2087426 for perforce@freebsd.org; Thu, 7 Apr 2005 22:52:32 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 7 Apr 2005 22:52:32 GMT Message-Id: <200504072252.j37MqWb2087426@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74698 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2005 22:52:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=74698 Change 74698 by davidxu@davidxu_alona on 2005/04/07 22:52:06 locklevel is leftover, no longer needed for debugger. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthr/pthread.map#7 edit .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_symbols.c#5 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthr/pthread.map#7 (text+ko) ==== @@ -356,7 +356,6 @@ _thread_off_key_allocated; _thread_off_key_destructor; _thread_off_state; - _thread_off_thr_locklevel; _thread_off_tlsindex; _thread_off_enable_event; _thread_size_key; ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_symbols.c#5 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Apr 7 22:59:42 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED00316A4D0; Thu, 7 Apr 2005 22:59:41 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C994416A4CE for ; Thu, 7 Apr 2005 22:59:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AFD4D43D2D for ; Thu, 7 Apr 2005 22:59:41 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j37MxffX087736 for ; Thu, 7 Apr 2005 22:59:41 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j37Mxf8e087733 for perforce@freebsd.org; Thu, 7 Apr 2005 22:59:41 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 7 Apr 2005 22:59:41 GMT Message-Id: <200504072259.j37Mxf8e087733@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74699 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2005 22:59:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=74699 Change 74699 by davidxu@davidxu_alona on 2005/04/07 22:59:28 Replace magic number with intuitive macro name. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread_db/libthr_db.c#9 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread_db/libthr_db.c#9 (text+ko) ==== @@ -39,6 +39,8 @@ #include "thread_db_int.h" +#define TERMINATED 1 + struct pt_map { int used; lwpid_t lwp; @@ -295,7 +297,7 @@ &lwp, sizeof(long)); if (ret != 0) return (P2T(ret)); - if (lwp == 1) { + if (lwp == TERMINATED) { ta->map[id].used = 0; return (TD_NOTHR); } @@ -372,7 +374,7 @@ sizeof(tmp_lwp)); if (ret != 0) return (P2T(ret)); - if (tmp_lwp != 0 && tmp_lwp != 1) { + if (tmp_lwp != 0 && tmp_lwp != TERMINATED) { th.th_ta = ta; th.th_tid = pt_map_thread(ta, tmp_lwp, pt); th.th_thread = pt; From owner-p4-projects@FreeBSD.ORG Fri Apr 8 02:02:25 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8E7B16A4D0; Fri, 8 Apr 2005 02:02:23 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A13AB16A4CE for ; Fri, 8 Apr 2005 02:02:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7302443D1D for ; Fri, 8 Apr 2005 02:02:23 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3822NVg001460 for ; Fri, 8 Apr 2005 02:02:23 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3822Ni0001457 for perforce@freebsd.org; Fri, 8 Apr 2005 02:02:23 GMT (envelope-from davidxu@freebsd.org) Date: Fri, 8 Apr 2005 02:02:23 GMT Message-Id: <200504080202.j3822Ni0001457@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74705 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2005 02:02:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=74705 Change 74705 by davidxu@davidxu_celeron on 2005/04/08 02:01:36 structure member terminated is gone. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_list.c#3 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_list.c#3 (text+ko) ==== @@ -99,7 +99,7 @@ /* Check the threads waiting for GC. */ for (td = TAILQ_FIRST(&_thread_gc_list); td != NULL; td = td_next) { td_next = TAILQ_NEXT(td, gcle); - if (td->terminated == 0) { + if (td->tid != TID_TERMINATED) { /* make sure we are not still in userland */ continue; } From owner-p4-projects@FreeBSD.ORG Fri Apr 8 02:05:29 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF12F16A4D0; Fri, 8 Apr 2005 02:05:27 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B643B16A4CE for ; Fri, 8 Apr 2005 02:05:27 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C2B243D49 for ; Fri, 8 Apr 2005 02:05:27 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3825R5k001594 for ; Fri, 8 Apr 2005 02:05:27 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3825RnU001591 for perforce@freebsd.org; Fri, 8 Apr 2005 02:05:27 GMT (envelope-from davidxu@freebsd.org) Date: Fri, 8 Apr 2005 02:05:27 GMT Message-Id: <200504080205.j3825RnU001591@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74706 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2005 02:05:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=74706 Change 74706 by davidxu@davidxu_celeron on 2005/04/08 02:05:22 $FreeBSD$ fix. remove unnecessary includes. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_event.c#5 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_event.c#5 (text+ko) ==== @@ -23,14 +23,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_atfork.c,v 1.2 2005/04/02 01:20:00 davidxu Exp $ + * $FreeBSD$ */ -#include -#include -#include -#include - #include "thr_private.h" int From owner-p4-projects@FreeBSD.ORG Fri Apr 8 02:13:42 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C5CC16A4D0; Fri, 8 Apr 2005 02:13:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D964516A4CE for ; Fri, 8 Apr 2005 02:13:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1703E43D1D for ; Fri, 8 Apr 2005 02:13:38 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j382Dco8001914 for ; Fri, 8 Apr 2005 02:13:38 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j382Db2A001911 for perforce@freebsd.org; Fri, 8 Apr 2005 02:13:37 GMT (envelope-from davidxu@freebsd.org) Date: Fri, 8 Apr 2005 02:13:37 GMT Message-Id: <200504080213.j382Db2A001911@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74707 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2005 02:13:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=74707 Change 74707 by davidxu@davidxu_celeron on 2005/04/08 02:13:08 IFC. Affected files ... .. //depot/projects/davidxu_thread/src/bin/dd/dd.1#3 integrate .. //depot/projects/davidxu_thread/src/lib/libc/amd64/string/Makefile.inc#1 branch .. //depot/projects/davidxu_thread/src/lib/libc/amd64/string/bcopy.S#1 branch .. //depot/projects/davidxu_thread/src/lib/libc/amd64/string/bzero.S#1 branch .. //depot/projects/davidxu_thread/src/lib/libc/amd64/string/memcpy.S#1 branch .. //depot/projects/davidxu_thread/src/lib/libc/amd64/string/memmove.S#1 branch .. //depot/projects/davidxu_thread/src/lib/libc/amd64/string/memset.S#1 branch .. //depot/projects/davidxu_thread/src/lib/libc/i386/sys/_amd64_get_fsbase.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/i386/sys/_amd64_get_gsbase.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libthr/arch/arm/Makefile.inc#2 integrate .. //depot/projects/davidxu_thread/src/lib/libthr/arch/arm/include/pthread_md.h#2 integrate .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_list.c#4 integrate .. //depot/projects/davidxu_thread/src/lib/msun/Makefile#8 integrate .. //depot/projects/davidxu_thread/src/lib/msun/man/lround.3#2 integrate .. //depot/projects/davidxu_thread/src/lib/msun/man/round.3#3 integrate .. //depot/projects/davidxu_thread/src/lib/msun/src/math.h#7 integrate .. //depot/projects/davidxu_thread/src/lib/msun/src/s_llround.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/msun/src/s_llroundf.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/msun/src/s_llroundl.c#1 branch .. //depot/projects/davidxu_thread/src/lib/msun/src/s_lround.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/msun/src/s_lroundf.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/msun/src/s_lroundl.c#1 branch .. //depot/projects/davidxu_thread/src/lib/msun/src/s_roundl.c#1 branch .. //depot/projects/davidxu_thread/src/libexec/rexecd/rexecd.c#8 integrate .. //depot/projects/davidxu_thread/src/libexec/rtld-elf/arm/rtld_machdep.h#4 integrate .. //depot/projects/davidxu_thread/src/sbin/geom/class/Makefile.inc#2 integrate .. //depot/projects/davidxu_thread/src/sbin/geom/core/geom.c#6 integrate .. //depot/projects/davidxu_thread/src/sbin/nfsiod/nfsiod.c#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/Makefile#12 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/atkbdc.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/carp.4#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/geom.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/sched_4bsd.4#1 branch .. //depot/projects/davidxu_thread/src/share/man/man4/sched_ule.4#1 branch .. //depot/projects/davidxu_thread/src/share/man/man9/Makefile#7 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/pmap.c#9 integrate .. //depot/projects/davidxu_thread/src/sys/arm/include/asmacros.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/arm/include/atomic.h#4 integrate .. //depot/projects/davidxu_thread/src/sys/arm/include/pmap.h#5 integrate .. //depot/projects/davidxu_thread/src/sys/arm/xscale/i80321/iq31244_machdep.c#8 integrate .. //depot/projects/davidxu_thread/src/sys/arm/xscale/i80321/obio_space.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files.arm#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi_perf.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/dev/kbd/atkbdc.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/msdosfs/denode.h#6 integrate .. //depot/projects/davidxu_thread/src/sys/fs/msdosfs/msdosfs_denode.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_hash.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/sys/disklabel.h#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/job.c#12 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/parse.c#10 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/boot0cfg/boot0cfg.8#3 integrate Differences ... ==== //depot/projects/davidxu_thread/src/bin/dd/dd.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 -.\" $FreeBSD: src/bin/dd/dd.1,v 1.28 2005/01/16 16:41:56 ru Exp $ +.\" $FreeBSD: src/bin/dd/dd.1,v 1.29 2005/04/07 20:50:38 scottl Exp $ .\" .Dd August 15, 2004 .Dt DD 1 @@ -392,10 +392,19 @@ Check for (even) parity errors on a file: .Pp .Dl "dd if=file conv=pareven | cmp -x - file" +.Sh BUGS +Protection mechanisms in the +.Xr geom 4 +subsystem might prevent the super-user from writing blocks to a disk. +Instructions for temporarily disabling these protectsion mechanisms can be +found in the +.Xr geom 4 +manpage. .Sh SEE ALSO .Xr cp 1 , .Xr mt 1 , -.Xr tr 1 +.Xr tr 1 , +.Xr geom 4 .Sh STANDARDS The .Nm ==== //depot/projects/davidxu_thread/src/lib/libc/i386/sys/_amd64_get_fsbase.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/sys/_amd64_get_fsbase.c,v 1.1 2004/11/06 03:28:26 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/sys/_amd64_get_fsbase.c,v 1.2 2005/04/07 04:33:15 peter Exp $"); #include #include @@ -37,7 +37,7 @@ int ret; addr64 = 0; - ret = sysarch(_AMD64_GET_FSBASE, (void **)(&addr64)); + ret = sysarch(_AMD64_GET_FSBASE, &addr64); if (ret != -1) *addr = (void *)(uintptr_t)addr64; return ret; ==== //depot/projects/davidxu_thread/src/lib/libc/i386/sys/_amd64_get_gsbase.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/sys/_amd64_get_gsbase.c,v 1.1 2004/11/06 03:28:26 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/sys/_amd64_get_gsbase.c,v 1.2 2005/04/07 04:33:15 peter Exp $"); #include #include @@ -37,7 +37,7 @@ int ret; addr64 = 0; - ret = sysarch(_AMD64_GET_GSBASE, (void **)(&addr64)); + ret = sysarch(_AMD64_GET_GSBASE, &addr64); if (ret != -1) *addr = (void *)(uintptr_t)addr64; return ret; ==== //depot/projects/davidxu_thread/src/lib/libthr/arch/arm/Makefile.inc#2 (text+ko) ==== @@ -1,7 +1,5 @@ -# $FreeBSD: src/lib/libthr/arch/arm/Makefile.inc,v 1.1 2005/04/02 01:19:57 davidxu Exp $ +# $FreeBSD: src/lib/libthr/arch/arm/Makefile.inc,v 1.2 2005/04/07 22:06:05 cognet Exp $ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} -CFLAGS+= -DARM_HAS_ATOMIC_CMPSET_32 - SRCS+= pthread_md.c ==== //depot/projects/davidxu_thread/src/lib/libthr/arch/arm/include/pthread_md.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/arch/arm/include/pthread_md.h,v 1.1 2005/04/02 01:19:57 davidxu Exp $ + * $FreeBSD: src/lib/libthr/arch/arm/include/pthread_md.h,v 1.2 2005/04/07 22:06:05 cognet Exp $ */ /* @@ -37,8 +37,6 @@ #include #include -static __inline int atomic_cmpset_32(volatile uint32_t *, uint32_t, uint32_t); - #include #define DTV_OFFSET offsetof(struct tcb, tcb_dtv) @@ -87,20 +85,4 @@ extern struct umtx arm_umtx; -static __inline int -atomic_cmpset_32(volatile uint32_t *dst, uint32_t old, uint32_t newval) -{ - int ret; - - _umtx_lock(&arm_umtx); - arm_umtx.u_owner = (void*)((uint32_t)arm_umtx.u_owner | UMTX_CONTESTED); - if (*dst == old) { - *dst = newval; - ret = 1; - } else - ret = 0; - _umtx_unlock(&arm_umtx); - return (ret); -} - #endif /* _PTHREAD_MD_H_ */ ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_list.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_list.c,v 1.2 2005/04/06 13:57:31 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_list.c,v 1.3 2005/04/07 06:09:17 davidxu Exp $ */ #include @@ -65,7 +65,7 @@ LIST_HEAD(thread_hash_head, pthread); #define HASH_QUEUES 128 static struct thread_hash_head thr_hashtable[HASH_QUEUES]; -#define THREAD_HASH(thrd) (((unsigned long)thrd >> 12) % HASH_QUEUES) +#define THREAD_HASH(thrd) (((unsigned long)thrd >> 8) % HASH_QUEUES) static void thr_destroy(struct pthread *curthread, struct pthread *thread); ==== //depot/projects/davidxu_thread/src/lib/msun/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 5.1beta 93/09/24 -# $FreeBSD: src/lib/msun/Makefile,v 1.68 2005/04/05 02:57:39 das Exp $ +# $FreeBSD: src/lib/msun/Makefile,v 1.69 2005/04/08 01:24:08 das Exp $ # # ==================================================== # Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -47,12 +47,12 @@ s_fmax.c s_fmaxf.c s_fmaxl.c s_fmin.c \ s_fminf.c s_fminl.c s_frexp.c s_frexpf.c s_ilogb.c s_ilogbf.c \ s_ilogbl.c s_isfinite.c s_isnan.c s_isnormal.c \ - s_llrint.c s_llrintf.c s_llround.c s_llroundf.c \ + s_llrint.c s_llrintf.c s_llround.c s_llroundf.c s_llroundl.c \ s_log1p.c s_log1pf.c s_logb.c s_logbf.c s_lrint.c s_lrintf.c \ - s_lround.c s_lroundf.c s_modff.c \ + s_lround.c s_lroundf.c s_lroundl.c s_modff.c \ s_nearbyint.c s_nextafter.c s_nextafterf.c \ s_nexttowardf.c s_remquo.c s_remquof.c \ - s_rint.c s_rintf.c s_round.c s_roundf.c \ + s_rint.c s_rintf.c s_round.c s_roundf.c s_roundl.c \ s_scalbln.c s_scalbn.c s_scalbnf.c s_signbit.c \ s_signgam.c s_significand.c s_significandf.c s_sin.c s_sinf.c s_tan.c \ s_tanf.c s_tanh.c s_tanhf.c s_trunc.c s_truncf.c \ @@ -137,14 +137,15 @@ MLINKS+=j0.3 j0f.3 j0.3 j1f.3 j0.3 jnf.3 j0.3 y0f.3 j0.3 ynf.3 MLINKS+=lgamma.3 gamma.3 lgamma.3 gammaf.3 lgamma.3 lgammaf.3 lgamma.3 tgamma.3 MLINKS+=lrint.3 llrint.3 lrint.3 llrintf.3 lrint.3 lrintf.3 -MLINKS+=lround.3 llround.3 lround.3 llroundf.3 lround.3 lroundf.3 +MLINKS+=lround.3 llround.3 lround.3 llroundf.3 lround.3 llroundl.3 \ + lround.3 lroundf.3 lround.3 lroundl.3 MLINKS+=nextafter.3 nextafterf.3 nextafter.3 nextafterl.3 MLINKS+=nextafter.3 nexttoward.3 nextafter.3 nexttowardf.3 MLINKS+=nextafter.3 nexttowardl.3 MLINKS+=remainder.3 remainderf.3 MLINKS+=remainder.3 remquo.3 remainder.3 remquof.3 MLINKS+=rint.3 rintf.3 rint.3 nearbyint.3 rint.3 nearbyintf.3 -MLINKS+=round.3 roundf.3 +MLINKS+=round.3 roundf.3 round.3 roundl.3 MLINKS+=scalbn.3 scalbln.3 scalbn.3 scalblnf.3 scalbn.3 scalblnl.3 MLINKS+=scalbn.3 scalbnf.3 scalbn.3 scalbnl.3 MLINKS+=sin.3 sinf.3 ==== //depot/projects/davidxu_thread/src/lib/msun/man/lround.3#2 (text+ko) ==== @@ -22,16 +22,18 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/msun/man/lround.3,v 1.2 2005/01/13 10:43:01 ru Exp $ +.\" $FreeBSD: src/lib/msun/man/lround.3,v 1.3 2005/04/08 01:24:08 das Exp $ .\" -.Dd January 11, 2005 +.Dd April 7, 2005 .Dt LROUND 3 .Os .Sh NAME .Nm llround , .Nm llroundf , +.Nm llroundl , .Nm lround , -.Nm lroundf +.Nm lroundf , +.Nm lroundl .Nd "convert to nearest integral value" .Sh LIBRARY .Lb libm @@ -41,10 +43,14 @@ .Fn llround "double x" .Ft "long long" .Fn llroundf "float x" +.Ft "long long" +.Fn llroundl "long double x" .Ft long .Fn lround "double x" .Ft long .Fn lroundf "float x" +.Ft long +.Fn lroundl "long double x" .Sh DESCRIPTION The .Fn lround @@ -70,8 +76,10 @@ The .Fn llround , .Fn llroundf , +.Fn llroundl , +.Fn lroundf and -.Fn lroundf +.Fn lroundl functions differ from .Fn lround only in their input and output types. @@ -84,11 +92,21 @@ The .Fn llround , .Fn llroundf , +.Fn llroundl , .Fn lround , +.Fn lroundf , and -.Fn lroundf +.Fn lroundl functions conform to .St -isoC-99 . .Sh HISTORY -These routines first appeared in +The +.Ft float +and +.Ft double +versions of these routines first appeared in .Fx 5.4 . +The +.Ft long double +versions appeared in +.Fx 6.0 . ==== //depot/projects/davidxu_thread/src/lib/msun/man/round.3#3 (text+ko) ==== @@ -22,14 +22,15 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/msun/man/round.3,v 1.4 2005/01/11 23:12:17 das Exp $ +.\" $FreeBSD: src/lib/msun/man/round.3,v 1.5 2005/04/08 01:24:08 das Exp $ .\" -.Dd November 29, 2003 +.Dd April 7, 2005 .Dt ROUND 3 .Os .Sh NAME .Nm round , -.Nm roundf +.Nm roundf , +.Nm roundl .Nd round to nearest integral value .Sh LIBRARY .Lb libm @@ -39,11 +40,14 @@ .Fn round "double x" .Ft float .Fn roundf "float x" +.Ft long double +.Fn roundl "long double x" .Sh DESCRIPTION The -.Fn round +.Fn round , +.Fn roundf , and -.Fn roundf +.Fn roundl functions return the nearest integral value to .Fa x ; if @@ -61,9 +65,7 @@ .Xr rint 3 , .Xr trunc 3 .Sh STANDARDS -The -.Fn round -function conforms to +These functions conform to .St -isoC-99 . .Sh HISTORY The @@ -72,3 +74,7 @@ .Fn roundf functions appeared in .Fx 5.3 . +The +.Fn roundl +function appeared in +.Fx 6.0 . ==== //depot/projects/davidxu_thread/src/lib/msun/src/math.h#7 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math.h,v 1.59 2005/04/05 02:57:15 das Exp $ + * $FreeBSD: src/lib/msun/src/math.h,v 1.60 2005/04/08 01:24:08 das Exp $ */ #ifndef _MATH_H_ @@ -428,14 +428,18 @@ #if 0 long double lgammal(long double); long long llrintl(long double); +#endif long long llroundl(long double); +#if 0 long double log10l(long double); long double log1pl(long double); long double log2l(long double); long double logbl(long double); long double logl(long double); long lrintl(long double); +#endif long lroundl(long double); +#if 0 long double modfl(long double, long double *); /* fundamentally !__pure2 */ long double nanl(const char *) __pure2; long double nearbyintl(long double); @@ -449,8 +453,8 @@ long double remainderl(long double, long double); long double remquol(long double, long double, int *); long double rintl(long double); +#endif long double roundl(long double); -#endif long double scalblnl(long double, long); long double scalbnl(long double, int); #if 0 ==== //depot/projects/davidxu_thread/src/lib/msun/src/s_llround.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_llround.c,v 1.1 2005/01/11 23:12:55 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_llround.c,v 1.2 2005/04/08 00:52:27 das Exp $"); #define type double #define roundit round @@ -8,4 +8,4 @@ #define DTYPE_MAX LLONG_MAX #define fn llround -#include "s_lrint.c" +#include "s_lround.c" ==== //depot/projects/davidxu_thread/src/lib/msun/src/s_llroundf.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_llroundf.c,v 1.1 2005/01/11 23:12:55 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_llroundf.c,v 1.2 2005/04/08 00:52:27 das Exp $"); #define type float #define roundit roundf @@ -8,4 +8,4 @@ #define DTYPE_MAX LLONG_MAX #define fn llroundf -#include "s_lrint.c" +#include "s_lround.c" ==== //depot/projects/davidxu_thread/src/lib/msun/src/s_lround.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ #include #ifndef type -__FBSDID("$FreeBSD: src/lib/msun/src/s_lround.c,v 1.1 2005/01/11 23:12:55 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_lround.c,v 1.2 2005/04/08 00:52:16 das Exp $"); #define type double #define roundit round #define dtype long @@ -44,12 +44,11 @@ * of the form xxx.5; they are "out of range" because lround() rounds away * from 0. On the other hand, if type has less precision than dtype, then * all values that are out of range are integral, so we might as well assume - * that everything is in range. (The correct condition in this case is - * harder to express.) At compile time, INRANGE(x) should reduce to two - * floating-point comparisons in the former case, or TRUE otherwise. + * that everything is in range. At compile time, INRANGE(x) should reduce to + * two floating-point comparisons in the former case, or TRUE otherwise. */ -static const double dtype_min = DTYPE_MIN - 0.5; -static const double dtype_max = DTYPE_MAX + 0.5; +static const type dtype_min = DTYPE_MIN - 0.5; +static const type dtype_max = DTYPE_MAX + 0.5; #define INRANGE(x) (dtype_max - DTYPE_MAX != 0.5 || \ ((x) > dtype_min && (x) < dtype_max)) ==== //depot/projects/davidxu_thread/src/lib/msun/src/s_lroundf.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_lroundf.c,v 1.1 2005/01/11 23:12:55 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_lroundf.c,v 1.2 2005/04/08 00:52:27 das Exp $"); #define type float #define roundit roundf @@ -8,4 +8,4 @@ #define DTYPE_MAX LONG_MAX #define fn lroundf -#include "s_lrint.c" +#include "s_lround.c" ==== //depot/projects/davidxu_thread/src/libexec/rexecd/rexecd.c#8 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)rexecd.c 8.1 (Berkeley) 6/4/93"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/rexecd/rexecd.c,v 1.39 2005/04/05 18:25:27 nectar Exp $"; + "$FreeBSD: src/libexec/rexecd/rexecd.c,v 1.40 2005/04/07 19:26:35 nectar Exp $"; #endif /* not lint */ #include @@ -136,9 +136,9 @@ { char *cmdbuf, *cp; int maxcmdlen; - char user[16], pass[16]; + char userbuf[16], pass[16]; struct passwd *pwd, pwd_storage; - char *pwdbuf; + char *pwdbuf, *user; size_t pwdbuflen; int fd, r, sd; u_short port; @@ -189,7 +189,8 @@ if (connect(sd, fromp, fromp->sa_len) < 0) exit(1); } - getstr(user, sizeof(user), "username"); + user = userbuf; + getstr(userbuf, sizeof(userbuf), "username"); getstr(pass, sizeof(pass), "password"); getstr(cmdbuf, maxcmdlen, "command"); (void) alarm(0); ==== //depot/projects/davidxu_thread/src/libexec/rtld-elf/arm/rtld_machdep.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/arm/rtld_machdep.h,v 1.4 2005/02/26 22:49:19 cognet Exp $ + * $FreeBSD: src/libexec/rtld-elf/arm/rtld_machdep.h,v 1.5 2005/04/07 22:04:49 cognet Exp $ */ #ifndef RTLD_MACHDEP_H @@ -71,16 +71,4 @@ extern void *__tls_get_addr(tls_index *ti); -#ifndef ARM_HAS_ATOMIC_CMPSET_32 -static __inline u_int32_t -atomic_cmpset_32(volatile u_int32_t *p, u_int32_t cmpval, u_int32_t newval) -{ - - if (*p == cmpval) { - *p = newval; - return (1); - } - return (0); -} -#endif #endif ==== //depot/projects/davidxu_thread/src/sbin/geom/class/Makefile.inc#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/sbin/geom/class/Makefile.inc,v 1.6 2004/08/02 09:05:29 pjd Exp $ +# $FreeBSD: src/sbin/geom/class/Makefile.inc,v 1.7 2005/04/07 15:57:38 pjd Exp $ SHLIBDIR?=${CLASS_DIR} SHLIB_NAME?=geom_${CLASS}.so -LINKS= ${BINDIR}/geom ${BINDIR}/g${CLASS} +LINKS= ${BINDIR}/geom ${BINDIR}/g${CLASS} MAN= g${CLASS}.8 -SRCS= geom_${CLASS}.c subr.c +SRCS+= geom_${CLASS}.c subr.c CFLAGS+= -I${.CURDIR}/../.. ==== //depot/projects/davidxu_thread/src/sbin/geom/core/geom.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/core/geom.c,v 1.20 2005/03/22 22:05:44 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/core/geom.c,v 1.21 2005/04/07 06:46:11 pjd Exp $"); #include #include @@ -436,7 +436,7 @@ gctl_rw_param(req, "output", sizeof(buf), buf); errstr = gctl_issue(req); } - if (errstr != NULL) { + if (errstr != NULL && errstr[0] != '\0') { fprintf(stderr, "%s\n", errstr); if (strncmp(errstr, "warning: ", strlen("warning: ")) != 0) { gctl_free(req); ==== //depot/projects/davidxu_thread/src/sbin/nfsiod/nfsiod.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #endif #include -__FBSDID("$FreeBSD: src/sbin/nfsiod/nfsiod.c,v 1.17 2004/04/09 19:58:34 markm Exp $"); +__FBSDID("$FreeBSD: src/sbin/nfsiod/nfsiod.c,v 1.18 2005/04/07 20:37:04 brooks Exp $"); #include #include @@ -119,7 +119,7 @@ len = sizeof iodmax; error = sysctlbyname("vfs.nfs.iodmax", &iodmax, &len, NULL, 0); if (error < 0) - err(1, "sysctlbyname(\"vfs.nfs.iodmin\")"); + err(1, "sysctlbyname(\"vfs.nfs.iodmax\")"); /* Catch the case where we're lowering num_servers below iodmin */ if (iodmin > num_servers) { iodmin = num_servers; ==== //depot/projects/davidxu_thread/src/share/man/man4/Makefile#12 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.311 2005/03/31 19:44:15 scottl Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.312 2005/04/07 21:57:19 rwatson Exp $ MAN= aac.4 \ acpi.4 \ @@ -249,6 +249,8 @@ sbp.4 \ sbp_targ.4 \ sbsh.4 \ + sched_4bsd.4 \ + sched_ule.4 \ screen.4 \ scsi.4 \ sem.4 \ ==== //depot/projects/davidxu_thread/src/share/man/man4/atkbdc.4#2 (text+ko) ==== @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/atkbdc.4,v 1.16 2001/10/13 09:08:30 yokota Exp $ +.\" $FreeBSD: src/share/man/man4/atkbdc.4,v 1.18 2005/04/07 23:59:37 sobomax Exp $ .\" .Dd February 9, 1999 .Dt ATKBDC 4 ==== //depot/projects/davidxu_thread/src/share/man/man4/carp.4#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/carp.4,v 1.4 2005/03/23 08:06:38 rse Exp $ +.\" $FreeBSD: src/share/man/man4/carp.4,v 1.6 2005/04/07 15:28:14 glebius Exp $ .\" -.Dd March 23, 2005 +.Dd April 7, 2005 .Dt CARP 4 .Os .Sh NAME @@ -70,6 +70,23 @@ which is used to authenticate .Nm advertisements. +The +.Cm advbase +parameter stands for +.Qq advertisement base . +It is measured in seconds and specifies the base of the adverisement interval. +The +.Cm advskew +parameter stands for +.Qq advertisement skew . +It is measured in 1/256 of seconds. +It is added to the base advertisement interval to make one host advertise +a bit slower that the other does. +Both +.Cm advbase +and +.Cm advskew +are put inside CARP advertisments. These configurations can be done using .Xr ifconfig 8 , or through the @@ -127,22 +144,18 @@ This is the setup for host A: .Bd -literal -offset indent ifconfig carp0 create -ifconfig carp0 vhid 1 pass mekmitasdigoat 192.168.1.1 \e - 255.255.255.0 +ifconfig carp0 vhid 1 pass mekmitasdigoat 192.168.1.1/24 ifconfig carp1 create -ifconfig carp1 vhid 2 pass mekmitasdigoat 192.168.2.1 \e - 255.255.255.0 +ifconfig carp1 vhid 2 pass mekmitasdigoat 192.168.2.1/24 .Ed .Pp The setup for host B is identical, but it has a higher .Cm advskew : .Bd -literal -offset indent ifconfig carp0 create -ifconfig carp0 vhid 1 advskew 100 pass mekmitasdigoat \e - 192.168.1.1 255.255.255.0 +ifconfig carp0 vhid 1 advskew 100 pass mekmitasdigoat 192.168.1.1/24 ifconfig carp1 create -ifconfig carp1 vhid 2 advskew 100 pass mekmitasdigoat \e - 192.168.2.1 255.255.255.0 +ifconfig carp1 vhid 2 advskew 100 pass mekmitasdigoat 192.168.2.1/24 .Ed .Pp Because of the preempt option, when one of the physical interfaces of @@ -169,11 +182,9 @@ out slightly less frequently. .Bd -literal -offset indent ifconfig carp0 create -ifconfig carp0 vhid 1 pass mekmitasdigoat 192.168.1.10 \e - 255.255.255.0 +ifconfig carp0 vhid 1 pass mekmitasdigoat 192.168.1.10/24 ifconfig carp1 create -ifconfig carp1 vhid 2 advskew 100 pass mekmitasdigoat \e - 192.168.1.10 255.255.255.0 +ifconfig carp1 vhid 2 advskew 100 pass mekmitasdigoat 192.168.1.10/24 .Ed .Pp The configuration for host B is identical, except the @@ -181,11 +192,9 @@ is on virtual host 1 rather than virtual host 2. .Bd -literal -offset indent ifconfig carp0 create -ifconfig carp0 vhid 1 advskew 100 pass mekmitasdigoat \e - 192.168.1.10 255.255.255.0 +ifconfig carp0 vhid 1 advskew 100 pass mekmitasdigoat 192.168.1.10/24 ifconfig carp1 create -ifconfig carp1 vhid 2 pass mekmitasdigoat 192.168.1.10 \e - 255.255.255.0 +ifconfig carp1 vhid 2 pass mekmitasdigoat 192.168.1.10/24 .Ed .Pp Finally, the ARP balancing feature must be enabled on both hosts: ==== //depot/projects/davidxu_thread/src/share/man/man4/geom.4#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/geom.4,v 1.11 2004/07/03 18:29:20 ru Exp $ +.\" $FreeBSD: src/share/man/man4/geom.4,v 1.12 2005/04/07 19:59:28 scottl Exp $ .\" .Dd March 27, 2002 .Os @@ -330,6 +330,33 @@ a separate section below. .Pp (stay tuned while the author rests his brain and fingers: more to come.) +.Sh DIAGNOSTICS +Several flags are provided for tracing GEOM operations and unlocking +protection mechanisms via the +.Va kern.geom.debugflags +sysctl. +All of these flags are off by default, and great care should be taken in +turning them on. +.Bl -tag -width FAIL +.It 0x01 (G_T_TOPOLOGY) +Provide tracing of topology change events. +.It 0x02 (G_T_BIO) +Provide tracing of buffer I/O requests. +.It 0x04 (G_T_ACCESS) +Provide tracing of access check controls. +.It 0x08 (unused) +.It 0x10 (allow foot shooting) +Allow writing to Rank 1 providers. +This would, for example, allow the super-user to overwrite the MBR on the root +disk or write random sectors elsewhere to a mounted disk. The implications +are obvious. +.It 0x20 (G_T_DETAILS) +This appears to be unused at this time. +.It 0x40 (G_F_DISKIOCTL) +This appears to be unused at this time. +.It 0x80 (G_F_CTLDUMP) +Dump contents of gctl requests. +.El .Sh HISTORY This software was developed for the FreeBSD Project by Poul-Henning Kamp and NAI Labs, the Security Research Division of Network Associates, Inc. ==== //depot/projects/davidxu_thread/src/share/man/man9/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.254 2005/02/22 17:42:12 brueffer Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.255 2005/04/07 17:27:14 njl Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -51,6 +51,7 @@ devclass_find.9 \ devclass_get_device.9 \ devclass_get_devices.9 \ + devclass_get_drivers.9 \ devclass_get_maxunit.9 \ devclass_get_name.9 \ devclass_get_softc.9 \ ==== //depot/projects/davidxu_thread/src/sys/arm/arm/pmap.c#9 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.26 2005/03/16 23:56:29 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.27 2005/04/07 22:01:53 cognet Exp $"); #include #include #include @@ -402,7 +402,7 @@ /* * Data for the pv entry allocation mechanism */ -#define MINPV 1024 +#define MINPV 2048 #ifndef PMAP_SHPGPERPROC #define PMAP_SHPGPERPROC 200 @@ -1205,6 +1205,18 @@ } /* + * this routine defines the region(s) of memory that should + * not be tested for the modified bit. + */ +static PMAP_INLINE int +pmap_track_modified(vm_offset_t va) +{ + if ((va < kmi.clean_sva) || (va >= kmi.clean_eva)) + return 1; + else + return 0; +} +/* * PTE_SYNC_CURRENT: * * Make sure the pte is written out to RAM. @@ -1538,7 +1550,6 @@ pm = pv->pv_pmap; oflags = pv->pv_flags; pv->pv_flags &= ~maskbits; - pmap_update(pv->pv_pmap); #if 0 pmap_acquire_pmap_lock(pm); @@ -1549,7 +1560,8 @@ ptep = &l2b->l2b_kva[l2pte_index(va)]; npte = opte = *ptep; - if (maskbits & (PVF_WRITE|PVF_MOD)) { + if (maskbits & (PVF_WRITE|PVF_MOD) && + !pmap_track_modified(pv->pv_va)) { if ((pv->pv_flags & PVF_NC)) { /* * Entry is not cacheable: @@ -1570,6 +1582,7 @@ } } else if (opte & L2_S_PROT_W) { + vm_page_dirty(pg); /* * Entry is writable/cacheable: check if pmap * is current if it is flush it, otherwise it @@ -1606,7 +1619,7 @@ } } - if (maskbits & PVF_REF) { + if (maskbits & PVF_REF && !pmap_track_modified(pv->pv_va)) { if ((pv->pv_flags & PVF_NC) == 0 && (maskbits & (PVF_WRITE|PVF_MOD)) == 0) { /* @@ -1706,6 +1719,7 @@ mtx_lock(&pg->md.pvh_mtx); #endif TAILQ_INSERT_HEAD(&pg->md.pv_list, pve, pv_list); + TAILQ_INSERT_HEAD(&pm->pm_pvlist, pve, pv_plist); pg->md.pvh_attrs |= flags & (PVF_REF | PVF_MOD); if (pm == pmap_kernel()) { if (flags & PVF_WRITE) @@ -1723,6 +1737,7 @@ #endif if (pve->pv_flags & PVF_WIRED) ++pm->pm_stats.wired_count; + vm_page_flag_set(pg, PG_REFERENCED); } /* @@ -1779,9 +1794,12 @@ { TAILQ_REMOVE(&pg->md.pv_list, pve, pv_list); + TAILQ_REMOVE(&pm->pm_pvlist, pve, pv_plist); if (pve->pv_flags & PVF_WIRED) --pm->pm_stats.wired_count; pg->md.pv_list_count--; + if (pg->md.pvh_attrs & PVF_MOD) + vm_page_dirty(pg); if (pm == pmap_kernel()) { if (pve->pv_flags & PVF_WRITE) pg->md.krw_mappings--; @@ -1792,8 +1810,18 @@ pg->md.urw_mappings--; else pg->md.uro_mappings--; - if (TAILQ_FIRST(&pg->md.pv_list) == NULL) + if (TAILQ_FIRST(&pg->md.pv_list) == NULL || + (pg->md.krw_mappings == 0 && pg->md.urw_mappings == 0)) { + pg->md.pvh_attrs &= ~PVF_MOD; + if (TAILQ_FIRST(&pg->md.pv_list) == NULL) + pg->md.pvh_attrs &= ~PVF_REF; vm_page_flag_clear(pg, PG_WRITEABLE); + } else if (pmap_track_modified(pve->pv_va)) + vm_page_dirty(pg); + if (TAILQ_FIRST(&pg->md.pv_list)) + vm_page_flag_set(pg, PG_REFERENCED); + if (pve->pv_flags & PVF_WRITE) + pmap_vac_me_harder(pg, pm, 0); } static struct pv_entry * @@ -1869,6 +1897,11 @@ pg->md.uro_mappings++; pg->md.urw_mappings--; } + if (pg->md.krw_mappings == 0 && pg->md.urw_mappings == 0) { + pg->md.pvh_attrs &= ~PVF_MOD; + vm_page_flag_clear(pg, PG_WRITEABLE); + } + pmap_vac_me_harder(pg, pm, 0); } return (oflags); @@ -2014,7 +2047,10 @@ goto out; } - pg->md.pvh_attrs |= PVF_REF | PVF_MOD; + if (pmap_track_modified(pv->pv_va)) { + pg->md.pvh_attrs |= PVF_REF | PVF_MOD; + vm_page_dirty(pg); + } pv->pv_flags |= PVF_REF | PVF_MOD; /* @@ -2038,13 +2074,16 @@ struct vm_page *pg; /* Extract the physical address of the page */ - if ((pg = PHYS_TO_VM_PAGE(pa)) == NULL) + vm_page_lock_queues(); + if ((pg = PHYS_TO_VM_PAGE(pa)) == NULL) { + vm_page_unlock_queues(); goto out; - + } /* Get the current flags for this page. */ pv = pmap_find_pv(pg, pm, va); if (pv == NULL) { + vm_page_unlock_queues(); goto out; } @@ -2055,6 +2094,7 @@ *ptep = (pte & ~L2_TYPE_MASK) | L2_S_PROTO; PTE_SYNC(ptep); rv = 1; + vm_page_unlock_queues(); } /* @@ -2486,6 +2526,7 @@ kernel_pmap->pm_active = -1; kernel_pmap->pm_domain = PMAP_DOMAIN_KERNEL; LIST_INIT(&allpmaps); + TAILQ_INIT(&kernel_pmap->pm_pvlist); LIST_INSERT_HEAD(&allpmaps, kernel_pmap, pm_list); /* @@ -2585,7 +2626,7 @@ vm_paddr_t pa; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 8 02:37:07 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45A2816A4D0; Fri, 8 Apr 2005 02:37:07 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F34B116A4CE for ; Fri, 8 Apr 2005 02:37:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C32A443D31 for ; Fri, 8 Apr 2005 02:37:06 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j382b6gt002762 for ; Fri, 8 Apr 2005 02:37:06 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j382b6WJ002759 for perforce@freebsd.org; Fri, 8 Apr 2005 02:37:06 GMT (envelope-from davidxu@freebsd.org) Date: Fri, 8 Apr 2005 02:37:06 GMT Message-Id: <200504080237.j382b6WJ002759@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74708 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2005 02:37:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=74708 Change 74708 by davidxu@davidxu_celeron on 2005/04/08 02:36:41 why are they here ? Affected files ... .. //depot/projects/davidxu_thread/COPYRIGHT#2 delete .. //depot/projects/davidxu_thread/MAINTAINERS#2 delete .. //depot/projects/davidxu_thread/Makefile#2 delete .. //depot/projects/davidxu_thread/Makefile.inc1#2 delete .. //depot/projects/davidxu_thread/README#2 delete .. //depot/projects/davidxu_thread/UPDATING#2 delete .. //depot/projects/davidxu_thread/UPDATING.64BTT#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 8 02:41:13 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 61CDE16A4D0; Fri, 8 Apr 2005 02:41:13 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 24EE316A4CE for ; Fri, 8 Apr 2005 02:41:13 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33DD143D39 for ; Fri, 8 Apr 2005 02:41:12 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j382fCu7002922 for ; Fri, 8 Apr 2005 02:41:12 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j382fB6i002919 for perforce@freebsd.org; Fri, 8 Apr 2005 02:41:11 GMT (envelope-from davidxu@freebsd.org) Date: Fri, 8 Apr 2005 02:41:11 GMT Message-Id: <200504080241.j382fB6i002919@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74709 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2005 02:41:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=74709 Change 74709 by davidxu@davidxu_celeron on 2005/04/08 02:40:22 remove. Affected files ... .. //depot/projects/davidxu_thread/bin/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/Makefile.inc#2 delete .. //depot/projects/davidxu_thread/bin/cat/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/cat/cat.1#2 delete .. //depot/projects/davidxu_thread/bin/cat/cat.c#2 delete .. //depot/projects/davidxu_thread/bin/chflags/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/chflags/chflags.1#2 delete .. //depot/projects/davidxu_thread/bin/chflags/chflags.c#2 delete .. //depot/projects/davidxu_thread/bin/chio/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/chio/chio.1#2 delete .. //depot/projects/davidxu_thread/bin/chio/chio.c#2 delete .. //depot/projects/davidxu_thread/bin/chio/defs.h#2 delete .. //depot/projects/davidxu_thread/bin/chio/pathnames.h#2 delete .. //depot/projects/davidxu_thread/bin/chmod/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/chmod/chmod.1#2 delete .. //depot/projects/davidxu_thread/bin/chmod/chmod.c#2 delete .. //depot/projects/davidxu_thread/bin/cp/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/cp/cp.1#2 delete .. //depot/projects/davidxu_thread/bin/cp/cp.c#2 delete .. //depot/projects/davidxu_thread/bin/cp/extern.h#2 delete .. //depot/projects/davidxu_thread/bin/cp/utils.c#2 delete .. //depot/projects/davidxu_thread/bin/csh/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/csh/USD.doc/csh.1#2 delete .. //depot/projects/davidxu_thread/bin/csh/USD.doc/csh.2#2 delete .. //depot/projects/davidxu_thread/bin/csh/USD.doc/csh.3#2 delete .. //depot/projects/davidxu_thread/bin/csh/USD.doc/csh.4#2 delete .. //depot/projects/davidxu_thread/bin/csh/USD.doc/csh.a#2 delete .. //depot/projects/davidxu_thread/bin/csh/USD.doc/csh.g#2 delete .. //depot/projects/davidxu_thread/bin/csh/USD.doc/tabs#2 delete .. //depot/projects/davidxu_thread/bin/csh/config.h#2 delete .. //depot/projects/davidxu_thread/bin/csh/host.defs#2 delete .. //depot/projects/davidxu_thread/bin/date/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/date/date.1#2 delete .. //depot/projects/davidxu_thread/bin/date/date.c#2 delete .. //depot/projects/davidxu_thread/bin/date/extern.h#2 delete .. //depot/projects/davidxu_thread/bin/date/netdate.c#2 delete .. //depot/projects/davidxu_thread/bin/date/vary.c#2 delete .. //depot/projects/davidxu_thread/bin/date/vary.h#2 delete .. //depot/projects/davidxu_thread/bin/dd/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/dd/args.c#2 delete .. //depot/projects/davidxu_thread/bin/dd/conv.c#2 delete .. //depot/projects/davidxu_thread/bin/dd/conv_tab.c#2 delete .. //depot/projects/davidxu_thread/bin/dd/dd.1#2 delete .. //depot/projects/davidxu_thread/bin/dd/dd.c#2 delete .. //depot/projects/davidxu_thread/bin/dd/dd.h#2 delete .. //depot/projects/davidxu_thread/bin/dd/extern.h#2 delete .. //depot/projects/davidxu_thread/bin/dd/gen.c#2 delete .. //depot/projects/davidxu_thread/bin/dd/misc.c#2 delete .. //depot/projects/davidxu_thread/bin/dd/position.c#2 delete .. //depot/projects/davidxu_thread/bin/dd/ref.ascii#2 delete .. //depot/projects/davidxu_thread/bin/dd/ref.ebcdic#2 delete .. //depot/projects/davidxu_thread/bin/dd/ref.ibm#2 delete .. //depot/projects/davidxu_thread/bin/dd/ref.lcase#2 delete .. //depot/projects/davidxu_thread/bin/dd/ref.oldascii#2 delete .. //depot/projects/davidxu_thread/bin/dd/ref.oldebcdic#2 delete .. //depot/projects/davidxu_thread/bin/dd/ref.oldibm#2 delete .. //depot/projects/davidxu_thread/bin/dd/ref.pareven#2 delete .. //depot/projects/davidxu_thread/bin/dd/ref.parnone#2 delete .. //depot/projects/davidxu_thread/bin/dd/ref.parodd#2 delete .. //depot/projects/davidxu_thread/bin/dd/ref.parset#2 delete .. //depot/projects/davidxu_thread/bin/dd/ref.swab#2 delete .. //depot/projects/davidxu_thread/bin/dd/ref.ucase#2 delete .. //depot/projects/davidxu_thread/bin/df/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/df/df.1#2 delete .. //depot/projects/davidxu_thread/bin/df/df.c#2 delete .. //depot/projects/davidxu_thread/bin/domainname/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/domainname/domainname.1#2 delete .. //depot/projects/davidxu_thread/bin/domainname/domainname.c#2 delete .. //depot/projects/davidxu_thread/bin/echo/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/echo/echo.1#2 delete .. //depot/projects/davidxu_thread/bin/echo/echo.c#2 delete .. //depot/projects/davidxu_thread/bin/ed/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/ed/POSIX#2 delete .. //depot/projects/davidxu_thread/bin/ed/README#2 delete .. //depot/projects/davidxu_thread/bin/ed/buf.c#2 delete .. //depot/projects/davidxu_thread/bin/ed/cbc.c#2 delete .. //depot/projects/davidxu_thread/bin/ed/ed.1#2 delete .. //depot/projects/davidxu_thread/bin/ed/ed.h#2 delete .. //depot/projects/davidxu_thread/bin/ed/glbl.c#2 delete .. //depot/projects/davidxu_thread/bin/ed/io.c#2 delete .. //depot/projects/davidxu_thread/bin/ed/main.c#2 delete .. //depot/projects/davidxu_thread/bin/ed/re.c#2 delete .. //depot/projects/davidxu_thread/bin/ed/sub.c#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/=.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/README#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/TODO#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/a.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/a.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/a.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/a1.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/a2.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/addr.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/addr.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/addr.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/addr1.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/addr2.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/ascii.d.uu#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/ascii.r.uu#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/ascii.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/bang1.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/bang1.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/bang1.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/bang1.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/bang2.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/c.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/c.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/c.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/c1.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/c2.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/ckscripts.sh#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/d.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/d.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/d.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/d.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/e1.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/e1.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/e1.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/e1.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/e2.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/e2.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/e2.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/e2.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/e3.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/e3.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/e3.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/e3.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/e4.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/e4.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/e4.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/f1.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/f2.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/g1.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/g1.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/g1.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/g1.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/g2.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/g2.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/g2.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/g2.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/g3.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/g3.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/g3.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/g3.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/g4.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/g4.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/g4.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/g5.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/g5.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/g5.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/h.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/i.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/i.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/i.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/i1.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/i2.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/i3.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/j.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/j.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/j.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/k.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/k.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/k.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/k1.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/k2.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/k3.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/k4.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/l.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/l.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/l.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/m.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/m.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/m.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/m.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/mkscripts.sh#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/n.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/n.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/n.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/nl.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/nl1.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/nl1.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/nl1.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/nl2.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/nl2.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/nl2.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/p.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/p.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/p.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/q.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/q.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/q.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/q1.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/r1.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/r1.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/r1.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/r1.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/r2.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/r2.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/r2.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/r2.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/r3.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/r3.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/r3.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/s1.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/s1.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/s1.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/s1.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/s10.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/s2.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/s2.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/s2.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/s2.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/s3.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/s3.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/s3.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/s3.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/s4.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/s5.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/s6.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/s7.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/s8.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/s9.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/t.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/t.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/t1.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/t1.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/t1.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/t1.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/t2.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/t2.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/t2.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/t2.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/u.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/u.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/u.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/u.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/v.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/v.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/v.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/w.d#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/w.r#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/w.t#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/w1.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/w2.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/w3.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/x.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/test/z.err#2 delete .. //depot/projects/davidxu_thread/bin/ed/undo.c#2 delete .. //depot/projects/davidxu_thread/bin/expr/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/expr/expr.1#2 delete .. //depot/projects/davidxu_thread/bin/expr/expr.y#2 delete .. //depot/projects/davidxu_thread/bin/getfacl/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/getfacl/getfacl.1#2 delete .. //depot/projects/davidxu_thread/bin/getfacl/getfacl.c#2 delete .. //depot/projects/davidxu_thread/bin/hostname/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/hostname/hostname.1#2 delete .. //depot/projects/davidxu_thread/bin/hostname/hostname.c#2 delete .. //depot/projects/davidxu_thread/bin/kenv/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/kenv/kenv.1#2 delete .. //depot/projects/davidxu_thread/bin/kenv/kenv.c#2 delete .. //depot/projects/davidxu_thread/bin/kill/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/kill/kill.1#2 delete .. //depot/projects/davidxu_thread/bin/kill/kill.c#2 delete .. //depot/projects/davidxu_thread/bin/ln/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/ln/ln.1#2 delete .. //depot/projects/davidxu_thread/bin/ln/ln.c#2 delete .. //depot/projects/davidxu_thread/bin/ln/symlink.7#2 delete .. //depot/projects/davidxu_thread/bin/ls/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/ls/cmp.c#2 delete .. //depot/projects/davidxu_thread/bin/ls/extern.h#2 delete .. //depot/projects/davidxu_thread/bin/ls/ls.1#2 delete .. //depot/projects/davidxu_thread/bin/ls/ls.c#2 delete .. //depot/projects/davidxu_thread/bin/ls/ls.h#2 delete .. //depot/projects/davidxu_thread/bin/ls/print.c#2 delete .. //depot/projects/davidxu_thread/bin/ls/util.c#2 delete .. //depot/projects/davidxu_thread/bin/mkdir/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/mkdir/mkdir.1#2 delete .. //depot/projects/davidxu_thread/bin/mkdir/mkdir.c#2 delete .. //depot/projects/davidxu_thread/bin/mv/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/mv/mv.1#2 delete .. //depot/projects/davidxu_thread/bin/mv/mv.c#2 delete .. //depot/projects/davidxu_thread/bin/pax/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/pax/ar_io.c#2 delete .. //depot/projects/davidxu_thread/bin/pax/ar_subs.c#2 delete .. //depot/projects/davidxu_thread/bin/pax/buf_subs.c#2 delete .. //depot/projects/davidxu_thread/bin/pax/cache.c#2 delete .. //depot/projects/davidxu_thread/bin/pax/cache.h#2 delete .. //depot/projects/davidxu_thread/bin/pax/cpio.1#2 delete .. //depot/projects/davidxu_thread/bin/pax/cpio.c#2 delete .. //depot/projects/davidxu_thread/bin/pax/cpio.h#2 delete .. //depot/projects/davidxu_thread/bin/pax/extern.h#2 delete .. //depot/projects/davidxu_thread/bin/pax/file_subs.c#2 delete .. //depot/projects/davidxu_thread/bin/pax/ftree.c#2 delete .. //depot/projects/davidxu_thread/bin/pax/ftree.h#2 delete .. //depot/projects/davidxu_thread/bin/pax/gen_subs.c#2 delete .. //depot/projects/davidxu_thread/bin/pax/getoldopt.c#2 delete .. //depot/projects/davidxu_thread/bin/pax/options.c#2 delete .. //depot/projects/davidxu_thread/bin/pax/options.h#2 delete .. //depot/projects/davidxu_thread/bin/pax/pat_rep.c#2 delete .. //depot/projects/davidxu_thread/bin/pax/pat_rep.h#2 delete .. //depot/projects/davidxu_thread/bin/pax/pax.1#2 delete .. //depot/projects/davidxu_thread/bin/pax/pax.c#2 delete .. //depot/projects/davidxu_thread/bin/pax/pax.h#2 delete .. //depot/projects/davidxu_thread/bin/pax/sel_subs.c#2 delete .. //depot/projects/davidxu_thread/bin/pax/sel_subs.h#2 delete .. //depot/projects/davidxu_thread/bin/pax/tables.c#2 delete .. //depot/projects/davidxu_thread/bin/pax/tables.h#2 delete .. //depot/projects/davidxu_thread/bin/pax/tar.1#2 delete .. //depot/projects/davidxu_thread/bin/pax/tar.c#2 delete .. //depot/projects/davidxu_thread/bin/pax/tar.h#2 delete .. //depot/projects/davidxu_thread/bin/pax/tty_subs.c#2 delete .. //depot/projects/davidxu_thread/bin/ps/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/ps/extern.h#2 delete .. //depot/projects/davidxu_thread/bin/ps/fmt.c#2 delete .. //depot/projects/davidxu_thread/bin/ps/keyword.c#2 delete .. //depot/projects/davidxu_thread/bin/ps/nlist.c#2 delete .. //depot/projects/davidxu_thread/bin/ps/print.c#2 delete .. //depot/projects/davidxu_thread/bin/ps/ps.1#2 delete .. //depot/projects/davidxu_thread/bin/ps/ps.c#2 delete .. //depot/projects/davidxu_thread/bin/ps/ps.h#2 delete .. //depot/projects/davidxu_thread/bin/pwd/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/pwd/pwd.1#2 delete .. //depot/projects/davidxu_thread/bin/pwd/pwd.c#2 delete .. //depot/projects/davidxu_thread/bin/rcp/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/rcp/extern.h#2 delete .. //depot/projects/davidxu_thread/bin/rcp/rcp.1#2 delete .. //depot/projects/davidxu_thread/bin/rcp/rcp.c#2 delete .. //depot/projects/davidxu_thread/bin/rcp/util.c#2 delete .. //depot/projects/davidxu_thread/bin/realpath/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/realpath/realpath.1#2 delete .. //depot/projects/davidxu_thread/bin/realpath/realpath.c#2 delete .. //depot/projects/davidxu_thread/bin/rm/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/rm/rm.1#2 delete .. //depot/projects/davidxu_thread/bin/rm/rm.c#2 delete .. //depot/projects/davidxu_thread/bin/rmail/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/rmdir/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/rmdir/rmdir.1#2 delete .. //depot/projects/davidxu_thread/bin/rmdir/rmdir.c#2 delete .. //depot/projects/davidxu_thread/bin/setfacl/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/setfacl/file.c#2 delete .. //depot/projects/davidxu_thread/bin/setfacl/mask.c#2 delete .. //depot/projects/davidxu_thread/bin/setfacl/merge.c#2 delete .. //depot/projects/davidxu_thread/bin/setfacl/remove.c#2 delete .. //depot/projects/davidxu_thread/bin/setfacl/setfacl.1#2 delete .. //depot/projects/davidxu_thread/bin/setfacl/setfacl.c#2 delete .. //depot/projects/davidxu_thread/bin/setfacl/setfacl.h#2 delete .. //depot/projects/davidxu_thread/bin/setfacl/util.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/sh/TOUR#2 delete .. //depot/projects/davidxu_thread/bin/sh/alias.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/alias.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/arith.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/arith.y#2 delete .. //depot/projects/davidxu_thread/bin/sh/arith_lex.l#2 delete .. //depot/projects/davidxu_thread/bin/sh/bltin/bltin.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/bltin/echo.1#2 delete .. //depot/projects/davidxu_thread/bin/sh/bltin/echo.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/builtins.def#2 delete .. //depot/projects/davidxu_thread/bin/sh/cd.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/cd.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/error.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/error.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/eval.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/eval.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/exec.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/exec.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/expand.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/expand.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/funcs/cmv#2 delete .. //depot/projects/davidxu_thread/bin/sh/funcs/dirs#2 delete .. //depot/projects/davidxu_thread/bin/sh/funcs/kill#2 delete .. //depot/projects/davidxu_thread/bin/sh/funcs/login#2 delete .. //depot/projects/davidxu_thread/bin/sh/funcs/newgrp#2 delete .. //depot/projects/davidxu_thread/bin/sh/funcs/popd#2 delete .. //depot/projects/davidxu_thread/bin/sh/funcs/pushd#2 delete .. //depot/projects/davidxu_thread/bin/sh/funcs/suspend#2 delete .. //depot/projects/davidxu_thread/bin/sh/histedit.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/init.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/input.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/input.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/jobs.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/jobs.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/mail.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/mail.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/main.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/main.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/memalloc.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/memalloc.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/miscbltin.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/mkbuiltins#2 delete .. //depot/projects/davidxu_thread/bin/sh/mkinit.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/mknodes.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/mksyntax.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/mktokens#2 delete .. //depot/projects/davidxu_thread/bin/sh/myhistedit.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/mystring.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/mystring.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/nodes.c.pat#2 delete .. //depot/projects/davidxu_thread/bin/sh/nodetypes#2 delete .. //depot/projects/davidxu_thread/bin/sh/options.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/options.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/output.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/output.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/parser.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/parser.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/redir.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/redir.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/sh.1#2 delete .. //depot/projects/davidxu_thread/bin/sh/shell.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/show.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/show.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/trap.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/trap.h#2 delete .. //depot/projects/davidxu_thread/bin/sh/var.c#2 delete .. //depot/projects/davidxu_thread/bin/sh/var.h#2 delete .. //depot/projects/davidxu_thread/bin/sleep/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/sleep/sleep.1#2 delete .. //depot/projects/davidxu_thread/bin/sleep/sleep.c#2 delete .. //depot/projects/davidxu_thread/bin/stty/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/stty/cchar.c#2 delete .. //depot/projects/davidxu_thread/bin/stty/extern.h#2 delete .. //depot/projects/davidxu_thread/bin/stty/gfmt.c#2 delete .. //depot/projects/davidxu_thread/bin/stty/key.c#2 delete .. //depot/projects/davidxu_thread/bin/stty/modes.c#2 delete .. //depot/projects/davidxu_thread/bin/stty/print.c#2 delete .. //depot/projects/davidxu_thread/bin/stty/stty.1#2 delete .. //depot/projects/davidxu_thread/bin/stty/stty.c#2 delete .. //depot/projects/davidxu_thread/bin/stty/stty.h#2 delete .. //depot/projects/davidxu_thread/bin/stty/util.c#2 delete .. //depot/projects/davidxu_thread/bin/sync/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/sync/sync.8#2 delete .. //depot/projects/davidxu_thread/bin/sync/sync.c#2 delete .. //depot/projects/davidxu_thread/bin/test/Makefile#2 delete .. //depot/projects/davidxu_thread/bin/test/TEST.README#2 delete .. //depot/projects/davidxu_thread/bin/test/TEST.csh#2 delete .. //depot/projects/davidxu_thread/bin/test/TEST.sh#2 delete .. //depot/projects/davidxu_thread/bin/test/test.1#2 delete .. //depot/projects/davidxu_thread/bin/test/test.c#2 delete .. //depot/projects/davidxu_thread/src/lib/libpthread/arch/arm/arm/context.S#3 branch .. //depot/projects/davidxu_thread/src/lib/libpthread/arch/arm/arm/pthread_md.c#3 branch .. //depot/projects/davidxu_thread/src/lib/libpthread/arch/arm/include/atomic_ops.h#3 branch .. //depot/projects/davidxu_thread/src/lib/libpthread/arch/arm/include/pthread_md.h#3 branch .. //depot/projects/davidxu_thread/src/libexec/rtld-aout/shlib.c#3 integrate .. //depot/projects/davidxu_thread/src/libexec/rtld-aout/shlib.h#2 integrate .. //depot/projects/davidxu_thread/src/libexec/rtld-aout/support.c#2 integrate .. //depot/projects/davidxu_thread/src/libexec/rtld-aout/support.h#2 integrate Differences ... ==== //depot/projects/davidxu_thread/src/libexec/rtld-aout/shlib.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-aout/shlib.c,v 1.23 2002/09/17 01:48:53 peter Exp $ + * $FreeBSD: src/libexec/rtld-aout/shlib.c,v 1.26 2005/01/14 12:22:57 delphij Exp $ */ #include @@ -62,14 +62,13 @@ char **search_dirs; int n_search_dirs; -char *standard_search_dirs[] = { - (char *)STANDARD_SEARCH_DIRS +const char *standard_search_dirs[] = { + STANDARD_SEARCH_DIRS }; void -add_search_dir(name) - char *name; +add_search_dir(const char *name) { int n; @@ -269,7 +268,7 @@ int *minorp; int do_dot_a; { - int namelen; + size_t namelen; DIR *dd; struct dirent *dp; int best_dewey[MAXDEWEY]; ==== //depot/projects/davidxu_thread/src/libexec/rtld-aout/shlib.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. *- - * $FreeBSD: src/libexec/rtld-aout/shlib.h,v 1.5 1999/08/28 00:10:06 peter Exp $ + * $FreeBSD: src/libexec/rtld-aout/shlib.h,v 1.8 2005/01/14 12:22:57 delphij Exp $ */ /* @@ -33,7 +33,7 @@ extern char **search_dirs; extern int n_search_dirs; -void add_search_dir __P((char *)); +void add_search_dir __P((const char *)); void add_search_path __P((char *)); void std_search_path __P((void)); int getdewey __P((int[], char *)); ==== //depot/projects/davidxu_thread/src/libexec/rtld-aout/support.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. *- - * $FreeBSD: src/libexec/rtld-aout/support.c,v 1.5 1999/08/28 00:10:06 peter Exp $ + * $FreeBSD: src/libexec/rtld-aout/support.c,v 1.7 2005/01/11 16:40:29 trhodes Exp $ */ #include #include ==== //depot/projects/davidxu_thread/src/libexec/rtld-aout/support.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. *- - * $FreeBSD: src/libexec/rtld-aout/support.h,v 1.4 1999/08/28 00:10:06 peter Exp $ + * $FreeBSD: src/libexec/rtld-aout/support.h,v 1.6 2005/01/11 16:40:29 trhodes Exp $ */ /* From owner-p4-projects@FreeBSD.ORG Fri Apr 8 02:44:18 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 765FC16A4D0; Fri, 8 Apr 2005 02:44:17 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C58316A4CE for ; Fri, 8 Apr 2005 02:44:17 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BF0843D1F for ; Fri, 8 Apr 2005 02:44:16 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j382iGmm003053 for ; Fri, 8 Apr 2005 02:44:16 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j382iGqI003050 for perforce@freebsd.org; Fri, 8 Apr 2005 02:44:16 GMT (envelope-from davidxu@freebsd.org) Date: Fri, 8 Apr 2005 02:44:16 GMT Message-Id: <200504080244.j382iGqI003050@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74710 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2005 02:44:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=74710 Change 74710 by davidxu@davidxu_celeron on 2005/04/08 02:44:04 remove wrong directories. Affected files ... .. //depot/projects/davidxu_thread/contrib/amd/AUTHORS#2 delete .. //depot/projects/davidxu_thread/contrib/amd/BUGS#2 delete .. //depot/projects/davidxu_thread/contrib/amd/COPYING#2 delete .. //depot/projects/davidxu_thread/contrib/amd/ChangeLog#2 delete .. //depot/projects/davidxu_thread/contrib/amd/FREEBSD-Xlist#2 delete .. //depot/projects/davidxu_thread/contrib/amd/FREEBSD-upgrade#2 delete .. //depot/projects/davidxu_thread/contrib/amd/INSTALL#2 delete .. //depot/projects/davidxu_thread/contrib/amd/MIRRORS.html#2 delete .. //depot/projects/davidxu_thread/contrib/amd/MIRRORS.txt#2 delete .. //depot/projects/davidxu_thread/contrib/amd/NEWS#2 delete .. //depot/projects/davidxu_thread/contrib/amd/README#2 delete .. //depot/projects/davidxu_thread/contrib/amd/README.ldap#2 delete .. //depot/projects/davidxu_thread/contrib/amd/README.y2k#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/am_ops.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/amd.8#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/amd.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/amd.h#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/amfs_auto.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/amfs_direct.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/amfs_error.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/amfs_host.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/amfs_inherit.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/amfs_link.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/amfs_linkx.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/amfs_nfsl.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/amfs_nfsx.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/amfs_program.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/amfs_root.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/amfs_toplvl.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/amfs_union.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/amq_subr.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/amq_svc.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/autil.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/clock.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/conf.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/conf_parse.y#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/conf_tok.l#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/get_args.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/info_file.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/info_hesiod.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/info_ldap.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/info_ndbm.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/info_nis.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/info_nisplus.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/info_passwd.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/info_union.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/map.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/mapc.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/mntfs.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/nfs_prot_svc.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/nfs_start.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/nfs_subr.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/ops_TEMPLATE.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/ops_cachefs.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/ops_cdfs.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/ops_efs.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/ops_lofs.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/ops_mfs.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/ops_nfs.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/ops_nfs3.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/ops_nullfs.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/ops_pcfs.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/ops_tfs.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/ops_tmpfs.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/ops_ufs.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/ops_umapfs.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/ops_unionfs.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/ops_xfs.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/opts.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/restart.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/rpc_fwd.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/sched.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/srvr_amfs_auto.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amd/srvr_nfs.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amq/amq.8#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amq/amq.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amq/amq.h#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amq/amq_clnt.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amq/amq_xdr.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amq/pawd.1#2 delete .. //depot/projects/davidxu_thread/contrib/amd/amq/pawd.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/aux_conf.h.in#2 delete .. //depot/projects/davidxu_thread/contrib/amd/bootstrap#2 delete .. //depot/projects/davidxu_thread/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#2 delete .. //depot/projects/davidxu_thread/contrib/amd/conf/mtab/mtab_bsd.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 delete .. //depot/projects/davidxu_thread/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 delete .. //depot/projects/davidxu_thread/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 delete .. //depot/projects/davidxu_thread/contrib/amd/conf/transp/transp_sockets.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/conf/trap/trap_default.h#2 delete .. //depot/projects/davidxu_thread/contrib/amd/conf/umount/umount_bsd44.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/doc/am-utils.texi#2 delete .. //depot/projects/davidxu_thread/contrib/amd/doc/texinfo.tex#2 delete .. //depot/projects/davidxu_thread/contrib/amd/doc/version.texi#2 delete .. //depot/projects/davidxu_thread/contrib/amd/fixmount/fixmount.8#2 delete .. //depot/projects/davidxu_thread/contrib/amd/fixmount/fixmount.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/fsinfo/fsi_analyze.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/fsinfo/fsi_data.h#2 delete .. //depot/projects/davidxu_thread/contrib/amd/fsinfo/fsi_dict.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/fsinfo/fsi_gram.y#2 delete .. //depot/projects/davidxu_thread/contrib/amd/fsinfo/fsi_lex.l#2 delete .. //depot/projects/davidxu_thread/contrib/amd/fsinfo/fsi_util.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/fsinfo/fsinfo.8#2 delete .. //depot/projects/davidxu_thread/contrib/amd/fsinfo/fsinfo.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/fsinfo/fsinfo.h#2 delete .. //depot/projects/davidxu_thread/contrib/amd/fsinfo/wr_atab.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/fsinfo/wr_bparam.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/fsinfo/wr_dumpset.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/fsinfo/wr_exportfs.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/fsinfo/wr_fstab.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/hlfsd/hlfsd.8#2 delete .. //depot/projects/davidxu_thread/contrib/amd/hlfsd/hlfsd.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/hlfsd/hlfsd.h#2 delete .. //depot/projects/davidxu_thread/contrib/amd/hlfsd/homedir.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/hlfsd/nfs_prot_svc.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/hlfsd/stubs.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/include/am_compat.h#2 delete .. //depot/projects/davidxu_thread/contrib/amd/include/am_defs.h#2 delete .. //depot/projects/davidxu_thread/contrib/amd/include/am_utils.h#2 delete .. //depot/projects/davidxu_thread/contrib/amd/include/am_xdr_func.h#2 delete .. //depot/projects/davidxu_thread/contrib/amd/include/amq_defs.h#2 delete .. //depot/projects/davidxu_thread/contrib/amd/include/mount_headers1.h#2 delete .. //depot/projects/davidxu_thread/contrib/amd/include/mount_headers2.h#2 delete .. //depot/projects/davidxu_thread/contrib/amd/ldap-id.ms#2 delete .. //depot/projects/davidxu_thread/contrib/amd/ldap-id.txt#2 delete .. //depot/projects/davidxu_thread/contrib/amd/libamu/alloca.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/libamu/amu.h#2 delete .. //depot/projects/davidxu_thread/contrib/amd/libamu/hasmntopt.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/libamu/misc_rpc.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/libamu/mount_fs.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/libamu/mtab.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/libamu/nfs_prot_xdr.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/libamu/strerror.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/libamu/util.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/libamu/wire.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/libamu/xdr_func.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/libamu/xutil.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/m4/GNUmakefile#2 delete .. //depot/projects/davidxu_thread/contrib/amd/m4/amdgrep#2 delete .. //depot/projects/davidxu_thread/contrib/amd/m4/amindent#2 delete .. //depot/projects/davidxu_thread/contrib/amd/m4/autopat#2 delete .. //depot/projects/davidxu_thread/contrib/amd/m4/chop-aclocal.pl#2 delete .. //depot/projects/davidxu_thread/contrib/amd/m4/copy-if-newbig#2 delete .. //depot/projects/davidxu_thread/contrib/amd/m4/macros/HEADER#2 delete .. //depot/projects/davidxu_thread/contrib/amd/m4/macros/TRAILER#2 delete .. //depot/projects/davidxu_thread/contrib/amd/m4/mk-aclocal#2 delete .. //depot/projects/davidxu_thread/contrib/amd/m4/mkconf#2 delete .. //depot/projects/davidxu_thread/contrib/amd/m4/rmtspc#2 delete .. //depot/projects/davidxu_thread/contrib/amd/m4/update_build_version#2 delete .. //depot/projects/davidxu_thread/contrib/amd/mk-amd-map/mk-amd-map.8#2 delete .. //depot/projects/davidxu_thread/contrib/amd/mk-amd-map/mk-amd-map.c#2 delete .. //depot/projects/davidxu_thread/contrib/amd/scripts/Makefile.am#2 delete .. //depot/projects/davidxu_thread/contrib/amd/scripts/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/amd/scripts/am-eject.in#2 delete .. //depot/projects/davidxu_thread/contrib/amd/scripts/amd.conf-sample#2 delete .. //depot/projects/davidxu_thread/contrib/amd/scripts/amd.conf.5#2 delete .. //depot/projects/davidxu_thread/contrib/amd/scripts/amd2ldif.in#2 delete .. //depot/projects/davidxu_thread/contrib/amd/scripts/amd2sun.in#2 delete .. //depot/projects/davidxu_thread/contrib/amd/scripts/automount2amd.8#2 delete .. //depot/projects/davidxu_thread/contrib/amd/scripts/automount2amd.in#2 delete .. //depot/projects/davidxu_thread/contrib/amd/scripts/ctl-amd.in#2 delete .. //depot/projects/davidxu_thread/contrib/amd/scripts/ctl-hlfsd.in#2 delete .. //depot/projects/davidxu_thread/contrib/amd/scripts/expn.1#2 delete .. //depot/projects/davidxu_thread/contrib/amd/scripts/expn.in#2 delete .. //depot/projects/davidxu_thread/contrib/amd/scripts/fix-amd-map.in#2 delete .. //depot/projects/davidxu_thread/contrib/amd/scripts/fixrmtab.in#2 delete .. //depot/projects/davidxu_thread/contrib/amd/scripts/redhat-ctl-amd.in#2 delete .. //depot/projects/davidxu_thread/contrib/amd/scripts/wait4amd.in#2 delete .. //depot/projects/davidxu_thread/contrib/amd/scripts/wait4amd2die.in#2 delete .. //depot/projects/davidxu_thread/contrib/amd/tasks#2 delete .. //depot/projects/davidxu_thread/contrib/amd/wire-test/wire-test.8#2 delete .. //depot/projects/davidxu_thread/contrib/amd/wire-test/wire-test.c#2 delete .. //depot/projects/davidxu_thread/contrib/bc/AUTHORS#2 delete .. //depot/projects/davidxu_thread/contrib/bc/ChangeLog#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Examples/ckbook.b#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Examples/pi.b#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Examples/primes.b#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Examples/twins.b#2 delete .. //depot/projects/davidxu_thread/contrib/bc/FAQ#2 delete .. //depot/projects/davidxu_thread/contrib/bc/FREEBSD-upgrade#2 delete .. //depot/projects/davidxu_thread/contrib/bc/INSTALL#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Makefile.am#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bc/NEWS#2 delete .. //depot/projects/davidxu_thread/contrib/bc/README#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Test/BUG.bc#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Test/array.b#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Test/arrayp.b#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Test/aryprm.b#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Test/atan.b#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Test/checklib.b#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Test/div.b#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Test/exp.b#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Test/fact.b#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Test/jn.b#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Test/ln.b#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Test/mul.b#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Test/raise.b#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Test/signum#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Test/sine.b#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Test/sqrt.b#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Test/sqrt1.b#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Test/sqrt2.b#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Test/testfn.b#2 delete .. //depot/projects/davidxu_thread/contrib/bc/Test/timetest#2 delete .. //depot/projects/davidxu_thread/contrib/bc/acconfig.h#2 delete .. //depot/projects/davidxu_thread/contrib/bc/aclocal.m4#2 delete .. //depot/projects/davidxu_thread/contrib/bc/bc/Makefile.am#2 delete .. //depot/projects/davidxu_thread/contrib/bc/bc/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bc/bc/bc.y#2 delete .. //depot/projects/davidxu_thread/contrib/bc/bc/bcdefs.h#2 delete .. //depot/projects/davidxu_thread/contrib/bc/bc/const.h#2 delete .. //depot/projects/davidxu_thread/contrib/bc/bc/execute.c#2 delete .. //depot/projects/davidxu_thread/contrib/bc/bc/fix-libmath_h#2 delete .. //depot/projects/davidxu_thread/contrib/bc/bc/global.c#2 delete .. //depot/projects/davidxu_thread/contrib/bc/bc/global.h#2 delete .. //depot/projects/davidxu_thread/contrib/bc/bc/libmath.b#2 delete .. //depot/projects/davidxu_thread/contrib/bc/bc/libmath.h#2 delete .. //depot/projects/davidxu_thread/contrib/bc/bc/load.c#2 delete .. //depot/projects/davidxu_thread/contrib/bc/bc/main.c#2 delete .. //depot/projects/davidxu_thread/contrib/bc/bc/proto.h#2 delete .. //depot/projects/davidxu_thread/contrib/bc/bc/sbc.y#2 delete .. //depot/projects/davidxu_thread/contrib/bc/bc/scan.l#2 delete .. //depot/projects/davidxu_thread/contrib/bc/bc/storage.c#2 delete .. //depot/projects/davidxu_thread/contrib/bc/bc/util.c#2 delete .. //depot/projects/davidxu_thread/contrib/bc/config.h.in#2 delete .. //depot/projects/davidxu_thread/contrib/bc/configure#2 delete .. //depot/projects/davidxu_thread/contrib/bc/configure.in#2 delete .. //depot/projects/davidxu_thread/contrib/bc/dc/Makefile.am#2 delete .. //depot/projects/davidxu_thread/contrib/bc/dc/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bc/dc/array.c#2 delete .. //depot/projects/davidxu_thread/contrib/bc/dc/dc-proto.h#2 delete .. //depot/projects/davidxu_thread/contrib/bc/dc/dc-regdef.h#2 delete .. //depot/projects/davidxu_thread/contrib/bc/dc/dc.c#2 delete .. //depot/projects/davidxu_thread/contrib/bc/dc/dc.h#2 delete .. //depot/projects/davidxu_thread/contrib/bc/dc/eval.c#2 delete .. //depot/projects/davidxu_thread/contrib/bc/dc/misc.c#2 delete .. //depot/projects/davidxu_thread/contrib/bc/dc/numeric.c#2 delete .. //depot/projects/davidxu_thread/contrib/bc/dc/stack.c#2 delete .. //depot/projects/davidxu_thread/contrib/bc/dc/string.c#2 delete .. //depot/projects/davidxu_thread/contrib/bc/doc/Makefile.am#2 delete .. //depot/projects/davidxu_thread/contrib/bc/doc/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bc/doc/bc.1#2 delete .. //depot/projects/davidxu_thread/contrib/bc/doc/bc.texi#2 delete .. //depot/projects/davidxu_thread/contrib/bc/doc/dc.1#2 delete .. //depot/projects/davidxu_thread/contrib/bc/doc/dc.texi#2 delete .. //depot/projects/davidxu_thread/contrib/bc/h/number.h#2 delete .. //depot/projects/davidxu_thread/contrib/bc/install-sh#2 delete .. //depot/projects/davidxu_thread/contrib/bc/lib/Makefile.am#2 delete .. //depot/projects/davidxu_thread/contrib/bc/lib/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bc/lib/number.c#2 delete .. //depot/projects/davidxu_thread/contrib/bc/lib/testmul.c#2 delete .. //depot/projects/davidxu_thread/contrib/bc/lib/vfprintf.c#2 delete .. //depot/projects/davidxu_thread/contrib/bc/missing#2 delete .. //depot/projects/davidxu_thread/contrib/bc/mkinstalldirs#2 delete .. //depot/projects/davidxu_thread/contrib/bc/stamp-h.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/CHANGES#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/COPYRIGHT#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/FAQ#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/FREEBSD-Upgrade#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/FREEBSD-Xlist#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/KNOWN_DEFECTS#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/README#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/acconfig.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/check/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/check/check-tool.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/check/check-tool.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/check/named-checkconf.8#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/check/named-checkconf.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/check/named-checkconf.docbook#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/check/named-checkconf.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/check/named-checkzone.8#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/check/named-checkzone.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/check/named-checkzone.docbook#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/check/named-checkzone.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dig/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dig/dig.1#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dig/dig.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dig/dig.docbook#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dig/dig.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dig/dighost.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dig/host.1#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dig/host.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dig/host.docbook#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dig/host.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dig/include/dig/dig.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dig/nslookup.1#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dig/nslookup.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dig/nslookup.docbook#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dig/nslookup.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dnssec/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dnssec/dnssectool.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/dnssec/dnssectool.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/aclconf.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/builtin.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/client.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/config.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/control.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/controlconf.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/aclconf.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/builtin.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/client.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/config.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/control.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/globals.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/interfacemgr.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/listenlist.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/log.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/logconf.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/lwaddr.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/lwdclient.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/lwresd.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/lwsearch.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/main.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/notify.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/query.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/server.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/sortlist.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/tkeyconf.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/tsigconf.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/types.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/update.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/xfrout.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/include/named/zoneconf.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/interfacemgr.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/listenlist.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/log.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/logconf.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/lwaddr.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/lwdclient.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/lwderror.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/lwdgabn.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/lwdgnba.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/lwdgrbn.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/lwdnoop.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/lwresd.8#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/lwresd.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/lwresd.docbook#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/lwresd.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/lwsearch.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/main.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/named.8#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/named.conf.5#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/named.conf.docbook#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/named.conf.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/named.docbook#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/named.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/notify.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/query.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/server.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/sortlist.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/tkeyconf.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/tsigconf.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/unix/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/unix/include/named/os.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/unix/os.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/update.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/xfrout.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/named/zoneconf.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/nsupdate/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/nsupdate/nsupdate.8#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/nsupdate/nsupdate.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/nsupdate/nsupdate.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/rndc/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/rndc/include/rndc/os.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/rndc/rndc-confgen.8#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/rndc/rndc-confgen.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/rndc/rndc-confgen.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/rndc/rndc.8#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/rndc/rndc.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/rndc/rndc.conf#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/rndc/rndc.conf.5#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/rndc/rndc.conf.docbook#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/rndc/rndc.conf.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/rndc/rndc.docbook#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/rndc/rndc.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/rndc/unix/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/rndc/unix/os.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/rndc/util.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/bin/rndc/util.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/config.guess#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/config.sub#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/configure.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/arm/Bv9ARM.html#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/arm/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/arm/README-SGML#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/arm/isc.color.gif#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/arm/validate.sh.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/draft/update#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/misc/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/misc/dnssec#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/misc/format-options.pl#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/misc/ipv6#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/misc/migration#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/misc/migration-4to9#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/misc/options#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/misc/rfc-compliance#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/misc/roadmap#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/misc/sdb#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/index#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1032.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1033.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1034.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1035.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1101.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1122.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1123.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1183.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1348.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1535.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1536.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1537.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1591.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1611.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1612.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1706.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1712.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1750.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1876.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1886.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1982.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1995.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc1996.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2052.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2104.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2119.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2133.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2136.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2137.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2163.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2168.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2181.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2230.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2308.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2317.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2373.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2374.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2375.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2418.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2535.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2536.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2537.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2538.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2539.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2540.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2541.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2553.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2671.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2672.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2673.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2782.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2825.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2826.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2845.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2874.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2915.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2929.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2930.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc2931.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3007.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3008.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3071.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3090.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3110.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3123.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3152.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3197.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3225.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3226.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3258.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3363.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3364.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3425.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3445.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3467.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3490.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3491.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3492.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3493.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3513.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3596.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3597.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3645.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3655.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3658.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3833.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc3845.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/doc/rfc/rfc952.txt#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/install-sh#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/isc-config.sh.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/README#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/aclocal.m4#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/api#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/bsd/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/bsd/daemon.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/bsd/ftruncate.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/bsd/gettimeofday.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/bsd/mktemp.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/bsd/putenv.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/bsd/readv.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/bsd/setenv.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/bsd/setitimer.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/bsd/strcasecmp.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/bsd/strdup.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/bsd/strerror.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/bsd/strpbrk.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/bsd/strsep.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/bsd/strtoul.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/bsd/utimes.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/bsd/writev.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/config.h.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/configure#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/configure.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/dst/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/dst/dst_api.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/dst/dst_internal.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/dst/hmac_link.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/dst/md5.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/dst/md5_dgst.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/dst/md5_locl.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/dst/support.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/arpa/inet.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/arpa/nameser.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/fd_setsize.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/hesiod.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/irp.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/irs.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/isc/assertions.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/isc/ctl.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/isc/dst.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/isc/eventlib.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/isc/heap.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/isc/irpmarshall.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/isc/list.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/isc/logging.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/isc/memcluster.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/isc/misc.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/isc/tree.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/netdb.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/netgroup.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/res_update.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/include/resolv.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/inet/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/inet/inet_addr.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/inet/inet_cidr_pton.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/inet/inet_data.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/inet/inet_lnaof.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/inet/inet_makeaddr.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/inet/inet_net_pton.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/inet/inet_neta.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/inet/inet_netof.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/inet/inet_network.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/inet/inet_ntoa.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/inet/inet_ntop.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/inet/inet_pton.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/inet/nsap_addr.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/dns.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/dns_gr.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/dns_ho.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/dns_nw.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/dns_p.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/dns_pr.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/dns_pw.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/dns_sv.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/gai_strerror.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/gen.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/gen_gr.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/gen_ho.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/gen_ng.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/gen_nw.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/gen_p.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/gen_pr.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/gen_pw.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/gen_sv.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/getgrent.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/getgrent_r.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/gethostent.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/gethostent_r.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/getnameinfo.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/getnetent.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/getnetent_r.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/getnetgrent.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/getnetgrent_r.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/getprotoent.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/getpwent.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/getpwent_r.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/getservent.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/getservent_r.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/hesiod.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/hesiod_p.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/irp.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/irp_gr.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/irp_ho.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/irp_ng.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/irp_nw.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/irp_p.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/irp_pr.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/irp_pw.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/irp_sv.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/irpmarshall.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/irs_data.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/irs_data.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/irs_p.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/lcl.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/lcl_gr.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/lcl_ho.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/lcl_ng.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/lcl_nw.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/lcl_p.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/lcl_pr.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/lcl_pw.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/lcl_sv.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/nis.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/nis_gr.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/nis_ho.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/nis_ng.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/nis_nw.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/nis_p.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/nis_pr.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/nis_pw.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/nis_sv.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/nul_ng.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/pathnames.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/irs/util.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/assertions.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/assertions.mdoc#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/base64.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/bitncmp.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/bitncmp.mdoc#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/ctl_p.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/ctl_p.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/ctl_srvr.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/ev_connects.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/ev_files.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/ev_streams.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/ev_timers.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/ev_waits.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/eventlib.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/eventlib.mdoc#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/eventlib_p.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/heap.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/heap.mdoc#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/hex.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/logging.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/logging.mdoc#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/logging_p.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/memcluster.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/memcluster.mdoc#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/movefile.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/tree.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/isc/tree.mdoc#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/libtool.m4#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/ltmain.sh#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/make/includes.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/make/mkdep.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/make/rules.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/mkinstalldirs#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/nameser/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/nameser/ns_date.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/nameser/ns_name.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/nameser/ns_netint.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/nameser/ns_parse.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/nameser/ns_print.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/nameser/ns_samedomain.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/nameser/ns_sign.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/nameser/ns_verify.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/port/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/port/freebsd/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/port/freebsd/include/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/port/freebsd/include/sys/bitypes.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/port_after.h.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/port_before.h.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/resolv/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/resolv/herror.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/resolv/res_comp.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/resolv/res_data.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/resolv/res_debug.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/resolv/res_debug.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/resolv/res_findzonecut.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/resolv/res_init.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/resolv/res_mkquery.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/resolv/res_mkupdate.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/resolv/res_private.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/resolv/res_query.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/resolv/res_send.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind/resolv/res_update.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind9/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind9/api#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind9/check.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind9/getaddresses.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind9/include/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind9/include/bind9/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind9/include/bind9/check.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind9/include/bind9/version.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/bind9/version.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/acl.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/adb.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/api#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/byaddr.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/cache.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/callbacks.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/compress.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/db.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/dbiterator.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/dbtable.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/diff.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/dispatch.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/dnssec.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/ds.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/forward.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/gen-unix.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/gen.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/Makefile.in#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/acl.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/adb.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/bit.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/byaddr.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/cache.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/callbacks.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/cert.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/compress.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/db.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/dbiterator.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/dbtable.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/diff.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/dispatch.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/dnssec.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/ds.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/events.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/fixedname.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/forward.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/journal.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/keyflags.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/keytable.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/keyvalues.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/lib.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/log.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/lookup.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/master.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/masterdump.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/message.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/name.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/ncache.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/nsec.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/opcode.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/order.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/peer.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/portlist.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/rbt.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/rcode.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/rdata.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/rdataclass.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/rdatalist.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/rdataset.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/rdatasetiter.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/rdataslab.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/rdatatype.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/request.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/resolver.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/result.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/rootns.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/sdb.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/secalg.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/secproto.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/soa.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/ssu.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/stats.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/tcpmsg.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/time.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/timer.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/tkey.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/tsig.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/ttl.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/types.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/validator.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/version.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/view.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/xfrin.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/zone.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/zonekey.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/include/dns/zt.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/journal.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/keytable.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/lib.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/log.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/lookup.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/master.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/masterdump.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/message.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/name.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/ncache.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/nsec.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/order.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/peer.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/portlist.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rbt.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rbtdb.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rbtdb.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rbtdb64.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rbtdb64.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rcode.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/cert_37.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/cert_37.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/cname_5.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/cname_5.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/dlv_65323.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/dlv_65323.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/dname_39.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/dname_39.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/ds_43.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/gpos_27.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/isdn_20.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/key_25.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/key_25.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/loc_29.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/loc_29.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/mb_7.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/mb_7.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/md_3.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/md_3.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/mf_4.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/mf_4.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/mg_8.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/mg_8.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/minfo_14.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/mr_9.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/mr_9.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/mx_15.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/mx_15.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/ns_2.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/ns_2.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/null_10.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/null_10.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/nxt_30.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/opt_41.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/opt_41.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/proforma.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/proforma.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/ptr_12.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/rp_17.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/rp_17.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/rt_21.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/sig_24.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/sig_24.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/soa_6.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/soa_6.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/tkey_249.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/txt_16.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/txt_16.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/unspec_103.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/x25_19.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/generic/x25_19.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/hs_4/a_1.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/in_1/a6_38.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/in_1/a_1.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/in_1/a_1.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/in_1/apl_42.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/in_1/kx_36.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/in_1/px_26.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/in_1/px_26.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/in_1/srv_33.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/in_1/wks_11.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/rdatastructpre.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdata/rdatastructsuf.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdatalist.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdatalist_p.h#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdataset.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdatasetiter.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/rdataslab.c#2 delete .. //depot/projects/davidxu_thread/contrib/bind9/lib/dns/request.c#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 8 03:36:21 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C908216A4D0; Fri, 8 Apr 2005 03:36:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 99E5016A4CE for ; Fri, 8 Apr 2005 03:36:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE38543D48 for ; Fri, 8 Apr 2005 03:36:19 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j383aJ1O005489 for ; Fri, 8 Apr 2005 03:36:19 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j383aJ75005486 for perforce@freebsd.org; Fri, 8 Apr 2005 03:36:19 GMT (envelope-from davidxu@freebsd.org) Date: Fri, 8 Apr 2005 03:36:19 GMT Message-Id: <200504080336.j383aJ75005486@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74712 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2005 03:36:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=74712 Change 74712 by davidxu@davidxu_celeron on 2005/04/08 03:36:14 Delete. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/Makefile#12 delete .. //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/Makefile.inc#4 delete .. //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/alpha/pthread_md.c#7 delete .. //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/include/pthread_md.h#8 delete .. //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/Makefile.inc#4 delete .. //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/amd64/pthread_md.c#5 delete .. //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/include/pthread_md.h#11 delete .. //depot/projects/davidxu_thread/src/lib/libthread/arch/arm/Makefile.inc#5 delete .. //depot/projects/davidxu_thread/src/lib/libthread/arch/arm/arm/pthread_md.c#5 delete .. //depot/projects/davidxu_thread/src/lib/libthread/arch/arm/include/pthread_md.h#5 delete .. //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/Makefile.inc#4 delete .. //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/i386/pthread_md.c#7 delete .. //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/include/pthread_md.h#9 delete .. //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/Makefile.inc#4 delete .. //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/ia64/pthread_md.c#8 delete .. //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/include/pthread_md.h#9 delete .. //depot/projects/davidxu_thread/src/lib/libthread/arch/powerpc/Makefile.inc#3 delete .. //depot/projects/davidxu_thread/src/lib/libthread/arch/powerpc/include/pthread_md.h#7 delete .. //depot/projects/davidxu_thread/src/lib/libthread/arch/powerpc/powerpc/pthread_md.c#6 delete .. //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/Makefile.inc#4 delete .. //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/include/pthread_md.h#10 delete .. //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/sparc64/pthread_md.c#8 delete .. //depot/projects/davidxu_thread/src/lib/libthread/pthread.map#9 delete .. //depot/projects/davidxu_thread/src/lib/libthread/support/Makefile.inc#3 delete .. //depot/projects/davidxu_thread/src/lib/libthread/support/thr_support.c#4 delete .. //depot/projects/davidxu_thread/src/lib/libthread/sys/Makefile.inc#4 delete .. //depot/projects/davidxu_thread/src/lib/libthread/sys/thr_error.c#4 delete .. //depot/projects/davidxu_thread/src/lib/libthread/test/Makefile#2 delete .. //depot/projects/davidxu_thread/src/lib/libthread/test/README#2 delete .. //depot/projects/davidxu_thread/src/lib/libthread/test/guard_b.c#2 delete .. //depot/projects/davidxu_thread/src/lib/libthread/test/guard_b.exp#2 delete .. //depot/projects/davidxu_thread/src/lib/libthread/test/guard_s.pl#2 delete .. //depot/projects/davidxu_thread/src/lib/libthread/test/hello_b.c#2 delete .. //depot/projects/davidxu_thread/src/lib/libthread/test/hello_d.c#2 delete .. //depot/projects/davidxu_thread/src/lib/libthread/test/hello_d.exp#2 delete .. //depot/projects/davidxu_thread/src/lib/libthread/test/hello_s.c#2 delete .. //depot/projects/davidxu_thread/src/lib/libthread/test/join_leak_d.c#2 delete .. //depot/projects/davidxu_thread/src/lib/libthread/test/join_leak_d.exp#2 delete .. //depot/projects/davidxu_thread/src/lib/libthread/test/mutex_d.c#2 delete .. //depot/projects/davidxu_thread/src/lib/libthread/test/mutex_d.exp#2 delete .. //depot/projects/davidxu_thread/src/lib/libthread/test/propagate_s.pl#2 delete .. //depot/projects/davidxu_thread/src/lib/libthread/test/sem_d.c#2 delete .. //depot/projects/davidxu_thread/src/lib/libthread/test/sem_d.exp#2 delete .. //depot/projects/davidxu_thread/src/lib/libthread/test/sigsuspend_d.c#2 delete .. //depot/projects/davidxu_thread/src/lib/libthread/test/sigsuspend_d.exp#2 delete .. //depot/projects/davidxu_thread/src/lib/libthread/test/sigwait_d.c#2 delete .. //depot/projects/davidxu_thread/src/lib/libthread/test/sigwait_d.exp#2 delete .. //depot/projects/davidxu_thread/src/lib/libthread/test/verify#2 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/Makefile.inc#9 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_atfork.c#6 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_attr.c#5 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_barrier.c#7 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_barrierattr.c#5 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cancel.c#10 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_clean.c#5 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_concurrency.c#9 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cond.c#16 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_condattr.c#7 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_create.c#10 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_detach.c#6 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_equal.c#5 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_exit.c#9 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_fork.c#12 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_getprio.c#5 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_getschedparam.c#6 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_info.c#5 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_init.c#14 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_join.c#9 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#17 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kill.c#6 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_list.c#7 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_main_np.c#5 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_multi_np.c#5 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#19 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex_prioceiling.c#5 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex_protocol.c#5 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutexattr.c#5 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_once.c#6 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_printf.c#5 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#24 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_pspinlock.c#11 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_resume_np.c#7 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_rtld.c#7 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_rwlock.c#6 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_rwlockattr.c#5 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_self.c#6 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sem.c#14 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_seterrno.c#6 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_setprio.c#5 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_setschedparam.c#6 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sig.c#8 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sigmask.c#4 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_single_np.c#5 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_spec.c#5 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_spinlock.c#11 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_stack.c#8 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_suspend_np.c#7 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_switch_np.c#5 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_symbols.c#7 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_syscalls.c#7 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_umtx.c#4 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_umtx.h#3 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_yield.c#6 delete Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 8 05:17:24 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52B1016A4D0; Fri, 8 Apr 2005 05:17:24 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2BF0216A4CE for ; Fri, 8 Apr 2005 05:17:24 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0BF6C43D4C for ; Fri, 8 Apr 2005 05:17:24 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j385HNA5016434 for ; Fri, 8 Apr 2005 05:17:23 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j385HN5f016431 for perforce@freebsd.org; Fri, 8 Apr 2005 05:17:23 GMT (envelope-from davidxu@freebsd.org) Date: Fri, 8 Apr 2005 05:17:23 GMT Message-Id: <200504080517.j385HN5f016431@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74718 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2005 05:17:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=74718 Change 74718 by davidxu@davidxu_celeron on 2005/04/08 05:16:52 remove locklevel offset, no longer need. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_symbols.c#6 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_symbols.c#6 (text+ko) ==== @@ -45,7 +45,6 @@ int _thread_off_tid = offsetof(struct pthread, tid); int _thread_off_next = offsetof(struct pthread, tle.tqe_next); int _thread_off_attr_flags = offsetof(struct pthread, attr.flags); -int _thread_off_thr_locklevel = offsetof(struct pthread, locklevel); int _thread_off_linkmap = offsetof(Obj_Entry, linkmap); int _thread_off_tlsindex = offsetof(Obj_Entry, tlsindex); int _thread_off_enable_event = offsetof(struct pthread, enable_event); From owner-p4-projects@FreeBSD.ORG Fri Apr 8 07:53:35 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B973E16A4D0; Fri, 8 Apr 2005 07:53:34 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8FFDE16A4CE for ; Fri, 8 Apr 2005 07:53:34 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A02043D53 for ; Fri, 8 Apr 2005 07:53:34 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j387rYC4022309 for ; Fri, 8 Apr 2005 07:53:34 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j387rYs0022306 for perforce@freebsd.org; Fri, 8 Apr 2005 07:53:34 GMT (envelope-from davidxu@freebsd.org) Date: Fri, 8 Apr 2005 07:53:34 GMT Message-Id: <200504080753.j387rYs0022306@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74723 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2005 07:53:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=74723 Change 74723 by davidxu@davidxu_celeron on 2005/04/08 07:52:51 0 -> NULL. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_event.c#6 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_event.c#6 (text+ko) ==== @@ -42,12 +42,12 @@ void _thr_report_create(struct pthread *curthread) { - _thr_report_event(curthread, TD_CREATE, 0); + _thr_report_event(curthread, TD_CREATE, NULL); } void _thr_report_death(struct pthread *curthread) { - _thr_report_event(curthread, TD_DEATH, 0); + _thr_report_event(curthread, TD_DEATH, NULL); } void From owner-p4-projects@FreeBSD.ORG Fri Apr 8 09:26:31 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8072F16A4D0; Fri, 8 Apr 2005 09:26:31 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D9DD16A4CE for ; Fri, 8 Apr 2005 09:26:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11E1643D46 for ; Fri, 8 Apr 2005 09:26:31 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j389QU5B031782 for ; Fri, 8 Apr 2005 09:26:30 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j389QUWL031779 for perforce@freebsd.org; Fri, 8 Apr 2005 09:26:30 GMT (envelope-from davidxu@freebsd.org) Date: Fri, 8 Apr 2005 09:26:30 GMT Message-Id: <200504080926.j389QUWL031779@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74724 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2005 09:26:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=74724 Change 74724 by davidxu@davidxu_celeron on 2005/04/08 09:26:20 allow set event. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread_db/libpthread_db.c#5 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread_db/libpthread_db.c#5 (text+ko) ==== @@ -821,7 +821,7 @@ pt_thr_event_enable(const td_thrhandle_t *th, int en) { TDBG_FUNC(); - return (TD_ERR); + return (0); } static td_err_e From owner-p4-projects@FreeBSD.ORG Fri Apr 8 09:31:38 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9622D16A4D0; Fri, 8 Apr 2005 09:31:38 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6ECE916A4CE for ; Fri, 8 Apr 2005 09:31:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 419D343D46 for ; Fri, 8 Apr 2005 09:31:38 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j389VclH032152 for ; Fri, 8 Apr 2005 09:31:38 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j389VcNf032149 for perforce@freebsd.org; Fri, 8 Apr 2005 09:31:38 GMT (envelope-from davidxu@freebsd.org) Date: Fri, 8 Apr 2005 09:31:38 GMT Message-Id: <200504080931.j389VcNf032149@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74726 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2005 09:31:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=74726 Change 74726 by davidxu@davidxu_celeron on 2005/04/08 09:31:15 Revert. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread_db/libpthread_db.c#6 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread_db/libpthread_db.c#6 (text+ko) ==== @@ -821,7 +821,7 @@ pt_thr_event_enable(const td_thrhandle_t *th, int en) { TDBG_FUNC(); - return (0); + return (TD_ERR); } static td_err_e From owner-p4-projects@FreeBSD.ORG Sat Apr 9 03:21:33 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD0FE16A4D0; Sat, 9 Apr 2005 03:21:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 96A0716A4CE for ; Sat, 9 Apr 2005 03:21:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7CA9A43D31 for ; Sat, 9 Apr 2005 03:21:32 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j393LWFP002407 for ; Sat, 9 Apr 2005 03:21:32 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j393LWPE002404 for perforce@freebsd.org; Sat, 9 Apr 2005 03:21:32 GMT (envelope-from davidxu@freebsd.org) Date: Sat, 9 Apr 2005 03:21:32 GMT Message-Id: <200504090321.j393LWPE002404@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74779 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Apr 2005 03:21:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=74779 Change 74779 by davidxu@davidxu_tiger on 2005/04/09 03:21:09 Use thread id to check event. Affected files ... .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#7 edit Differences ... ==== //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#7 (text+ko) ==== @@ -681,7 +681,6 @@ stop_pc = read_pc_pid (ptid) - DECR_PC_AFTER_BREAK; if (stop_pc != td_create_bp_addr && stop_pc != td_death_bp_addr) return; - loop = 1; do @@ -691,7 +690,8 @@ { if (err == TD_NOMSG) return; - error ("Cannot get thread event message: %s", thread_db_err_str (err)); + error ("Cannot get thread event message: %s", + thread_db_err_str (err)); } err = td_thr_get_info_p (msg.th_p, &ti); if (err != TD_OK) @@ -729,10 +729,9 @@ if (GET_PID(ret) >= 0 && ourstatus->kind == TARGET_WAITKIND_STOPPED) { lwp = get_current_lwp (GET_PID(ret)); - ret = BUILD_LWP(lwp, GET_PID(ret)); + ret = thread_from_lwp (BUILD_LWP(lwp, GET_PID(ret))); if (ourstatus->value.sig == TARGET_SIGNAL_TRAP) check_event(ret); - ret = thread_from_lwp (ret); #if 0 if (!in_thread_list (ret)) add_thread (ret); From owner-p4-projects@FreeBSD.ORG Sat Apr 9 08:25:44 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8D9616A4D0; Sat, 9 Apr 2005 08:25:43 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C28116A4CE for ; Sat, 9 Apr 2005 08:25:43 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C85DD43D45 for ; Sat, 9 Apr 2005 08:25:42 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j398PgKA019603 for ; Sat, 9 Apr 2005 08:25:42 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j398PgGa019600 for perforce@freebsd.org; Sat, 9 Apr 2005 08:25:42 GMT (envelope-from davidxu@freebsd.org) Date: Sat, 9 Apr 2005 08:25:42 GMT Message-Id: <200504090825.j398PgGa019600@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74785 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Apr 2005 08:25:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=74785 Change 74785 by davidxu@davidxu_tiger on 2005/04/09 08:25:22 IFC. Affected files ... .. //depot/projects/davidxu_thread/src/etc/rc.initdiskless#1 branch .. //depot/projects/davidxu_thread/src/lib/libc/amd64/string/Makefile.inc#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/amd64/string/bcmp.S#1 branch .. //depot/projects/davidxu_thread/src/lib/libc/amd64/string/bcopy.S#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/amd64/string/memcmp.S#1 branch .. //depot/projects/davidxu_thread/src/lib/libc/gen/fnmatch.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/gen/setmode.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/gen/syslog.c#4 integrate .. //depot/projects/davidxu_thread/src/lib/libc/net/getifmaddrs.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/net/res_comp.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/net/res_mkupdate.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/stdio/vfscanf.c#2 integrate .. //depot/projects/davidxu_thread/src/libexec/rexecd/rexecd.c#9 integrate .. //depot/projects/davidxu_thread/src/release/doc/zh_CN.GB2312/installation/common/layout.sgml#2 integrate .. //depot/projects/davidxu_thread/src/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#2 integrate .. //depot/projects/davidxu_thread/src/sbin/ffsinfo/ffsinfo.8#4 integrate .. //depot/projects/davidxu_thread/src/sbin/ifconfig/ifconfig.c#4 integrate .. //depot/projects/davidxu_thread/src/sbin/ifconfig/ifconfig.h#4 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/cdce.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/ng_netflow.4#5 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/uftdi.4#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-lowlevel.c#9 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-pci.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/mse/mse.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/mse/mse_cbus.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/mse/mse_isa.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/uplcom.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/davidxu_thread/src/sys/geom/geom_ctl.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/i4b/layer1/isic/i4b_isic.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_switch.c#8 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_synch.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/kern/sched_ule.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/bluetooth/common/ng_bluetooth.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/ip_input.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/pc98/conf/NOTES#7 integrate .. //depot/projects/davidxu_thread/src/sys/pc98/include/apicreg.h#1 branch .. //depot/projects/davidxu_thread/src/sys/pc98/include/apicvar.h#1 branch .. //depot/projects/davidxu_thread/src/sys/pc98/include/ioctl_bt848.h#1 branch .. //depot/projects/davidxu_thread/src/sys/pc98/include/ioctl_meteor.h#1 branch .. //depot/projects/davidxu_thread/src/sys/pc98/include/pcaudio.h#2 delete .. //depot/projects/davidxu_thread/src/sys/pc98/include/pcaudioio.h#1 branch .. //depot/projects/davidxu_thread/src/sys/pc98/include/pcvt_ioctl.h#1 branch .. //depot/projects/davidxu_thread/src/sys/pc98/include/pvct_ioctl.h#2 delete .. //depot/projects/davidxu_thread/src/sys/pc98/include/smptests.h#1 branch .. //depot/projects/davidxu_thread/src/sys/pci/agp_amd64.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/sys/proc.h#12 integrate .. //depot/projects/davidxu_thread/src/tools/regression/msdosfs/msdosfstest.sh#1 branch .. //depot/projects/davidxu_thread/src/usr.bin/calendar/calendars/calendar.birthday#4 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/parse.c#11 integrate Differences ... ==== //depot/projects/davidxu_thread/src/lib/libc/amd64/string/Makefile.inc#2 (text+ko) ==== @@ -1,3 +1,3 @@ -# $FreeBSD: src/lib/libc/amd64/string/Makefile.inc,v 1.1 2005/04/07 03:56:03 alc Exp $ +# $FreeBSD: src/lib/libc/amd64/string/Makefile.inc,v 1.2 2005/04/08 05:15:55 alc Exp $ -MDSRCS+= bcopy.S bzero.S memcpy.S memmove.S memset.S +MDSRCS+= bcmp.S bcopy.S bzero.S memcmp.S memcpy.S memmove.S memset.S ==== //depot/projects/davidxu_thread/src/lib/libc/amd64/string/bcopy.S#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/string/bcopy.S,v 1.1 2005/04/07 03:56:03 alc Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/string/bcopy.S,v 1.2 2005/04/08 05:10:18 alc Exp $"); #if 0 RCSID("$NetBSD: bcopy.S,v 1.2 2003/08/07 16:42:36 agc Exp $") @@ -51,14 +51,14 @@ #endif #endif #if defined(MEMCOPY) || defined(MEMMOVE) - movq %rdi,%r11 /* save dest */ + movq %rdi,%rax /* return dst */ #else xchgq %rdi,%rsi #endif movq %rdx,%rcx - movq %rdi,%rax - subq %rsi,%rax - cmpq %rcx,%rax /* overlapping? */ + movq %rdi,%r8 + subq %rsi,%r8 + cmpq %rcx,%r8 /* overlapping? */ jb 1f cld /* nope, copy forwards. */ shrq $3,%rcx /* copy by words */ @@ -68,9 +68,6 @@ andq $7,%rcx /* any bytes left? */ rep movsb -#if defined(MEMCOPY) || defined(MEMMOVE) - movq %r11,%rax -#endif ret 1: addq %rcx,%rdi /* copy backwards. */ @@ -87,8 +84,5 @@ subq $7,%rdi rep movsq -#if defined(MEMCOPY) || defined(MEMMOVE) - movq %r11,%rax -#endif cld ret ==== //depot/projects/davidxu_thread/src/lib/libc/gen/fnmatch.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/fnmatch.c,v 1.16 2004/07/29 03:13:10 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/fnmatch.c,v 1.17 2005/04/08 21:24:23 stefanf Exp $"); /* * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6. @@ -254,7 +254,6 @@ } else if (*pattern == '\0') { return (RANGE_ERROR); } else if (*pattern == '/' && (flags & FNM_PATHNAME)) { - pattern++; return (RANGE_NOMATCH); } else if (*pattern == '\\' && !(flags & FNM_NOESCAPE)) pattern++; ==== //depot/projects/davidxu_thread/src/lib/libc/gen/setmode.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)setmode.c 8.2 (Berkeley) 3/25/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/setmode.c,v 1.9 2003/02/23 00:24:03 mikeh Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/setmode.c,v 1.10 2005/04/08 21:15:38 stefanf Exp $"); #include "namespace.h" #include @@ -83,9 +83,7 @@ * bits) followed by a '+' (set bits). */ mode_t -getmode(bbox, omode) - const void *bbox; - mode_t omode; +getmode(const void *bbox, mode_t omode) { const BITCMD *set; mode_t clrval, newmode, value; @@ -172,8 +170,7 @@ #define STANDARD_BITS (S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO) void * -setmode(p) - const char *p; +setmode(const char *p) { int perm, who; char op, *ep; @@ -340,11 +337,7 @@ } static BITCMD * -addcmd(set, op, who, oparg, mask) - BITCMD *set; - int oparg, who; - int op; - u_int mask; +addcmd(BITCMD *set, int op, int who, int oparg, u_int mask) { switch (op) { case '=': @@ -388,8 +381,7 @@ #ifdef SETMODE_DEBUG static void -dumpmode(set) - BITCMD *set; +dumpmode(BITCMD *set) { for (; set->cmd; ++set) (void)printf("cmd: '%c' bits %04o%s%s%s%s%s%s\n", @@ -409,8 +401,7 @@ * compacted, but it's not worth the effort. */ static void -compress_mode(set) - BITCMD *set; +compress_mode(BITCMD *set) { BITCMD *nset; int setbits, clrbits, Xbits, op; ==== //depot/projects/davidxu_thread/src/lib/libc/gen/syslog.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)syslog.c 8.5 (Berkeley) 4/29/95"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.34 2004/12/30 16:05:11 glebius Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.35 2005/04/08 21:15:38 stefanf Exp $"); #include "namespace.h" #include @@ -101,11 +101,8 @@ * XXX: Maybe one day, dynamically allocate it so that the line length * is `unlimited'. */ -static -int writehook(cookie, buf, len) - void *cookie; /* really [struct bufcookie *] */ - char *buf; /* characters to copy */ - int len; /* length to copy */ +static int +writehook(void *cookie, const char *buf, int len) { struct bufcookie *h; /* private `handle' */ @@ -137,10 +134,7 @@ } void -vsyslog(pri, fmt, ap) - int pri; - const char *fmt; - va_list ap; +vsyslog(int pri, const char *fmt, va_list ap) { int cnt; char ch, *p; @@ -329,7 +323,7 @@ /* Should be called with mutex acquired */ static void -disconnectlog() +disconnectlog(void) { /* * If the user closed the FD and opened another in the same slot, @@ -345,7 +339,7 @@ /* Should be called with mutex acquired */ static void -connectlog() +connectlog(void) { struct sockaddr_un SyslogAddr; /* AF_UNIX address of local logger */ @@ -396,9 +390,7 @@ } static void -openlog_unlocked(ident, logstat, logfac) - const char *ident; - int logstat, logfac; +openlog_unlocked(const char *ident, int logstat, int logfac) { if (ident != NULL) LogTag = ident; @@ -413,9 +405,7 @@ } void -openlog(ident, logstat, logfac) - const char *ident; - int logstat, logfac; +openlog(const char *ident, int logstat, int logfac) { THREAD_LOCK(); openlog_unlocked(ident, logstat, logfac); @@ -424,7 +414,7 @@ void -closelog() +closelog(void) { THREAD_LOCK(); (void)_close(LogFile); @@ -436,8 +426,7 @@ /* setlogmask -- set the log mask level */ int -setlogmask(pmask) - int pmask; +setlogmask(int pmask) { int omask; ==== //depot/projects/davidxu_thread/src/lib/libc/net/getifmaddrs.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getifmaddrs.c,v 1.1 2003/11/14 18:53:22 bms Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getifmaddrs.c,v 1.2 2005/04/08 21:24:23 stefanf Exp $"); #include "namespace.h" #include @@ -60,14 +60,12 @@ int icnt = 1; int dcnt = 0; int ntry = 0; - u_short idx = 0; size_t len; size_t needed; int mib[6]; int i; char *buf; char *data; - char *names; char *next; char *p; struct ifma_msghdr *ifmam; @@ -128,12 +126,10 @@ ifa = (struct ifmaddrs *)(void *)data; data += sizeof(struct ifmaddrs) * icnt; - names = data + dcnt; memset(ifa, 0, sizeof(struct ifmaddrs) * icnt); ift = ifa; - idx = 0; for (next = buf; next < buf + needed; next += rtm->rtm_msglen) { rtm = (struct rt_msghdr *)(void *)next; if (rtm->rtm_version != RTM_VERSION) ==== //depot/projects/davidxu_thread/src/lib/libc/net/res_comp.c#2 (text+ko) ==== @@ -73,7 +73,7 @@ static char orig_rcsid[] = "From: Id: res_comp.c,v 8.11 1997/05/21 19:31:04 halley Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/res_comp.c,v 1.17 2002/03/22 21:52:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/res_comp.c,v 1.18 2005/04/08 21:24:23 stefanf Exp $"); #include #include @@ -158,7 +158,7 @@ res_hnok(dn) const char *dn; { - int ppch = '\0', pch = PERIOD, ch = *dn++; + int pch = PERIOD, ch = *dn++; while (ch != '\0') { int nch = *dn++; @@ -175,7 +175,7 @@ if (!middlechar(ch)) return (0); } - ppch = pch, pch = ch, ch = nch; + pch = ch, ch = nch; } return (1); } ==== //depot/projects/davidxu_thread/src/lib/libc/net/res_mkupdate.c#2 (text+ko) ==== @@ -21,7 +21,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/res_mkupdate.c,v 1.5 2003/02/18 13:39:52 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/res_mkupdate.c,v 1.6 2005/04/08 21:24:23 stefanf Exp $"); #include #include @@ -62,7 +62,7 @@ res_mkupdate(ns_updrec *rrecp_in, u_char *buf, int buflen) { ns_updrec *rrecp_start = rrecp_in; HEADER *hp; - u_char *cp, *sp1, *sp2, *startp, *endp; + u_char *cp, *sp2, *startp, *endp; int n, i, soanum, multiline; ns_updrec *rrecp; struct in_addr ina; @@ -87,7 +87,6 @@ hp->id = htons(++_res.id); hp->opcode = ns_o_update; hp->rcode = NOERROR; - sp1 = buf + 2*INT16SZ; /* save pointer to zocount */ cp = buf + HFIXEDSZ; buflen -= HFIXEDSZ; dpp = dnptrs; ==== //depot/projects/davidxu_thread/src/lib/libc/stdio/vfscanf.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)vfscanf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.37 2004/05/02 10:55:05 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.38 2005/04/08 20:58:47 stefanf Exp $"); #include "namespace.h" #include @@ -138,7 +138,6 @@ char ccltab[256]; /* character class table for %[...] */ char buf[BUF]; /* buffer for numeric and mb conversions */ wchar_t *wcp; /* handy wide character pointer */ - wchar_t *wcp0; /* saves original value of wcp */ size_t nconv; /* length of multibyte sequence converted */ static const mbstate_t initial; mbstate_t mbs; @@ -434,9 +433,9 @@ int nchars; if ((flags & SUPPRESS) == 0) - wcp = wcp0 = va_arg(ap, wchar_t *); + wcp = va_arg(ap, wchar_t *); else - wcp = wcp0 = &twc; + wcp = &twc; n = 0; nchars = 0; while (width != 0) { ==== //depot/projects/davidxu_thread/src/libexec/rexecd/rexecd.c#9 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)rexecd.c 8.1 (Berkeley) 6/4/93"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/rexecd/rexecd.c,v 1.40 2005/04/07 19:26:35 nectar Exp $"; + "$FreeBSD: src/libexec/rexecd/rexecd.c,v 1.41 2005/04/08 11:19:50 des Exp $"; #endif /* not lint */ #include @@ -86,8 +86,6 @@ static void doit(struct sockaddr *); static void getstr(char *, int, const char *); static void error(const char *fmt, ...); -static struct passwd *xgetpwnam(const char *, struct passwd *, char **, - size_t *); int no_uid_0 = 1; @@ -136,10 +134,9 @@ { char *cmdbuf, *cp; int maxcmdlen; - char userbuf[16], pass[16]; - struct passwd *pwd, pwd_storage; - char *pwdbuf, *user; - size_t pwdbuflen; + char user[16], pass[16]; + struct passwd *pwd; + const void *item; int fd, r, sd; u_short port; int pv[2], pid, cc, nfds; @@ -189,22 +186,20 @@ if (connect(sd, fromp, fromp->sa_len) < 0) exit(1); } - user = userbuf; - getstr(userbuf, sizeof(userbuf), "username"); + getstr(user, sizeof(user), "username"); getstr(pass, sizeof(pass), "password"); getstr(cmdbuf, maxcmdlen, "command"); (void) alarm(0); - pwdbuflen = 0; - pwdbuf = NULL; if (!pam_ok(pam_start("rexecd", user, &pamc, &pamh)) || !pam_ok(pam_set_item(pamh, PAM_RHOST, remote)) || !pam_ok(pam_set_item(pamh, PAM_AUTHTOK, pass)) || !pam_ok(pam_authenticate(pamh, pam_flags)) || !pam_ok(pam_acct_mgmt(pamh, pam_flags)) || - !pam_ok(pam_get_item(pamh, PAM_USER, (const void **)&user)) || - (pwd = xgetpwnam(user, &pwd_storage, &pwdbuf, - &pwdbuflen)) == NULL || (pwd->pw_uid == 0 && no_uid_0)) { + !pam_ok(pam_get_item(pamh, PAM_USER, &item)) || item == NULL || + strlen(item) >= sizeof(user) || strcpy(user, item) == NULL || + (pwd = getpwnam(user)) == NULL || + (pwd->pw_uid == 0 && no_uid_0)) { syslog(LOG_ERR, "%s LOGIN REFUSED from %s", user, remote); error("Login incorrect.\n"); exit(1); @@ -329,27 +324,3 @@ } } while (c != 0); } - -static struct passwd * -xgetpwnam(const char *user, struct passwd *pwd_storage, char **pwdbuf, - size_t *pwdbuflen) -{ - struct passwd *pwd; - size_t needed; - int rv; - - needed = (*pwdbuflen == 0) ? BUFSIZ : *pwdbuflen; - pwd = NULL; - do { - if (needed != *pwdbuflen) { - if ((*pwdbuf = reallocf(*pwdbuf, needed)) == NULL) { - syslog(LOG_ERR, "Cannot allocate memory"); - error("Cannot allocate memory.\n"); - exit(1); - } else - *pwdbuflen = needed; - } - rv = getpwnam_r(user, pwd_storage, *pwdbuf, *pwdbuflen, &pwd); - } while (pwd == NULL && rv == ERANGE && (needed <<= 1)); - return pwd; -} ==== //depot/projects/davidxu_thread/src/release/doc/zh_CN.GB2312/installation/common/layout.sgml#2 (text+ko) ==== @@ -1,8 +1,8 @@ @@ -20,13 +20,19 @@ INSTALL.TXT catpages compat4x games src README.HTM cdrom.inf crypto info tools - 如果想从 CDROM、 FTP 或 NFS 从发布目录中安装， - 只需从软盘镜像目录制作 1.44MB 引导盘 (参见 - 以了解如何完成它)， - 从制作的引导盘启动， 并按照屏幕的指示去做就可以了。 - 安装过程中所需要的数据会根据您的选择自动获取。 - 如果您之前从没安装过 &os;， 则建议您完整地阅读这份文档 - (安装指引)。 + 这些文件也可以在多碟组的第一张 CDROM 上找到， + 只是格局略有不同。 在多数平台上， 安装 CDROM 在安装包文件之外， + 也提供了一个 现场文件系统。 现场文件系统， + 对于修复或排出现有的 &os; 安装的问题非常有用 (参见 以了解如何完成这项工作)。 + + 对于无法从 CDROM 介质引导系统 (但可以通过其它手段来读取 CDROM) + 的用户来说， 应关注一下 floppies 目录。 + 很容易从 floppies 提供的文件来自行制作 1.44MB 引导盘 + (参见 以了解如何这样做)， 并用它来开始从 CDROM、 + FTP， 或者 NFS 的安装。 在安装过程中所需要的其他数据， + 将自动地根据您的选择获得。 如果您之前从未安装过 &os;， + 则应完整地阅读这份文档 (安装指引)。 如果您在尝试进行某种其他类型的安装， 或对于发布目录是如何组织的感到好奇， 请参考下面的说明以了解进一步的内容： @@ -89,7 +95,7 @@ Ports Collection 可以通过与其他组件相同的方法来安装， 解压缩后它需要大约 190MB 的磁盘空间。 关于 ports collection 的更多资料可以在 - http://www.FreeBSD.org/ports/ + http://www.FreeBSD.org/ports/ 或本地的 /usr/share/doc/handbook 找到， 当然， 后者的前提是您安装了 doc ==== //depot/projects/davidxu_thread/src/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#2 (text+ko) ==== @@ -1,8 +1,8 @@ @@ -12,21 +12,48 @@ 修复现有的 &os; 安装 - 在安装软盘中的顶级菜单上， &os; 提供了一个 - Fixit 选项。 - 要使用它， 您还需要一张和启动用的那张软盘同样的方法生成的 - fixit.flp 镜像软盘， - 或 live filesystem - CDROM； 第二种通常是 &os; 发行版本的一部分。 + &os; 在其安装程序 &man.sysinstall.8; 的顶级菜单上， 提供了一个 + fixit 选项。 它提供了一个包含 &os; + 基本系统中常用程序的 shell； 这个环境对于修复或排除现有的 &os; + 安装中的故障十分有用。 要使用 fixit 模式， + 您需要按照和其他引导盘相同的方式制作 fixit.flp 软盘， + 或者使用 现场文件系统 CDROM。 + 一般来说， 现场文件系统应该在 &os; 安装光盘中的第一张上。 + 请注意， 使用 fixit 选项需要一些 UNIX 系统管理的经验。 + + 一般来说， 有两种方法来启动 fixit 模式。 + 能够从 &os; 安装 CDROM 启动的用户， 应该这样做并在 + &man.sysinstall.8; 的主菜单选择 fixit。 + 然后， 再选择其中的 + CDROM/DVD 选项。 + + 无法从 CDROM 启动， 但可以从软盘启动的用户， + 则需要更多的步骤。 除了安装过程所需要的 + boot.flp 和 + kernX.flp 之外， + 还需要制作一张 + fixit.flp 软盘， 方法和其他软盘无异。 + 按照启动安装程序的步骤进行， 直到出现 + &man.sysinstall.8; 菜单为止。 这时， 选择其中的 + fixit 项， 随后的菜单中， + 选择 Floppy， 并依提示插入 fixit.flp + 软盘。 + + 尽管 CDROM 和软盘上的 fixit 环境很相似， 但并非一模一样。 + 它们都提供了一系列用于检查、 修复文件系统及其内容的命令。 + 在 CDROM 上的 fixit 版本提供了全部 &os; 基本系统中的命令， + 因为它是一个现场文件系统。 与此相反， 由于空间限制， 软盘 fixit 环境， + 则只能提供它的一个子集。 + + 软盘版本的 fixit 中， + 可以在 /stand 或 + /mnt2/stand 找到一些常用的独立的应用程序。 + 而在 CDROM 版本的 fixit 中， 这些程序可以在 + /stand 或 + /mnt2/rescue 中找到 (余下的程序， + 可以在现场文件系统中找到， 其位置是 + /mnt)。 - 要启动 fixit， 只需简单地从 - kern.flp 这张软盘启动， 选择 - Fixit 这一项， 并根据提示插入 fixit 软盘或 CDROM。 - 接下来您将进入一个提供了很多命令的命令行界面 - (在 /stand - 和 /mnt2/stand 目录中) 来检查、 - 修复和检验文件系统及其内容。 使用 fixit 是 - 需要一些 UNIX 系统管理的经验的。 @@ -50,9 +77,9 @@ 在每次启动时这个选项都会被复位， 因此有必要把 hint.acpi.0.disabled="1" 加入到 - /boot/loader.conf - 中。 要了解关于启动加载器的进一步详情， 请参考 - FreeBSD 使用手册。 + /boot/loader.conf中。 + 要了解关于启动加载器的进一步详情， 请参考 + &os; 使用手册。 @@ -181,10 +208,11 @@ Intel EtherExpress 网卡无法正常工作。 - 用 UserConfig 工具 (参见 - HARDWARE.TXT) 并禁用对 - mcd0 和 - mcd1 设备的探测。 一般而言， + 在引导加载的第三阶段， 设置 hint + hint.mcd.0.disabled="1" 和 + hint.mcd.1.disabled="1"， + 就可以禁止探测 mcd0 和 + mcd1 设备。 一般而言， 在内核配置文件中您应该只保留和启用那些将要用到的设备。 @@ -194,16 +222,14 @@ 设备超时错误。 - 您的卡可能与在内核配置中指定的 IRQ 号不同。 - ed 驱动默认并不使用软件配置 (DOS 下在 EZSETUP - 中输入的值)， 但但如果您在内核配置文件中将 IRQ 指定为 - ? 则它会使用软件的配置。 + 您的卡可能使用了与 /boot/device.hints + 文件中指定的不同的 IRQ。 ed 驱动默认并不使用‘软’配置 (在 DOS 下使用 + EZSETUP 进行的配置)， 但如果您在接口的 hint 上指定 + -1， 就会使用软配置。 - 另外， 也可以通过跳线来改变硬件设置 - (如果需要， 相应地修改内核配置)， - 或在 UserConfig 中将 IRQ 指定为 -1， - 或在您的内核配置文件中使用 ? - 来告诉内核使用软件配置。 + 可以通过跳线来改变硬件的设定 (并根据需要修改内核配置) + 或通过设置 hint hint.ed.0.irq="-1" 将 + IRQ 指定为 -1。 后者将让内核使用软件配置。 另一种可能是您的卡使用了 IRQ 9， 而这是和 IRQ 2 共用的， 这也是经常造成问题的原因 @@ -217,11 +243,10 @@ 键盘的输入一团糟。 - 以前的 IBM 膝上型电脑使用非标准的键盘控制器， - 所以您必须告诉键盘驱动程序 (atkbd0) 进入一个特定的模式 - 使它能够在 ThinkPads 上工作。 在 UserConfig 文件中将 - atkbd0 'Flags' 设置为 0x4， 它就应该能正常的工作了。 - (参见 'Keyboard' 输入菜单) + 较早的 IBM 笔记本使用了非标准的键盘控制器， + 因此您必须告诉键盘驱动 (atkbd0) 进入与 ThinkPad + 协同工作的一个特殊模式。 设置 + hint hint.atkbd.0.flags="4" 应该能让其正常工作。 @@ -241,20 +266,8 @@ 这是一个已知问题， 并用会在将来对其进行修复。 - 为了使您的系统完全安装， 使用 引导选项进入 - UserConfig， 但是 不能 使用好看的可视化模式， - 而必须使用旧式的文本 CLI 模式。 在提示符下输入： - - eisa 12 -quit - - 。 (您也可以用 ‘visual’ 代替 ‘quit’， - 在接下来的配置对话在可视化模式。) - 尽管我们推荐您编译定制的内核， 但 dset 现在也能够保存这些值了。 - - 参考 FAQ 主题 5.3 解释的问题和怎样继续。 - 在您的本地系统 /usr/share/doc/FAQ 目录中可以找到 FAQ， - 如果您安装了 ‘doc’ 软件包的话。 + 要让系统能够正常安装， + 需要在加载器第三阶段设置 hint hw.eisa_slots="12"。 @@ -265,16 +278,8 @@ 由于某些原因， 您的机器可能不喜欢新的 i586_copyout 和 - i586_copyin 代码。 要禁止它， - 用安装软盘进行引导， 当它进入第一个菜单 (选择是否进入 UserConfig) - 时选择命令行界面 - (专家模式, Expert Mode)， - 并且输入下面的语句： - - flags npx0 1 - - 继续正常的引导过程。 这些设置将保存在您的内核中， - 因此您只需做一次就可以了。 + i586_copyin 代码。 + 要禁用它们， 需要设置 hint hint.npx.0.flags="1"。 @@ -292,8 +297,8 @@ Compaq 系统总是与其它系统有点不同， 他们没有在笔记本的 CMOS RAM - 中说明软驱的存在。 因此， 驱动程序会认为没有配置软驱。 - 进入 UserConfig 屏幕， 将 fdc0 驱动标志值设置为 0x1。 + 中说明软驱的存在。 因此， 驱动程序会认为没有配置软驱。 您需要设置 hint + hint.fdc.0.flags="1" 这样驱动程序将认为第一个软驱存在， 而不去查询 CMOS。 ==== //depot/projects/davidxu_thread/src/sbin/ffsinfo/ffsinfo.8#4 (text+ko) ==== @@ -35,7 +35,7 @@ .\" SUCH DAMAGE. .\" .\" $TSHeader: src/sbin/ffsinfo/ffsinfo.8,v 1.3 2000/12/12 19:30:55 tomsoft Exp $ -.\" $FreeBSD: src/sbin/ffsinfo/ffsinfo.8,v 1.16 2005/03/31 04:05:17 rwatson Exp $ +.\" $FreeBSD: src/sbin/ffsinfo/ffsinfo.8,v 1.17 2005/04/08 10:32:22 ceri Exp $ .\" .Dd September 8, 2000 .Dt FSINFO 8 @@ -106,7 +106,7 @@ indirect block dump .El .It Fl o Ar outfile -This allows to set the output filename where the dump is written to, and +This sets the output filename where the dump is written to, and must be specified. If .Fl ==== //depot/projects/davidxu_thread/src/sbin/ifconfig/ifconfig.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.110 2004/12/31 19:46:27 sam Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.112 2005/04/08 21:37:41 stefanf Exp $"; #endif /* not lint */ #include @@ -467,7 +467,7 @@ callbacks = cb; } -/* specially-handled comamnds */ +/* specially-handled commands */ static void setifaddr(const char *, int, int, const struct afswtch *); static const struct cmd setifaddr_cmd = DEF_CMD("ifaddr", 0, setifaddr); @@ -502,25 +502,25 @@ */ p = (setaddr ? &setifdstaddr_cmd : &setifaddr_cmd); } - if (p->c_func || p->c_func2) { + if (p->c_u.c_func || p->c_u.c_func2) { if (p->c_parameter == NEXTARG) { if (argv[1] == NULL) errx(1, "'%s' requires argument", p->c_name); - p->c_func(argv[1], 0, s, afp); + p->c_u.c_func(argv[1], 0, s, afp); argc--, argv++; } else if (p->c_parameter == OPTARG) { - p->c_func(argv[1], 0, s, afp); + p->c_u.c_func(argv[1], 0, s, afp); if (argv[1] != NULL) argc--, argv++; } else if (p->c_parameter == NEXTARG2) { if (argc < 3) errx(1, "'%s' requires 2 arguments", p->c_name); - p->c_func2(argv[1], argv[2], s, afp); + p->c_u.c_func2(argv[1], argv[2], s, afp); argc -= 2, argv += 2; } else - p->c_func(*argv, p->c_parameter, s, afp); + p->c_u.c_func(*argv, p->c_parameter, s, afp); } argc--, argv++; } ==== //depot/projects/davidxu_thread/src/sbin/ifconfig/ifconfig.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * * so there! * - * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.15 2004/12/31 19:46:27 sam Exp $ + * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.16 2005/04/08 21:37:41 stefanf Exp $ */ #define __constructor __attribute__((constructor)) @@ -51,7 +51,7 @@ union { c_func *c_func; c_func2 *c_func2; - }; + } c_u; struct cmd *c_next; }; void cmd_register(struct cmd *); ==== //depot/projects/davidxu_thread/src/share/man/man4/cdce.4#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .\" $NetBSD: cdce.4,v 1.4 2004/12/08 18:35:56 peter Exp $ -.\" $FreeBSD: src/share/man/man4/cdce.4,v 1.1 2005/03/22 14:52:40 sobomax Exp $ +.\" $FreeBSD: src/share/man/man4/cdce.4,v 1.2 2005/04/08 10:38:12 joel Exp $ .\" .Dd October 22, 2004 .Dt CDCE 4 @@ -73,7 +73,7 @@ .Sh DIAGNOSTICS .Bl -diag .It "cdce%d: no union descriptor" -The driver couldn't fetch an interface descriptor from the USB +The driver could not fetch an interface descriptor from the USB device. For a manually added USB vendor/product, the CDCE_NO_UNION flag can be tried to work around the missing descriptor. ==== //depot/projects/davidxu_thread/src/share/man/man4/ng_netflow.4#5 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ng_netflow.4,v 1.8 2005/03/23 10:08:28 glebius Exp $ +.\" $FreeBSD: src/share/man/man4/ng_netflow.4,v 1.9 2005/04/08 10:38:12 joel Exp $ .\" .Dd March 23, 2005 .Os @@ -218,7 +218,7 @@ The latter sends us a copy of IP packets, which we analyze and free. On .Va fxp0: -we don't use tee, but send packets back to ether node. +we do not use tee, but send packets back to ether node. .Bd -literal -offset indent /usr/sbin/ngctl -f- <<-SEQ # connect ng0's tee to iface0 hook ==== //depot/projects/davidxu_thread/src/share/man/man4/uftdi.4#2 (text+ko) ==== @@ -34,9 +34,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/uftdi.4,v 1.6 2004/10/30 09:25:11 le Exp $ +.\" $FreeBSD: src/share/man/man4/uftdi.4,v 1.7 2005/04/08 18:12:07 brueffer Exp $ .\" -.Dd October 30, 2004 +.Dd April 8, 2004 .Dt UFTDI 4 .Os .Sh NAME @@ -49,7 +49,7 @@ The .Nm driver provides support for various serial adapters based on the FTDI -FT8U100AX and FT8U232AM chips. +FT2232C, FT8U100AX and FT8U232AM chips. .Pp The device is accessed through the .Xr ucom 4 ==== //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.238 2005/04/06 10:22:56 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.239 2005/04/08 09:37:47 sos Exp $"); #include "opt_ata.h" #include @@ -122,7 +122,7 @@ mtx_init(&ch->queue_mtx, "ATA queue lock", NULL, MTX_DEF); TAILQ_INIT(&ch->ata_queue); - /* initialise device(s) on this channel */ + /* reset the controller HW, the channel and device(s) */ while (ATA_LOCKING(dev, ATA_LF_LOCK) != ch->unit) tsleep(&error, PRIBIO, "ataatch", 1); ch->hw.reset(ch); @@ -205,7 +205,7 @@ ch->state = ATA_STALL_QUEUE; mtx_unlock(&ch->state_mtx); - /* reset the channel and devices */ + /* reset the controller HW, the channel and device(s) */ ch->hw.reset(ch); /* reinit the children and delete any that fails */ ==== //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.89 2005/04/06 10:22:56 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.90 2005/04/08 09:37:47 sos Exp $ */ /* ATA register defines */ @@ -103,44 +103,76 @@ #define ATA_A_4BIT 0x08 /* 4 head bits */ #define ATA_A_HOB 0x80 /* High Order Byte enable */ -/* ATAPI misc defines */ -#define ATAPI_MAGIC_LSB 0x14 -#define ATAPI_MAGIC_MSB 0xeb -#define ATAPI_P_READ (ATA_S_DRQ | ATA_I_IN) -#define ATAPI_P_WRITE (ATA_S_DRQ) -#define ATAPI_P_CMDOUT (ATA_S_DRQ | ATA_I_CMD) -#define ATAPI_P_DONEDRQ (ATA_S_DRQ | ATA_I_CMD | ATA_I_IN) -#define ATAPI_P_DONE (ATA_I_CMD | ATA_I_IN) -#define ATAPI_P_ABORT 0 +/* SATA register defines */ +#define ATA_SSTATUS 13 +#define ATA_SS_DET_MASK 0x0000000f +#define ATA_SS_DET_NO_DEVICE 0x00000000 +#define ATA_SS_DET_DEV_PRESENT 0x00000001 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 9 13:30:56 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6129C16A4D0; Sat, 9 Apr 2005 13:30:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1D22316A4CE for ; Sat, 9 Apr 2005 13:30:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DAC9F43D1D for ; Sat, 9 Apr 2005 13:30:55 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j39DUtbx044238 for ; Sat, 9 Apr 2005 13:30:55 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j39DUt69044235 for perforce@freebsd.org; Sat, 9 Apr 2005 13:30:55 GMT (envelope-from davidxu@freebsd.org) Date: Sat, 9 Apr 2005 13:30:55 GMT Message-Id: <200504091330.j39DUt69044235@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 74795 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Apr 2005 13:30:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=74795 Change 74795 by davidxu@davidxu_tiger on 2005/04/09 13:30:10 1. Let parent thread report thread creating event. 2. Breakpoint function return void. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_create.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_event.c#7 edit .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_private.h#12 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_create.c#6 (text+ko) ==== @@ -45,7 +45,7 @@ static void free_thread(struct pthread *curthread, struct pthread *thread); static int create_stack(struct pthread_attr *pattr); static void free_stack(struct pthread *curthread, struct pthread_attr *pattr); -static void thread_start(struct pthread *curthread, umtx_t *p); +static void thread_start(struct pthread *curthread); __weak_reference(_pthread_create, pthread_create); @@ -56,8 +56,7 @@ ucontext_t uc; sigset_t sigmask, oldsigmask; struct pthread *curthread, *new_thread; - umtx_t wait_child, *umtxp; - int ret = 0; + int ret = 0, locked; _thr_check_init(); @@ -113,13 +112,7 @@ SIGFILLSET(uc.uc_sigmask); uc.uc_stack.ss_sp = new_thread->attr.stackaddr_attr; uc.uc_stack.ss_size = new_thread->attr.stacksize_attr; - if (!_libthr_debug) - umtxp = NULL; - else { - umtxp = &wait_child; - _thr_umtx_init(umtxp); - } - makecontext(&uc, (void (*)(void))thread_start, 2, new_thread, umtxp); + makecontext(&uc, (void (*)(void))thread_start, 1, new_thread); /* * Check if this thread is to inherit the scheduling * attributes from its parent: @@ -158,23 +151,31 @@ * it can not handle signal, so we should masks all signals here. */ SIGFILLSET(sigmask); + SIGDELSET(sigmask, SIGTRAP); __sys_sigprocmask(SIG_SETMASK, &sigmask, &oldsigmask); new_thread->sigmask = oldsigmask; /* Add the new thread. */ _thr_link(curthread, new_thread); /* Return thread pointer eariler so that new thread can use it. */ (*thread) = new_thread; + if (_libthr_debug) { + THR_THREAD_LOCK(curthread, new_thread); + locked = 1; + } else + locked = 0; /* Schedule the new thread. */ ret = thr_create(&uc, &new_thread->tid, 0); __sys_sigprocmask(SIG_SETMASK, &oldsigmask, NULL); if (ret != 0) { + if (locked) + THR_THREAD_UNLOCK(curthread, new_thread); _thr_unlink(curthread, new_thread); free_thread(curthread, new_thread); (*thread) = 0; ret = EAGAIN; - } else if (umtxp != NULL) { - while (*umtxp == 0) - _thr_umtx_wait(umtxp, 0, NULL); + } else if (locked) { + _thr_report_create(curthread, new_thread); + THR_THREAD_UNLOCK(curthread, new_thread); } return (ret); } @@ -215,22 +216,19 @@ } static void -thread_start(struct pthread *curthread, umtx_t *umtxp) +thread_start(struct pthread *curthread) { _tcb_set(curthread->tcb); /* Thread was created with all signals blocked, unblock them. */ __sys_sigprocmask(SIG_SETMASK, &curthread->sigmask, NULL); - if (umtxp != NULL) { - _thr_report_create(curthread); - (*umtxp)++; - _thr_umtx_wake(umtxp, 1); - } - if (curthread->flags & THR_FLAGS_NEED_SUSPEND) _thr_suspend_check(curthread); + THR_LOCK(curthread); + THR_UNLOCK(curthread); + /* Run the current thread's start routine with argument: */ pthread_exit(curthread->start_routine(curthread->arg)); ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_event.c#7 (text+ko) ==== @@ -28,38 +28,41 @@ #include "thr_private.h" -int +void _thread_create_bp(void) { - return (0); } -int +void _thread_death_bp(void) { - return (0); } -void _thr_report_create(struct pthread *curthread) +void +_thr_report_create(struct pthread *curthread, struct pthread *newthread) { - _thr_report_event(curthread, TD_CREATE, NULL); + _thr_report_event(curthread, newthread, TD_CREATE, NULL); } -void _thr_report_death(struct pthread *curthread) +void +_thr_report_death(struct pthread *curthread) { - _thr_report_event(curthread, TD_DEATH, NULL); + _thr_report_event(curthread, curthread, TD_DEATH, NULL); } void -_thr_report_event(struct pthread *curthread, int event, void *data) +_thr_report_event(struct pthread *curthread, struct pthread *thread, + int event, void *data) { if (!_libthr_debug || +#if 0 (curthread->enable_event == 0 && event != TD_CREATE) || +#endif !(_thread_event_mask & event)) return; THR_UMTX_LOCK(curthread, &_thr_event_lock); _thread_event.event = event; - _thread_event.thread = curthread; + _thread_event.thread = thread; _thread_event.data = data; switch (event) { case TD_CREATE: ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_private.h#12 (text+ko) ==== @@ -736,11 +736,13 @@ void _thr_unlink(struct pthread *curthread, struct pthread *thread); void _thr_suspend_check(struct pthread *curthread); void _thr_assert_lock_level() __dead2; -void _thr_report_create(struct pthread *curthread); +void _thr_report_create(struct pthread *curthread, + struct pthread *newthread); void _thr_report_death(struct pthread *curthread); -void _thr_report_event(struct pthread *curthread, int event, void *data); -int _thread_create_bp(void); -int _thread_death_bp(void); +void _thr_report_event(struct pthread *curthread, struct pthread *thread, + int event, void *data); +void _thread_create_bp(void); +void _thread_death_bp(void); /* #include */ #ifdef _SYS_AIO_H_