1
=== modified file 'src/server/frontend/buffer_stream_tracker.h'
2
--- src/server/frontend/buffer_stream_tracker.h	2015-04-25 10:45:30 +0000
3
+++ src/server/frontend/buffer_stream_tracker.h	2015-04-27 20:04:19 +0000
4
@@ -45,7 +45,7 @@
5
45
    /* track a buffer as associated with a buffer stream
45
    /* track a buffer as associated with a buffer stream
6
46
     * \warning the buffer must correspond to a single buffer stream id
46
     * \warning the buffer must correspond to a single buffer stream id
7
47
     * \param buffer_stream_id id that the the buffer is associated with
47
     * \param buffer_stream_id id that the the buffer is associated with
9
48
     * \param buffer     buffer to be tracked (TODO: should be a shared_ptr)
48
     * \param buffer     buffer to be tracked
10
49
     * \returns          true if the buffer is already tracked
49
     * \returns          true if the buffer is already tracked
11
50
     *                   false if the buffer is not tracked
50
     *                   false if the buffer is not tracked
12
51
     */
51
     */
13
@@ -53,17 +53,16 @@
14
53
    /* removes the buffer stream id from all tracking */
53
    /* removes the buffer stream id from all tracking */
15
54
    void remove_buffer_stream(BufferStreamId);
54
    void remove_buffer_stream(BufferStreamId);
16
55
55
19
56
    /* Access the buffer resource that the id corresponds to.
56
    /* Access the buffer resource that the id corresponds to. */
18
57
       TODO: should really be a weak or shared ptr */
20
58
    graphics::Buffer* buffer_from(graphics::BufferID) const;
57
    graphics::Buffer* buffer_from(graphics::BufferID) const;
21
59
58
22
60
private:
59
private:
23
61
    size_t const client_cache_size;
60
    size_t const client_cache_size;
24
62
    std::unordered_map<BufferStreamId, std::shared_ptr<ClientBufferTracker>> client_buffer_tracker;
61
    std::unordered_map<BufferStreamId, std::shared_ptr<ClientBufferTracker>> client_buffer_tracker;
25
63
62
26
64
//TODO: deprecate below this line once exchange_buffer is the normal way to request a new buffer
27
65
public:
63
public:
28
66
    /* accesses the last buffer given to track_buffer() for the given BufferStreamId */
64
    /* accesses the last buffer given to track_buffer() for the given BufferStreamId */
29
65
    //TODO: once next_buffer rpc call is fully deprecated, this can be removed.
30
67
    graphics::Buffer* last_buffer(BufferStreamId) const;
66
    graphics::Buffer* last_buffer(BufferStreamId) const;
31
68
private:
67
private:
32
69
    mutable std::mutex mutex;
68
    mutable std::mutex mutex;
Status:	Merged
Approved by:	Daniel van Vugt on 2015-05-01
Approved revision:	no longer in the source branch.
Merged at revision:	2535
Proposed branch:	lp:~kdub/mir/update-bufferstream-tracker-todos
Merge into:	lp:mir
Diff against target:	32 lines (+3/-4) 1 file modified src/server/frontend/buffer_stream_tracker.h (+3/-4)
To merge this branch:	bzr merge lp:~kdub/mir/update-bufferstream-tracker-todos
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Daniel van Vugt			Abstain on 2015-05-01
Alexandros Frantzis (community)			Approve on 2015-04-30
Alan Griffiths			Approve on 2015-04-28
PS Jenkins bot (community)	continuous-integration		Approve on 2015-04-27
Robert Carr (community)		2015-04-27	Approve on 2015-04-27
Review via email: mp+257577@code.launchpad.net