Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xavier Thompson
cython
Commits
30d99a76
Commit
30d99a76
authored
Aug 28, 2020
by
Xavier Thompson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Optimise cypclass dict with 'const' to mark where readlocks suffice
parent
bc831681
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
16 deletions
+16
-16
Cython/Includes/libcythonplus/dict.pxd
Cython/Includes/libcythonplus/dict.pxd
+16
-16
No files found.
Cython/Includes/libcythonplus/dict.pxd
View file @
30d99a76
...
@@ -192,7 +192,7 @@ cdef extern from * nogil:
...
@@ -192,7 +192,7 @@ cdef extern from * nogil:
cdef
cppclass
key_iterator_t
[
dict_t
,
base_iterator_t
,
reference_t
]:
cdef
cppclass
key_iterator_t
[
dict_t
,
base_iterator_t
,
reference_t
]:
key_iterator_t
()
key_iterator_t
()
key_iterator_t
(
base_iterator_t
)
key_iterator_t
(
base_iterator_t
)
key_iterator_t
(
base_iterator_t
,
dict_t
)
key_iterator_t
(
base_iterator_t
,
const
dict_t
)
reference_t
operator
*
()
reference_t
operator
*
()
key_iterator_t
operator
++
()
key_iterator_t
operator
++
()
bint
operator
!=
(
key_iterator_t
)
bint
operator
!=
(
key_iterator_t
)
...
@@ -200,7 +200,7 @@ cdef extern from * nogil:
...
@@ -200,7 +200,7 @@ cdef extern from * nogil:
cdef
cppclass
value_iterator_t
[
dict_t
,
base_iterator_t
,
reference_t
]:
cdef
cppclass
value_iterator_t
[
dict_t
,
base_iterator_t
,
reference_t
]:
value_iterator_t
()
value_iterator_t
()
value_iterator_t
(
base_iterator_t
)
value_iterator_t
(
base_iterator_t
)
value_iterator_t
(
base_iterator_t
,
dict_t
)
value_iterator_t
(
base_iterator_t
,
const
dict_t
)
reference_t
operator
*
()
reference_t
operator
*
()
value_iterator_t
operator
++
()
value_iterator_t
operator
++
()
bint
operator
!=
(
value_iterator_t
)
bint
operator
!=
(
value_iterator_t
)
...
@@ -208,7 +208,7 @@ cdef extern from * nogil:
...
@@ -208,7 +208,7 @@ cdef extern from * nogil:
cdef
cppclass
item_iterator_t
[
dict_t
,
base_iterator_t
,
reference_t
]:
cdef
cppclass
item_iterator_t
[
dict_t
,
base_iterator_t
,
reference_t
]:
item_iterator_t
()
item_iterator_t
()
item_iterator_t
(
base_iterator_t
)
item_iterator_t
(
base_iterator_t
)
item_iterator_t
(
base_iterator_t
,
dict_t
)
item_iterator_t
(
base_iterator_t
,
const
dict_t
)
reference_t
operator
*
()
reference_t
operator
*
()
item_iterator_t
operator
++
()
item_iterator_t
operator
++
()
bint
operator
!=
(
item_iterator_t
)
bint
operator
!=
(
item_iterator_t
)
...
@@ -216,21 +216,21 @@ cdef extern from * nogil:
...
@@ -216,21 +216,21 @@ cdef extern from * nogil:
cdef
cppclass
view_dict_keys
[
dict_t
,
base_iterator_t
,
reference_t
]:
cdef
cppclass
view_dict_keys
[
dict_t
,
base_iterator_t
,
reference_t
]:
ctypedef
key_iterator_t
[
dict_t
,
base_iterator_t
,
reference_t
]
iterator
ctypedef
key_iterator_t
[
dict_t
,
base_iterator_t
,
reference_t
]
iterator
view_dict_keys
()
view_dict_keys
()
view_dict_keys
(
dict_t
)
view_dict_keys
(
const
dict_t
)
key_iterator_t
[
dict_t
,
base_iterator_t
,
reference_t
]
begin
()
key_iterator_t
[
dict_t
,
base_iterator_t
,
reference_t
]
begin
()
base_iterator_t
end
()
base_iterator_t
end
()
cdef
cppclass
view_dict_values
[
dict_t
,
base_iterator_t
,
reference_t
]:
cdef
cppclass
view_dict_values
[
dict_t
,
base_iterator_t
,
reference_t
]:
ctypedef
value_iterator_t
[
dict_t
,
base_iterator_t
,
reference_t
]
iterator
ctypedef
value_iterator_t
[
dict_t
,
base_iterator_t
,
reference_t
]
iterator
view_dict_values
()
view_dict_values
()
view_dict_values
(
dict_t
)
view_dict_values
(
const
dict_t
)
value_iterator_t
[
dict_t
,
base_iterator_t
,
reference_t
]
begin
()
value_iterator_t
[
dict_t
,
base_iterator_t
,
reference_t
]
begin
()
base_iterator_t
end
()
base_iterator_t
end
()
cdef
cppclass
view_dict_items
[
dict_t
,
base_iterator_t
,
reference_t
]:
cdef
cppclass
view_dict_items
[
dict_t
,
base_iterator_t
,
reference_t
]:
ctypedef
item_iterator_t
[
dict_t
,
base_iterator_t
,
reference_t
]
iterator
ctypedef
item_iterator_t
[
dict_t
,
base_iterator_t
,
reference_t
]
iterator
view_dict_items
()
view_dict_items
()
view_dict_items
(
dict_t
)
view_dict_items
(
const
dict_t
)
item_iterator_t
[
dict_t
,
base_iterator_t
,
reference_t
]
begin
()
item_iterator_t
[
dict_t
,
base_iterator_t
,
reference_t
]
begin
()
base_iterator_t
end
()
base_iterator_t
end
()
...
@@ -254,7 +254,7 @@ cdef cypclass cypdict[K, V]:
...
@@ -254,7 +254,7 @@ cdef cypclass cypdict[K, V]:
Cy_DECREF
(
item
.
first
)
Cy_DECREF
(
item
.
first
)
Cy_DECREF
(
item
.
second
)
Cy_DECREF
(
item
.
second
)
V
__getitem__
(
self
,
const
key_type
key
)
except
~
:
V
__getitem__
(
self
,
const
key_type
key
)
except
~
const
:
it
=
self
.
_indices
.
find
(
key
)
it
=
self
.
_indices
.
find
(
key
)
end
=
self
.
_indices
.
end
()
end
=
self
.
_indices
.
end
()
if
it
!=
end
:
if
it
!=
end
:
...
@@ -263,7 +263,7 @@ cdef cypclass cypdict[K, V]:
...
@@ -263,7 +263,7 @@ cdef cypclass cypdict[K, V]:
with
gil
:
with
gil
:
raise
KeyError
(
"Getting nonexistent item"
)
raise
KeyError
(
"Getting nonexistent item"
)
void
__setitem__
(
self
,
key_type
key
,
value_type
value
)
except
~
:
void
__setitem__
(
self
,
const
key_type
key
,
const
value_type
value
)
except
~
:
it
=
self
.
_indices
.
find
(
key
)
it
=
self
.
_indices
.
find
(
key
)
end
=
self
.
_indices
.
end
()
end
=
self
.
_indices
.
end
()
if
it
!=
end
:
if
it
!=
end
:
...
@@ -282,7 +282,7 @@ cdef cypclass cypdict[K, V]:
...
@@ -282,7 +282,7 @@ cdef cypclass cypdict[K, V]:
with
gil
:
with
gil
:
raise
RuntimeError
(
"Modifying a dictionary with active iterators"
)
raise
RuntimeError
(
"Modifying a dictionary with active iterators"
)
void
__delitem__
(
self
,
key_type
key
)
except
~
:
void
__delitem__
(
self
,
const
key_type
key
)
except
~
:
it
=
self
.
_indices
.
find
(
key
)
it
=
self
.
_indices
.
find
(
key
)
end
=
self
.
_indices
.
end
()
end
=
self
.
_indices
.
end
()
if
it
!=
end
:
if
it
!=
end
:
...
@@ -308,23 +308,23 @@ cdef cypclass cypdict[K, V]:
...
@@ -308,23 +308,23 @@ cdef cypclass cypdict[K, V]:
with
gil
:
with
gil
:
raise
RuntimeError
(
"Modifying a dictionary with active iterators"
)
raise
RuntimeError
(
"Modifying a dictionary with active iterators"
)
key_iterator_t
[
cypdict
[
K
,
V
],
vector
[
item_type
].
iterator
,
key_type
]
begin
(
self
):
key_iterator_t
[
cypdict
[
K
,
V
],
vector
[
item_type
].
iterator
,
key_type
]
begin
(
self
)
const
:
return
key_iterator_t
[
cypdict
[
K
,
V
],
vector
[
item_type
].
iterator
,
key_type
](
self
.
_items
.
begin
(),
self
)
return
key_iterator_t
[
cypdict
[
K
,
V
],
vector
[
item_type
].
iterator
,
key_type
](
self
.
_items
.
begin
(),
self
)
vector
[
item_type
].
iterator
end
(
self
):
vector
[
item_type
].
iterator
end
(
self
)
const
:
return
self
.
_items
.
end
()
return
self
.
_items
.
end
()
size_type
__len__
(
self
):
size_type
__len__
(
self
)
const
:
return
self
.
_items
.
size
()
return
self
.
_items
.
size
()
bint
__contains__
(
self
,
key_type
key
)
:
bint
__contains__
(
self
,
const
key_type
key
)
const
:
return
self
.
_indices
.
count
(
key
)
return
self
.
_indices
.
count
(
key
)
view_dict_keys
[
cypdict
[
K
,
V
],
vector
[
item_type
].
iterator
,
key_type
]
keys
(
self
):
view_dict_keys
[
cypdict
[
K
,
V
],
vector
[
item_type
].
iterator
,
key_type
]
keys
(
self
)
const
:
return
view_dict_keys
[
cypdict
[
K
,
V
],
vector
[
item_type
].
iterator
,
key_type
](
self
)
return
view_dict_keys
[
cypdict
[
K
,
V
],
vector
[
item_type
].
iterator
,
key_type
](
self
)
view_dict_values
[
cypdict
[
K
,
V
],
vector
[
item_type
].
iterator
,
value_type
]
values
(
self
):
view_dict_values
[
cypdict
[
K
,
V
],
vector
[
item_type
].
iterator
,
value_type
]
values
(
self
)
const
:
return
view_dict_values
[
cypdict
[
K
,
V
],
vector
[
item_type
].
iterator
,
value_type
](
self
)
return
view_dict_values
[
cypdict
[
K
,
V
],
vector
[
item_type
].
iterator
,
value_type
](
self
)
view_dict_items
[
cypdict
[
K
,
V
],
vector
[
item_type
].
iterator
,
item_type
]
items
(
self
):
view_dict_items
[
cypdict
[
K
,
V
],
vector
[
item_type
].
iterator
,
item_type
]
items
(
self
)
const
:
return
view_dict_items
[
cypdict
[
K
,
V
],
vector
[
item_type
].
iterator
,
item_type
](
self
)
return
view_dict_items
[
cypdict
[
K
,
V
],
vector
[
item_type
].
iterator
,
item_type
](
self
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment