← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to storage/falcon/Event.cpp

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/falcon/Event.cpp
45
45
        Thread *thread = Thread::getThread("Event::wait");
46
46
        Sync sync(&mutex, "Event::wait");
47
47
        sync.lock(Exclusive);
48
 
        thread->que = (Thread*) waiters;
 
48
        thread->queue = (Thread*) waiters;
49
49
        waiters = thread;
50
50
        sync.unlock();
51
51
 
70
70
                {
71
71
                Sync sync(&mutex, "Event::post");
72
72
                sync.lock(Exclusive);
73
 
                for (Thread *waiter = (Thread*) waiters; waiter; waiter = waiter->que)
 
73
                for (Thread *waiter = (Thread*) waiters; waiter; waiter = waiter->queue)
74
74
                        waiter->wake();
75
75
                }
76
76
}
94
94
        Sync sync(&mutex, "Event::removeWaiter");
95
95
        sync.lock(Exclusive);
96
96
 
97
 
        for (Thread **ptr = (Thread**) &waiters; *ptr; ptr = &(*ptr)->que)
 
97
        for (Thread **ptr = (Thread**) &waiters; *ptr; ptr = &(*ptr)->queue)
98
98
                if (*ptr == thread)
99
99
                        {
100
 
                        *ptr = thread->que;
 
100
                        *ptr = thread->queue;
101
101
                        return;
102
102
                        }
103
103
}