mojo/edk/system/simple_dispatcher.cc - Issue 2078043002: Make Dispatcher::AddAwakable(), etc. always set *signals_state (if signals_state is non-null).

Side by Side Diff: mojo/edk/system/simple_dispatcher.cc

Issue 2078043002: Make Dispatcher::AddAwakable(), etc. always set *signals_state (if signals_state is non-null). (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "mojo/edk/system/simple_dispatcher.h"	5 #include "mojo/edk/system/simple_dispatcher.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8	8

9 namespace mojo {	9 namespace mojo {

10 namespace system {	10 namespace system {

(...skipping 16 matching lines...) Expand all Loading...
27	27

28 MojoResult SimpleDispatcher::AddAwakableImplNoLock(	28 MojoResult SimpleDispatcher::AddAwakableImplNoLock(

29 Awakable* awakable,	29 Awakable* awakable,

30 MojoHandleSignals signals,	30 MojoHandleSignals signals,

31 bool force,	31 bool force,

32 uint64_t context,	32 uint64_t context,

33 HandleSignalsState* signals_state) {	33 HandleSignalsState* signals_state) {

34 mutex().AssertHeld();	34 mutex().AssertHeld();

35	35

36 HandleSignalsState state(GetHandleSignalsStateImplNoLock());	36 HandleSignalsState state(GetHandleSignalsStateImplNoLock());

	37 if (signals_state)

	38 *signals_state = state;

37 if (state.satisfies(signals)) {	39 if (state.satisfies(signals)) {

38 if (force)	40 if (force)

39 awakable_list_.Add(awakable, signals, context);	41 awakable_list_.Add(awakable, signals, context);

40 if (signals_state)

41 *signals_state = state;

42 return MOJO_RESULT_ALREADY_EXISTS;	42 return MOJO_RESULT_ALREADY_EXISTS;

43 }	43 }

44 if (!state.can_satisfy(signals)) {	44 if (!state.can_satisfy(signals))

45 if (signals_state)

46 *signals_state = state;

47 return MOJO_RESULT_FAILED_PRECONDITION;	45 return MOJO_RESULT_FAILED_PRECONDITION;

48 }

49	46

50 awakable_list_.Add(awakable, signals, context);	47 awakable_list_.Add(awakable, signals, context);

51 return MOJO_RESULT_OK;	48 return MOJO_RESULT_OK;

52 }	49 }

53	50

54 void SimpleDispatcher::RemoveAwakableImplNoLock(	51 void SimpleDispatcher::RemoveAwakableImplNoLock(

55 Awakable* awakable,	52 Awakable* awakable,

56 HandleSignalsState* signals_state) {	53 HandleSignalsState* signals_state) {

57 mutex().AssertHeld();	54 mutex().AssertHeld();

58 awakable_list_.Remove(awakable);	55 awakable_list_.Remove(awakable);

59 if (signals_state)	56 if (signals_state)

60 *signals_state = GetHandleSignalsStateImplNoLock();	57 *signals_state = GetHandleSignalsStateImplNoLock();

61 }	58 }

62	59

63 void SimpleDispatcher::RemoveAwakableWithContextImplNoLock(	60 void SimpleDispatcher::RemoveAwakableWithContextImplNoLock(

64 Awakable* awakable,	61 Awakable* awakable,

65 uint64_t context,	62 uint64_t context,

66 HandleSignalsState* signals_state) {	63 HandleSignalsState* signals_state) {

67 mutex().AssertHeld();	64 mutex().AssertHeld();

68 awakable_list_.RemoveWithContext(awakable, context);	65 awakable_list_.RemoveWithContext(awakable, context);

69 if (signals_state)	66 if (signals_state)

70 *signals_state = GetHandleSignalsStateImplNoLock();	67 *signals_state = GetHandleSignalsStateImplNoLock();

71 }	68 }

72	69

73 } // namespace system	70 } // namespace system

74 } // namespace mojo	71 } // namespace mojo

OLD	NEW

« no previous file with comments | « mojo/edk/system/local_message_pipe_endpoint.cc ('k') | no next file » | no next file with comments »