Messages in this thread Patch in this message | | | Date | Wed, 22 Nov 2006 08:32:23 -0800 | From | Randy Dunlap <> | Subject | Re: [PATCH 3/5] WorkStruct: Merge the pending bit into the wq_data pointer [try #2] |
| |
On Wed, 22 Nov 2006 13:02:29 +0000 David Howells wrote:
> Reclaim a word from the size of the work_struct by folding the pending bit and > the wq_data pointer together. This shouldn't cause misalignment problems as > all pointers should be at least 4-byte aligned. > > Signed-Off-By: David Howells <dhowells@redhat.com> > --- > > drivers/block/floppy.c | 4 ++-- > include/linux/workqueue.h | 27 +++++++++++++++++++++++---- > kernel/workqueue.c | 41 ++++++++++++++++++++++++++++++++--------- > 3 files changed, 57 insertions(+), 15 deletions(-) > > diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h > index cef40b2..ecc017d 100644 > --- a/include/linux/workqueue.h > +++ b/include/linux/workqueue.h > @@ -14,11 +14,15 @@ struct workqueue_struct; > typedef void (*work_func_t)(void *data); > > struct work_struct { > - unsigned long pending; > + /* the first word is the work queue pointer and the pending flag > + * rolled into one */ > + unsigned long management; > +#define WORK_STRUCT_PENDING 0 /* T if work item pending execution */
s/T/True/ # or whatever it means there
> +#define WORK_STRUCT_FLAG_MASK (3UL) > +#define WORK_STRUCT_WQ_DATA_MASK (~WORK_STRUCT_FLAG_MASK) > struct list_head entry; > work_func_t func; > void *data; > - void *wq_data; > }; > > struct delayed_work { > @@ -75,6 +79,21 @@ #define INIT_DELAYED_WORK(_work, _func, > init_timer(&(_work)->timer); \ > } while (0) > > +/** > + * work_pending - Find out whether a work item is currently pending > + * @work: The work item in question > + */ > +#define work_pending(work) \ > + test_bit(WORK_STRUCT_PENDING, &(work)->management) > + > +/** > + * delayed_work_pending - Find out whether a delayable work item is currently > + * pending
kernel-doc short function description needs to be on one line only. If more description is needed, please put it after the parameter(s) list and a "blank" ("*" only) line.
> + * @work: The work item in question > + */ > +#define delayed_work_pending(work) \ > + test_bit(WORK_STRUCT_PENDING, &(work)->work.management) > + > > extern struct workqueue_struct *__create_workqueue(const char *name, > int singlethread);
--- ~Randy - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |