Skip to content

F
fastclick
Commit d7908e80 authored by Tom Barbette's avatar Tom Barbette
Browse files
Options

hashtablemp: Reference the table's _mt 

Make CLANG happy too
parent c9adf651
Pipeline #1807 passed with stage
    in 10 minutes and 7 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 12 additions and 10 deletions
    include/click/hashtablemp.hh
    View file @ d7908e80
    ......@@ -73,10 +73,10 @@ class HashContainerMP { public:
    ~iterator() {
    if (_h) {
    if (_b < _h->_table->_nbuckets) {
    if (likely(_mt))
    if (likely(_h->_mt))
    _h->_table->buckets[_b].list.read_end();
    }
    if (likely(_mt))
    if (likely(_h->_mt))
    _h->_table.read_end();
    }
    }
    ......@@ -90,10 +90,10 @@ class HashContainerMP { public:
    }
    while (!_item) {
    //click_chatter("Bucket %d : %p",_b,_h->_table->buckets[_b]);
    if (likely(_mt))
    if (likely(_h->_mt))
    _h->_table->buckets[_b].list.read_end();
    if (++_b == _h->_table->_nbuckets) return;
    if (likely(_mt))
    if (likely(_h->_mt))
    _h->_table->buckets[_b].list.read_begin();
    _item = _h->_table->buckets[_b].list->head;
    _prev = 0;
    ......@@ -134,7 +134,7 @@ class HashContainerMP { public:
    //global read lock must be held!
    iterator(HashContainerMP<K,V,Item>* h) : _h(h), _prev(0) {
    _b = 0;
    if (likely(_mt))
    if (likely(_h->_mt))
    _h->_table->buckets[_b].list.read_begin();
    _item = _h->_table->buckets[_b].list->head;
    if (_item == 0) {
    ......@@ -153,10 +153,10 @@ class HashContainerMP { public:
    ~write_iterator() {
    if (_h) {
    if (_b < _h->_table->_nbuckets) {
    if (likely(_mt))
    if (likely(_h->_mt))
    _h->_table->buckets[_b].list.write_end();
    }
    if (likely(_mt))
    if (likely(_h->_mt))
    _h->_table.read_end();
    }
    _h = 0; //Prevent read destruction
    ......@@ -170,10 +170,10 @@ class HashContainerMP { public:
    _prev = _item;
    }
    while (!_item) {
    if (likely(_mt))
    if (likely(_h->_mt))
    _h->_table->buckets[_b].list.write_end();
    if (++_b == _h->_table->_nbuckets) return;
    if (likely(_mt))
    if (likely(_h->_mt))
    _h->_table->buckets[_b].list.write_begin();
    _item = _h->_table->buckets[_b].list->head;
    _prev = 0;
    ......@@ -218,7 +218,7 @@ class HashContainerMP { public:
    //global read lock must be held!
    write_iterator(HashContainerMP<K,V,Item>* h) : _h(h), _prev(0) {
    _b = 0;
    if (likely(_mt))
    if (likely(h->_mt))
    _h->_table->buckets[_b].list.write_begin();
    _item = _h->_table->buckets[_b].list->head;
    if (_item == 0) {
    ......@@ -371,6 +371,8 @@ class HashContainerMP { public:
    }
    }
    friend class iterator;
    };
    template <typename K, typename V, typename Item>
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment