Date: Sun, 29 May 2011 11:04:05 GMT From: Ilya Putsikau <ilya@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 193898 for review Message-ID: <201105291104.p4TB45ou081229@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@193898?ac=10 Change 193898 by ilya@ilya_triton2011 on 2011/05/29 11:03:14 fuse_ipc.h reduce diff: whitespace, kdebug_printf() Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.h#2 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.h#2 (text+ko) ==== @@ -1,4 +1,11 @@ /* + * Copyright (C) 2006 Google. All Rights Reserved. + * Amit Singh <singh@> + */ + +#ifndef _FUSE_IPC_H_ +#define _FUSE_IPC_H_ +/* * Messaging related stuff and parameters of a session */ @@ -7,13 +14,12 @@ * fiov_adjust() is the primary public interface. */ struct fuse_iov { - /* "public" members, provide an interface similar to that of an iov */ - void *base; - size_t len; /* nominal length */ - - /* "private" members */ - size_t allocated_size; /* size of allocated buffer */ - int credit; /* allow overruns of max permanent size + /* "public" members, provide an interface similar to that of an iov */ + void *base; + size_t len; /* nominal length */ + /* "private" members */ + size_t allocated_size; /* size of allocated buffer */ + int credit; /* allow overruns of max permanent size this many times */ }; @@ -24,11 +30,11 @@ /* tune fiov so that its len will be set to size */ void fiov_adjust(struct fuse_iov *fiov, size_t size); -#define FUSE_DIMALLOC(fiov, spc1, spc2, amnt) \ -do { \ - fiov_adjust(fiov, (sizeof(*(spc1)) + (amnt))); \ - (spc1) = (fiov)->base; \ - (spc2) = (char *)(fiov)->base + (sizeof(*(spc1))); \ +#define FUSE_DIMALLOC(fiov, spc1, spc2, amnt) \ +do { \ + fiov_adjust(fiov, (sizeof(*(spc1)) + (amnt))); \ + (spc1) = (fiov)->base; \ + (spc2) = (char *)(fiov)->base + (sizeof(*(spc1))); \ } while (0) #define FU_AT_LEAST(siz) max(siz, 128) @@ -47,38 +53,34 @@ */ struct fuse_ticket { + /* fields giving the identity of the ticket */ + uint64_t tk_unique; + struct fuse_data *tk_data; + int tk_flag; + unsigned int tk_age; - /* fields giving the identity of the ticket */ + STAILQ_ENTRY(fuse_ticket) tk_freetickets_link; + TAILQ_ENTRY(fuse_ticket) tk_alltickets_link; - uint64_t tk_unique; - struct fuse_data *tk_data; - int tk_flag; - unsigned int tk_age; - STAILQ_ENTRY(fuse_ticket) tk_freetickets_link; - TAILQ_ENTRY(fuse_ticket) tk_alltickets_link; + /* fields for initiating an upgoing message */ + struct fuse_iov tk_ms_fiov; + void *tk_ms_bufdata; + unsigned long tk_ms_bufsize; + enum { FT_M_FIOV, FT_M_BUF } tk_ms_type; + STAILQ_ENTRY(fuse_ticket) tk_ms_link; - /* fields for initiating an upgoing message */ + /* fields for handling answers coming from userspace */ + struct fuse_iov tk_aw_fiov; + void *tk_aw_bufdata; + unsigned long tk_aw_bufsize; + enum { FT_A_FIOV, FT_A_BUF } tk_aw_type; - struct fuse_iov tk_ms_fiov; - void *tk_ms_bufdata; - unsigned long tk_ms_bufsize; - enum { FT_M_FIOV, FT_M_BUF } tk_ms_type; - /**/ - STAILQ_ENTRY(fuse_ticket) tk_ms_link; - - /* fields for handling answers coming from userspace */ - - struct fuse_iov tk_aw_fiov; - void *tk_aw_bufdata; - unsigned long tk_aw_bufsize; - enum { FT_A_FIOV, FT_A_BUF } tk_aw_type; - /**/ - struct fuse_out_header tk_aw_ohead; - int tk_aw_errno; - struct mtx tk_aw_mtx; - fuse_handler_t *tk_aw_handler; - struct fuse_iov tk_aw_handler_parm; - TAILQ_ENTRY(fuse_ticket) tk_aw_link; + struct fuse_out_header tk_aw_ohead; + int tk_aw_errno; + struct mtx tk_aw_mtx; + fuse_handler_t *tk_aw_handler; + struct fuse_iov tk_aw_handler_parm; + TAILQ_ENTRY(fuse_ticket) tk_aw_link; }; #define FT_ANSW 0x01 /* request of ticket has already been answered */ @@ -88,31 +90,36 @@ static __inline struct fuse_iov * fticket_resp(struct fuse_ticket *tick) { - return (&tick->tk_aw_fiov); + kdebug_printf("-> tick=%p\n", tick); + return (&tick->tk_aw_fiov); } static __inline int fticket_answered(struct fuse_ticket *tick) { - return (tick->tk_flag & FT_ANSW); + kdebug_printf("-> tick=%p\n", tick); + return (tick->tk_flag & FT_ANSW); } static __inline void fticket_set_answered(struct fuse_ticket *tick) { - tick->tk_flag |= FT_ANSW; + kdebug_printf("-> tick=%p\n", tick); + tick->tk_flag |= FT_ANSW; } static __inline enum fuse_opcode fticket_opcode(struct fuse_ticket *tick) { - return (((struct fuse_in_header *)(tick->tk_ms_fiov.base))->opcode); + kdebug_printf("-> tick=%p\n", tick); + return (((struct fuse_in_header *)(tick->tk_ms_fiov.base))->opcode); } static __inline void fticket_disown(struct fuse_ticket *tick) { - tick->tk_flag |= FT_NOTOWNED; + kdebug_printf("-> tick=%p\n", tick); + tick->tk_flag |= FT_NOTOWNED; } /* pull in userspace data from uio and pass it to tick */ @@ -121,55 +128,56 @@ enum mountpri { FM_NOMOUNTED, FM_PRIMARY, FM_SECONDARY }; /* - * The data representing a fuse session. + * The data representing a FUSE session. * It contains the queues used in the communication * and the respective locks. */ struct fuse_data { - enum mountpri mpri; + enum mountpri mpri; + + /* queue for upgoing messages */ + struct mtx ms_mtx; + STAILQ_HEAD(, fuse_ticket) ms_head; - /* queue for upgoing messages */ - struct mtx ms_mtx; - STAILQ_HEAD(, fuse_ticket) ms_head; + /* queue of answer waiters */ + struct mtx aw_mtx; + TAILQ_HEAD(, fuse_ticket) aw_head; - /* queue of answer waiters */ - struct mtx aw_mtx; - TAILQ_HEAD(, fuse_ticket) aw_head; + /* fuse_ticket repository */ + struct mtx ticket_mtx; + STAILQ_HEAD(, fuse_ticket) freetickets_head; + TAILQ_HEAD(, fuse_ticket) alltickets_head; + uint32_t freeticket_counter; + uint32_t deadticket_counter; + uint32_t ticketer; - /* fuse_ticket repository */ - struct mtx ticket_mtx; - STAILQ_HEAD(, fuse_ticket) freetickets_head; - TAILQ_HEAD(, fuse_ticket) alltickets_head; - uint32_t freeticket_counter; - uint32_t deadticket_counter; - uint32_t ticketer; #if _DEBUG_UNIQUE - uint64_t msgcou; + uint64_t msgcou; #endif - struct sx rename_lock; + struct sx rename_lock; - struct ucred *daemoncred; + struct ucred *daemoncred; - struct selinfo ks_rsel; + struct selinfo ks_rsel; - int dataflag; + int dataflag; - struct cdev *fdev; - struct mount *mp; - struct vnode *rvp; + struct cdev *fdev; + struct mount *mp; + struct vnode *rvp; - /* mount info */ - int mntco; - struct sx mhierlock; - LIST_HEAD(, fuse_secondary_data) slaves_head; + /* mount info */ + int mntco; + struct sx mhierlock; + LIST_HEAD(, fuse_secondary_data) slaves_head; - uint32_t fuse_libabi_major; - uint32_t fuse_libabi_minor; + uint32_t fuse_libabi_major; + uint32_t fuse_libabi_minor; - unsigned max_write; - unsigned max_read; + unsigned max_write; + unsigned max_read; }; #define FSESS_KICK 0x0001 /* session is to be closed */ @@ -203,9 +211,9 @@ static __inline struct fuse_data * fusefs_get_data(struct mount *mp) { - struct fuse_data *data = mp->mnt_data; - - return (data->mpri == FM_PRIMARY ? data : NULL); + struct fuse_data *data = mp->mnt_data; + kdebug_printf("-> mp=%p\n", mp); + return (data->mpri == FM_PRIMARY ? data : NULL); } /* misc functions for managing queues and alike */ @@ -213,97 +221,104 @@ static __inline void fuse_ms_push(struct fuse_ticket *tick) { - STAILQ_INSERT_TAIL(&tick->tk_data->ms_head, tick, tk_ms_link); + kdebug_printf("-> tick=%p\n", tick); + STAILQ_INSERT_TAIL(&tick->tk_data->ms_head, tick, tk_ms_link); } static __inline struct fuse_ticket * fuse_ms_pop(struct fuse_data *data) { - struct fuse_ticket *tick; + struct fuse_ticket *tick; + + kdebug_printf("-> data=%p\n", data); - if ((tick = STAILQ_FIRST(&data->ms_head))) - STAILQ_REMOVE_HEAD(&data->ms_head, tk_ms_link); - return (tick); + if ((tick = STAILQ_FIRST(&data->ms_head))) { + STAILQ_REMOVE_HEAD(&data->ms_head, tk_ms_link); + } + return (tick); } -/**/ + static __inline void fuse_aw_push(struct fuse_ticket *tick) { - TAILQ_INSERT_TAIL(&tick->tk_data->aw_head, tick, tk_aw_link); + kdebug_printf("-> tick=%p\n", tick); + TAILQ_INSERT_TAIL(&tick->tk_data->aw_head, tick, tk_aw_link); } static __inline void fuse_aw_remove(struct fuse_ticket *tick) { - TAILQ_REMOVE(&tick->tk_data->aw_head, tick, tk_aw_link); + kdebug_printf("-> tick=%p\n", tick); + TAILQ_REMOVE(&tick->tk_data->aw_head, tick, tk_aw_link); } static __inline struct fuse_ticket * fuse_aw_pop(struct fuse_data *data) { - struct fuse_ticket *tick; + struct fuse_ticket *tick; + + kdebug_printf("-> data=%p\n", data); + + if ((tick = TAILQ_FIRST(&data->aw_head))) { + fuse_aw_remove(tick); + } - if ((tick = TAILQ_FIRST(&data->aw_head))) - fuse_aw_remove(tick); - return (tick); + return (tick); } struct fuse_ticket *fuse_ticket_fetch(struct fuse_data *data); -void fuse_ticket_drop(struct fuse_ticket *tick); -void fuse_ticket_drop_notowned(struct fuse_ticket *tick); -void fuse_insert_callback(struct fuse_ticket *tick, - fuse_handler_t *handler); -void fuse_insert_message(struct fuse_ticket *tick); +void fuse_ticket_drop(struct fuse_ticket *tick); +void fuse_ticket_drop_notowned(struct fuse_ticket *tick); +void fuse_insert_callback(struct fuse_ticket *tick, fuse_handler_t *handler); +void fuse_insert_message(struct fuse_ticket *tick); static __inline int fuse_libabi_geq(struct fuse_data *data, uint32_t maj, uint32_t min) { - return (data->fuse_libabi_major > maj || - (data->fuse_libabi_major == maj && - data->fuse_libabi_minor >= min)); + return (data->fuse_libabi_major > maj || + (data->fuse_libabi_major == maj && data->fuse_libabi_minor >= min)); } /* * VFS private data for secondary mount */ struct fuse_secondary_data { - enum mountpri mpri; + enum mountpri mpri; + struct mount *mp; + struct fuse_data *master; - struct mount *mp; - - struct fuse_data *master; - LIST_ENTRY(fuse_secondary_data) slaves_link; + LIST_ENTRY(fuse_secondary_data) slaves_link; }; static __inline struct fuse_secondary_data * fusefs_get_secdata(struct mount *mp) { - struct fuse_secondary_data *fsdat = mp->mnt_data; - - return (fsdat->mpri == FM_SECONDARY ? fsdat : NULL); + struct fuse_secondary_data *fsdat = mp->mnt_data; + return (fsdat->mpri == FM_SECONDARY ? fsdat : NULL); } struct fuse_data *fdata_alloc(struct cdev *dev, struct ucred *cred); -void fdata_destroy(struct fuse_data *data); +void fdata_destroy(struct fuse_data *data); /* see if session is to be closed */ -int fdata_kick_get(struct fuse_data *data); +int fdata_kick_get(struct fuse_data *data); /* mark session to be closed */ -void fdata_kick_set(struct fuse_data *data); +void fdata_kick_set(struct fuse_data *data); /* * Structure used by the high level interface to messaging */ struct fuse_dispatcher { - /* fields for stage 1 (and 0, 2) */ - struct fuse_ticket *tick; - struct fuse_in_header *finh; - void *indata; - size_t iosize; - uint64_t nodeid; - /* fields for stage 2 */ - int answ_stat; - void *answ; + /* fields for stage 1 (and 0, 2) */ + struct fuse_ticket *tick; + struct fuse_in_header *finh; + + void *indata; + size_t iosize; + uint64_t nodeid; + /* fields for stage 2 */ + int answ_stat; + void *answ; }; /* High-level routines for different stages of message passing */ @@ -312,8 +327,9 @@ static __inline void fdisp_init(struct fuse_dispatcher *fdisp, size_t iosize) { - fdisp->iosize = iosize; - fdisp->tick = NULL; + kdebug_printf("-> fdisp=%p, iosize=%x\n", fdisp, iosize); + fdisp->iosize = iosize; + fdisp->tick = NULL; } /* stage 1 */ @@ -336,8 +352,11 @@ fdisp_simple_putget(struct fuse_dispatcher *fdip, enum fuse_opcode op, struct vnode *vp, struct thread *td, struct ucred *cred) { - fdisp_init(fdip, 0); - fdisp_make_vp(fdip, op, vp, td, cred); + kdebug_printf("-> fdip=%p, opcode=%d, vp=%p\n", fdip, op, vp); + fdisp_init(fdip, 0); + fdisp_make_vp(fdip, op, vp, td, cred); - return (fdisp_wait_answ(fdip)); + return (fdisp_wait_answ(fdip)); } + +#endif /* _FUSE_IPC_H_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105291104.p4TB45ou081229>