Thanks to visit codestin.com
Credit goes to github.com

Skip to content

use class level rather than instance level caching of fontd #798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 13, 2012
Merged

use class level rather than instance level caching of fontd #798

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa4bb8a
use class level rather than instance level caching of fonts to delay …
jdh2358 Mar 24, 2012
cc628ce
slurp down a class level cache into the instance level at the start o…
jdh2358 Mar 24, 2012
a00e510
use threading Lock to protect class level font cache
jdh2358 Mar 24, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 32 additions & 8 deletions lib/matplotlib/backends/backend_agg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* integrate screen dpi w/ ppi and text
"""
from __future__ import division

import threading
import numpy as np

from matplotlib import verbose, rcParams
Expand All @@ -46,11 +46,24 @@ class RendererAgg(RendererBase):
context instance that controls the colors/styles
"""
debug=1

# we want to cache the fonts at the class level so that when
# multiple figures are created we can reuse them. This helps with
# a bug on windows where the creation of too many figures leads to
# too many open file handles. However, storing them at the class
# level is not thread safe. The solution here is to let the
# FigureCanvas acquire a lock on the fontd at the start of the
# draw, and release it when it is done. This allows multiple
# renderers to share the cached fonts, but only one figure can
# draw at at time and so the font cache is used by only one
# renderer at a time

lock = threading.Lock()
_fontd = maxdict(50)
def __init__(self, width, height, dpi):
if __debug__: verbose.report('RendererAgg.__init__', 'debug-annoying')
RendererBase.__init__(self)
self.texd = maxdict(50) # a cache of tex image rasters
self._fontd = maxdict(50)

self.dpi = dpi
self.width = width
Expand All @@ -69,6 +82,7 @@ def __init__(self, width, height, dpi):
if __debug__: verbose.report('RendererAgg.__init__ done',
'debug-annoying')


def _get_hinting_flag(self):
if rcParams['text.hinting']:
return LOAD_FORCE_AUTOHINT
Expand All @@ -82,7 +96,7 @@ def draw_markers(self, *kl, **kw):

def draw_path_collection(self, *kl, **kw):
return self._renderer.draw_path_collection(*kl, **kw)

def _update_methods(self):
#self.draw_path = self._renderer.draw_path # see below
#self.draw_markers = self._renderer.draw_markers
Expand Down Expand Up @@ -215,15 +229,16 @@ def _get_agg_font(self, prop):
'debug-annoying')

key = hash(prop)
font = self._fontd.get(key)
font = RendererAgg._fontd.get(key)

if font is None:
fname = findfont(prop)
font = self._fontd.get(fname)
font = RendererAgg._fontd.get(fname)
if font is None:
font = FT2Font(str(fname))
self._fontd[fname] = font
self._fontd[key] = font
RendererAgg._fontd[fname] = font

RendererAgg._fontd[key] = font

font.clear()
size = prop.get_size_in_points()
Expand Down Expand Up @@ -358,6 +373,7 @@ def post_processing(image, dpi):
image)



def new_figure_manager(num, *args, **kwargs):
"""
Create a new figure manager instance
Expand Down Expand Up @@ -398,7 +414,15 @@ def draw(self):
if __debug__: verbose.report('FigureCanvasAgg.draw', 'debug-annoying')

self.renderer = self.get_renderer()
self.figure.draw(self.renderer)
# acquire a lock on the shared font cache
RendererAgg.lock.acquire()

try:
self.figure.draw(self.renderer)
finally:
RendererAgg.lock.release()



def get_renderer(self):
l, b, w, h = self.figure.bbox.bounds
Expand Down