1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add queue_list and szqueue_list macros

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2023-01-20 20:24:49 +09:00
parent 056e7a0154
commit f0f2535c4d
Notes: git 2023-01-20 15:31:03 +00:00 
Merged: https://github.com/ruby/ruby/pull/7161
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
thread_sync.c
View File

@ -651,6 +651,7 @@ rb_mutex_allow_trap(VALUE self, int val)
/* Queue */ /* Queue */
#define queue_waitq(q) UNALIGNED_MEMBER_PTR(q, waitq) #define queue_waitq(q) UNALIGNED_MEMBER_PTR(q, waitq)
#define queue_list(q) UNALIGNED_MEMBER_PTR(q, que)
PACKED_STRUCT_UNALIGNED(struct rb_queue { PACKED_STRUCT_UNALIGNED(struct rb_queue {
struct ccan_list_head waitq; struct ccan_list_head waitq;
rb_serial_t fork_gen; rb_serial_t fork_gen;
@ -659,6 +660,7 @@ PACKED_STRUCT_UNALIGNED(struct rb_queue {
}); });
#define szqueue_waitq(sq) UNALIGNED_MEMBER_PTR(sq, q.waitq) #define szqueue_waitq(sq) UNALIGNED_MEMBER_PTR(sq, q.waitq)
#define szqueue_list(sq) UNALIGNED_MEMBER_PTR(sq, q.que)
#define szqueue_pushq(sq) UNALIGNED_MEMBER_PTR(sq, pushq) #define szqueue_pushq(sq) UNALIGNED_MEMBER_PTR(sq, pushq)
PACKED_STRUCT_UNALIGNED(struct rb_szqueue { PACKED_STRUCT_UNALIGNED(struct rb_szqueue {
struct rb_queue q; struct rb_queue q;
@ -905,7 +907,7 @@ rb_queue_initialize(int argc, VALUE *argv, VALUE self)
if ((argc = rb_scan_args(argc, argv, "01", &initial)) == 1) { if ((argc = rb_scan_args(argc, argv, "01", &initial)) == 1) {
initial = rb_to_array(initial); initial = rb_to_array(initial);
} }
RB_OBJ_WRITE(self, UNALIGNED_MEMBER_ACCESS((void *)&q->que), ary_buf_new()); RB_OBJ_WRITE(self, queue_list(q), ary_buf_new());
ccan_list_head_init(queue_waitq(q)); ccan_list_head_init(queue_waitq(q));
if (argc == 1) { if (argc == 1) {
rb_ary_concat(q->que, initial); rb_ary_concat(q->que, initial);
@ -1178,7 +1180,7 @@ rb_szqueue_initialize(VALUE self, VALUE vmax)
rb_raise(rb_eArgError, "queue size must be positive"); rb_raise(rb_eArgError, "queue size must be positive");
} }
RB_OBJ_WRITE(self, UNALIGNED_MEMBER_ACCESS((void *)&sq->q.que), ary_buf_new()); RB_OBJ_WRITE(self, szqueue_list(sq), ary_buf_new());
ccan_list_head_init(szqueue_waitq(sq)); ccan_list_head_init(szqueue_waitq(sq));
ccan_list_head_init(szqueue_pushq(sq)); ccan_list_head_init(szqueue_pushq(sq));
sq->max = max; sq->max = max;