Date: Thu, 13 Oct 2011 18:26:12 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 200164 for review Message-ID: <201110131826.p9DIQCmI023928@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@200164?ac=10 Change 200164 by jhb@jhb_jhbbsd on 2011/10/13 18:25:15 Regen. Affected files ... .. //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_proto.h#2 edit .. //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_syscall.h#2 edit .. //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_syscalls.c#2 edit .. //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_sysent.c#2 edit .. //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_systrace_args.c#2 edit Differences ... ==== //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_proto.h#2 (text+ko) ==== @@ -570,10 +570,18 @@ }; struct freebsd32_posix_fallocate_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char offsetlo_l_[PADL_(uint32_t)]; uint32_t offsetlo; char offsetlo_r_[PADR_(uint32_t)]; - char offsethi_l_[PADL_(uint32_t)]; uint32_t offsethi; char offsethi_r_[PADR_(uint32_t)]; - char lenlo_l_[PADL_(uint32_t)]; uint32_t lenlo; char lenlo_r_[PADR_(uint32_t)]; - char lenhi_l_[PADL_(uint32_t)]; uint32_t lenhi; char lenhi_r_[PADR_(uint32_t)]; + char offset1_l_[PADL_(uint32_t)]; uint32_t offset1; char offset1_r_[PADR_(uint32_t)]; + char offset2_l_[PADL_(uint32_t)]; uint32_t offset2; char offset2_r_[PADR_(uint32_t)]; + char len1_l_[PADL_(uint32_t)]; uint32_t len1; char len1_r_[PADR_(uint32_t)]; + char len2_l_[PADL_(uint32_t)]; uint32_t len2; char len2_r_[PADR_(uint32_t)]; +}; +struct freebsd32_fadvise_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char offset1_l_[PADL_(uint32_t)]; uint32_t offset1; char offset1_r_[PADR_(uint32_t)]; + char offset2_l_[PADL_(uint32_t)]; uint32_t offset2; char offset2_r_[PADR_(uint32_t)]; + char len1_l_[PADL_(uint32_t)]; uint32_t len1; char len1_r_[PADR_(uint32_t)]; + char len2_l_[PADL_(uint32_t)]; uint32_t len2; char len2_r_[PADR_(uint32_t)]; + char advice_l_[PADL_(int)]; int advice; char advice_r_[PADR_(int)]; }; #if !defined(PAD64_REQUIRED) && defined(__powerpc__) #define PAD64_REQUIRED @@ -684,6 +692,7 @@ int freebsd32_shmctl(struct thread *, struct freebsd32_shmctl_args *); int freebsd32_pselect(struct thread *, struct freebsd32_pselect_args *); int freebsd32_posix_fallocate(struct thread *, struct freebsd32_posix_fallocate_args *); +int freebsd32_fadvise(struct thread *, struct freebsd32_fadvise_args *); #ifdef COMPAT_43 @@ -1058,6 +1067,7 @@ #define FREEBSD32_SYS_AUE_freebsd32_shmctl AUE_SHMCTL #define FREEBSD32_SYS_AUE_freebsd32_pselect AUE_SELECT #define FREEBSD32_SYS_AUE_freebsd32_posix_fallocate AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_fadvise AUE_NULL #undef PAD_ #undef PADL_ ==== //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_syscall.h#2 (text+ko) ==== @@ -424,4 +424,5 @@ #define FREEBSD32_SYS_rctl_add_rule 528 #define FREEBSD32_SYS_rctl_remove_rule 529 #define FREEBSD32_SYS_freebsd32_posix_fallocate 530 +#define FREEBSD32_SYS_freebsd32_fadvise 531 #define FREEBSD32_SYS_MAXSYSCALL 532 ==== //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_syscalls.c#2 (text+ko) ==== @@ -554,5 +554,5 @@ "rctl_add_rule", /* 528 = rctl_add_rule */ "rctl_remove_rule", /* 529 = rctl_remove_rule */ "freebsd32_posix_fallocate", /* 530 = freebsd32_posix_fallocate */ - "#531", /* 531 = posix_fadvise */ + "freebsd32_fadvise", /* 531 = freebsd32_fadvise */ }; ==== //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_sysent.c#2 (text+ko) ==== @@ -591,5 +591,5 @@ { AS(rctl_add_rule_args), (sy_call_t *)sys_rctl_add_rule, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 528 = rctl_add_rule */ { AS(rctl_remove_rule_args), (sy_call_t *)sys_rctl_remove_rule, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 529 = rctl_remove_rule */ { AS(freebsd32_posix_fallocate_args), (sy_call_t *)freebsd32_posix_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 530 = freebsd32_posix_fallocate */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 531 = posix_fadvise */ + { AS(freebsd32_fadvise_args), (sy_call_t *)freebsd32_fadvise, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 531 = freebsd32_fadvise */ }; ==== //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_systrace_args.c#2 (text+ko) ==== @@ -3027,13 +3027,25 @@ case 530: { struct freebsd32_posix_fallocate_args *p = params; iarg[0] = p->fd; /* int */ - uarg[1] = p->offsetlo; /* uint32_t */ - uarg[2] = p->offsethi; /* uint32_t */ - uarg[3] = p->lenlo; /* uint32_t */ - uarg[4] = p->lenhi; /* uint32_t */ + uarg[1] = p->offset1; /* uint32_t */ + uarg[2] = p->offset2; /* uint32_t */ + uarg[3] = p->len1; /* uint32_t */ + uarg[4] = p->len2; /* uint32_t */ *n_args = 5; break; } + /* freebsd32_fadvise */ + case 531: { + struct freebsd32_fadvise_args *p = params; + iarg[0] = p->fd; /* int */ + uarg[1] = p->offset1; /* uint32_t */ + uarg[2] = p->offset2; /* uint32_t */ + uarg[3] = p->len1; /* uint32_t */ + uarg[4] = p->len2; /* uint32_t */ + iarg[5] = p->advice; /* int */ + *n_args = 6; + break; + } default: *n_args = 0; break; @@ -8093,6 +8105,31 @@ break; }; break; + /* freebsd32_fadvise */ + case 531: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "uint32_t"; + break; + case 2: + p = "uint32_t"; + break; + case 3: + p = "uint32_t"; + break; + case 4: + p = "uint32_t"; + break; + case 5: + p = "int"; + break; + default: + break; + }; + break; default: break; };
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110131826.p9DIQCmI023928>