| 6cfba16c25d04ae13c5b06d53bb495571bd83e95 |
12-Sep-2012 |
Elliott Hughes <enh@google.com> |
am 40ad466e: am 4c686dad: am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>."
* commit '40ad466e4e9669b43b72c4736ec9e8e27ddb5cfc':
Include <sys/socket.h> instead of <linux/socket.h>.
|
| 778c859bfdcce2fa6658c09e65656afc34d3b4e0 |
12-Sep-2012 |
Elliott Hughes <enh@google.com> |
Include <sys/socket.h> instead of <linux/socket.h>.
In newer kernels, <linux/socket.h> no longer contains some of the stuff you're
using.
Change-Id: I92c6847d73c20fb49d0db15c1cc15aa07fb5d44d
ommon_clock_service.h
ommon_time_config_service.h
ommon_time_server.h
|
| 7a947c49782165d7320a93d8685d99730286f9a7 |
22-Aug-2012 |
John Grossman <johngro@google.com> |
common_time: Move default election config to bcast.
Change the default master election and arbiration to use broadcast
instead of multicast. As nice as the idea of using multicast for
discovery is, in the end it had just proven to be too unreliable in
random people's home infrastructures as well as the more complicated
managed infrastructures we are using internally. Multicast still
works, and the service can still be configured to use it, but for now
we are switching to broadcast.
Also, add runtime checks to filter out our own broadcast traffic as
there does not seem to be any good sockopt in linux to do this for us
(there is one for multicast, but not broadcast).
Change-Id: I8ada3541cceca2e76c7a0c1a624a72026122c312
ommon_time_server.cpp
|
| f007bd3cf8cacd75287781c1bb37fe4167c79cba |
01-Aug-2012 |
John Grossman <johngro@google.com> |
common_time: Fix a small build warning.
(cherry picked from commit f19c7a64a5c35dcc684708fc56e5cbd2a4997c4b)
> common_time: Fix a small build warning.
>
> Change-Id: I9a3652c8191ec86089117dbe6c16ff8612a911a3
> Signed-off-by: John Grossman <johngro@google.com>
Change-Id: I9d04f457d8a7f45249c86c4ad69bfd71fdd77245
Signed-off-by: John Grossman <johngro@google.com>
ommon_time_server.cpp
|
| 79489c4c65d3c8e628991995b4a18f2a81802ee6 |
20-Jul-2012 |
John Grossman <johngro@google.com> |
common_time: Turn the logging up to 11
Hand merge from ics-aah
> DO NOT MERGE: common_time: Turn the logging up to 11
>
> Actually, despite the CL title, no addition log messages are being
> sent to logcat. Generally speaking, the common_time service tends to
> be rather quiet from a log perspective. Events related to master
> election and arbitration as well as state changes tend to be
> infrequent in steady state operation. Unfortunately, if there is a
> problem with the system, it frequently gets pushed out of logcat by
> other messages and is missing from the logs when a bugreport is
> finally taken.
>
> This change adds a utility class which can be used to store the last N
> log message in a ring buffer to be dumped later during a dumpsys
> operation. Three internal log buffers were added to the system. One
> to record messages having to do with state transitions. Another was
> added to record traffic relating to master election, and one final
> buffer to record basic data on packets which were received but
> discarded for any reason. During a bugreport, these common_time.clock
> service will be able to dump these messages regardless of the amt of
> other logcat activity, which should assist in debugging long running
> issues.
>
> Change-Id: Ic3bbf7480c8978f9bf82bafaba04cf4586db60cf
> Signed-off-by: John Grossman <johngro@google.com>
Change-Id: If7156d41ce4553d5ba5c3a8e1dd616564a569711
Signed-off-by: John Grossman <johngro@google.com>
lock_recovery.cpp
lock_recovery.h
ommon_time_server.cpp
ommon_time_server.h
ommon_time_server_api.cpp
tils.cpp
tils.h
|
| db63260758ad795d619073e41f273184ab629bbc |
18-Jul-2012 |
Jason Simmons <jsimmons@google.com> |
Set the SO_BROADCAST option if the master election endpoint is the broadcast address
Change-Id: I75b3815be73744b99a4bea52916984de76634e7e
ommon_time_server.cpp
|
| c7f57c6f9289d0e3aaecc0bca4ae7b6eed1c93d7 |
26-Jun-2012 |
John Grossman <johngro@google.com> |
Fix for bug 6691452
Hand merge from ics-aah
> Fix for bug 6691452 : DO NOT MERGE
>
> As it so happens, there seem to be panels out there who disapprove of
> sudden changes in their HDMI clock rate. In particular, Sony LCD
> panels made from around 2010-2011 (including the Sony GTV panel) seem
> to dislike this behavior. When exposed to a large jump in the clock
> rate (say from -100pmm to +100ppm in about 30mSec), they seem to
> panic, blank their audio and video, and then resync. The whole
> panic process takes about 2 seconds.
>
> The HDMI spec says that its clock jitter requirements are defined by
> their differential signalling eye diagram requirements relative to an
> "Ideal Recovery Clock" (see section 4.2.3.1 of the HDMI 1.3a spec).
> Basically, if you pass the eye diagram tests, you pass the clock
> jitter requirements. We have determined in lab that even being
> extremely aggressive in our VCXO rate changes does not come even close
> to violating the HDMI eye diagrams. Its just this era of Sony panels
> which seem to be upset by this behavior.
>
> One way or the other, experiments which the GTV devices have seemed to
> indicate that a full range sweep of the VCXO done in 10mSec steps over
> anything faster than 190mSec can cause trouble. Adding a healthy
> degree of margin to this finding, the fix is to limit the rate of VCXO
> control change such that it never goes at a rate faster than
> FullRange/300mSec.
>
> Change flagged as do not merge due to the code structure changes to master.
> This will need to be merged by hand.
>
> Signed-off-by: John Grossman <johngro@google.com>
> Change-Id: Ibfd361fe1cc2cbd4909489e3317fb12e005c6a75
Change-Id: If62f791c826f1145262a6b546b1dc1f9776c37d8
Signed-off-by: John Grossman <johngro@google.com>
ndroid.mk
lock_recovery.cpp
lock_recovery.h
ommon_time_server.cpp
ommon_time_server.h
tils.cpp
tils.h
|
| 8100960892c89d1c8898fd18fdc4fefca1f3895c |
10-Apr-2012 |
John Grossman <johngro@google.com> |
am e1d6c080: Make common_time more deferential when coming out of networkless mode.
* commit 'e1d6c080f0b1769637d742e51cc22167c7af12bb':
Make common_time more deferential when coming out of networkless mode.
|
| e1d6c080f0b1769637d742e51cc22167c7af12bb |
09-Apr-2012 |
John Grossman <johngro@google.com> |
Make common_time more deferential when coming out of networkless mode.
Addresses issues seen in bug 6260139.
This is a really tough bug to repro, but there is no doubt that it is
happening occasionally on our super huge A@H subnet. I have collected
data all weekend; the failure did not occur, but I got enough to have
a theoretical sequence of events which could trigger this behavior.
The sequence goes like this.
1) A network is running and happy with a timeline master M,
maintaining timeline X.
2) Device B boots, but its network is taking a long time to come up.
After 60 seconds of waiting for the network to come up, device B
goes into networkless master mode and creates timeline Y.
3) Device B's network comes up. It immediately sends a master
announcement saying that it is the current low-priority master of
timeline Y (its low priority because it has never had any real
clients)
4) Master M ignores B because B is low priority.
5) Device C boots and sends out a who is master request. It is a race
between M and A to see who will respond first. In this case, A
responds first.
6) C sends B a request which B receives. B now has its first client
and is now high priority. In this scenario, B matches M in all
aspects of the priority ranking function, including winning the tie
breaker (larger MAC address when interpreted as a 48 bit integer)
7) M sends its master announcement; it is ignored by B since B
now wins in the ranking function vs M.
8) Finally, B sends its next master announcement. M sees it, realizes
that there is a higher priority master out there (looks like a
bridged network scenario to M). M gives up master status along
with timeline X. The clients of M become clients of B and move
from timeline X to timeline Y (something which should only be
needed during an actual network bridging event)
This change has a few different things meant to severely minimize the
chance that this can happen.
First, and the most important change, is that networkless masters do
not immediately announce themselves as masters on the network they are
joining. Instead, they transition into Ronin to discover any
pre-existing masters on the network. If there are no masters out
there, the device will simply transition back to master and continue
to maintain the timeline it had in networkless mode. In the scenario
above, however, B should discover M and become its client, preserving
the established timeline X.
Second, any time a device experienced an interface reconfiguration
(including coming out of networkless mode), it clears its high
priority bit. This is a good thing. The bit used to get set again
any time...
1) The device is master and receives a client request.
2) The device becomes a client of another master on the network.
3) The device becomes a master.
Number 3 in this list is a mistake. The high priority bit should only
be set for devices during master election which have been
participating in a timeline which has been used by multiple devices.
We know that this is the case when we are master and receive a
request. We also know that this is the case when we hear from a
master and decide to become its client. Simply becoming a master
should not make us high priority. This behavior has been removed.
Third, timeouts have been adjusted just for some extra "stickyness"
when it comes to master status. Clients now say in the Ronin state
for up to 10 seconds looking for a master sending up to 20 discovery
requests, instead of only 3 seconds (sending 6 requests). The
wait-for-election timeout has been adjusted up from 5 seconds to 12.5
seconds to track the longer election cycle as well. Also, while in
steady-state, clients will now wait until 10 packets (10 seconds)
have not been answered by its master before giving up and dropping
into Ronin.
Change-Id: I438b39f31265e34d6719d4adfa9e8b95a2afc188
Signed-off-by: John Grossman <johngro@google.com>
ommon_time_server.cpp
|
| 11bc45fcba96cf7ccc5f67b3c47088c2c89c8e7a |
14-Feb-2012 |
Kent Ryhorchuk <kryhorchuk@google.com> |
New clock sync control loop.
Change clock sync control to velicity form PI loop. Tuned for office LAN and
WiFi conditions, will probably perform better in clean environments.
Improve packet filtering to prevent clock sync on bad rtt.
Changed diag interface to take rtt times, P, I, D are no longer supported.
Change-Id: Iad2b26eb44cd222ec5f219b49669e2d6baec9d1c
ndroid.mk
lock_recovery.cpp
lock_recovery.h
ommon_time_server.cpp
ommon_time_server.h
iag_thread.cpp
iag_thread.h
|
| ba2ff9c2236d017e16dd948574966d045c1711c8 |
17-Feb-2012 |
John Grossman <johngro@google.com> |
Really fix the build this time.
Cannot try to include <limits> on git_master-without-vendor. The file
just does not exist.
Change-Id: Iae383465c59d1cf59a9ba3f729f8f074971f7ce4
ommon_time_server.cpp
|
| b8525e9a76d63a2dc26c87577940a058e70e3dd5 |
16-Feb-2012 |
John Grossman <johngro@google.com> |
Fix the build.
Looks like not all flavors of the android build include support for
std::numeric_limits. Fix the build by using a simple macro for now.
A more elegant solution can be searched for once the build is green
again.
Change-Id: I18329cd0d26ca69de6a52df9a1c6eeb3ba063b48
ommon_time_server.cpp
|
| 6c929510474caa14dc9d56826b2c65552861d6b3 |
15-Aug-2011 |
Mike J. Chen <mjchen@google.com> |
Upintegrate the common_time service from ics-aah.
Move the common_time service developed in the ics-aah branch back into
master.
The common_time service is a small service build to synchronize an
arbitrary timeline amongst peers on a local sub-net. While running
and configured, the service will elect a master from the set of
available devices within the subnet, define a relationship between the
common_time timeline the local time timeline (provided by the local
time HAL), and then attempt to maintain synchronization between common
and local time by controlling the frequency of the local time clock
via the HAL, or by disciplining local time in the digital domain if
the local time HAL implementation does not support HW slewing.
On its own, the native common time service will do nothing until it is
configured. The CommonTimeManagementService (running out of the
system server process) is responsible for implementing policy
regarding configuration and operation of the common_time service and
will be added in a subsequent CL.
Change-Id: I71292f9b9b1797665865689c4572c9d3a0552f64
Signed-off-by: John Grossman <johngro@google.com>
ndroid.mk
lock_recovery.cpp
lock_recovery.h
ommon_clock.cpp
ommon_clock.h
ommon_clock_service.cpp
ommon_clock_service.h
ommon_time_config_service.cpp
ommon_time_config_service.h
ommon_time_server.cpp
ommon_time_server.h
ommon_time_server_api.cpp
ommon_time_server_packets.cpp
ommon_time_server_packets.h
iag_thread.cpp
iag_thread.h
ain.cpp
|
| 17fe2476167ae741de44a2f0c0f5cb43fafe5584 |
14-Feb-2012 |
Kent Ryhorchuk <kryhorchuk@google.com> |
New clock sync control loop.
Change clock sync control to velicity form PI loop. Tuned for office LAN and
WiFi conditions, will probably perform better in clean environments.
Improve packet filtering to prevent clock sync on bad rtt.
Changed diag interface to take rtt times, P, I, D are no longer supported.
Change-Id: Id7758262c5f987f07d7091aba6c0874d7c19f387
ndroid.mk
lock_recovery.cpp
lock_recovery.h
ommon_time_server.cpp
ommon_time_server.h
iag_thread.cpp
iag_thread.h
|
| 583a03ac046901f90b6292a9e143dda6a7a053d6 |
12-Jan-2012 |
John Grossman <johngro@google.com> |
Fix device ID selection in the common time service.
Fix an issue I discovered while back-porting this code to master. The
common time service was using the MAC address of "eth0" (hardcoded) as
its device ID instead of fetching it from the interface it is
currently bound to. On phones (or any other device with no eth0) this
causes time service to never be able to fetch a device ID as it
should.
Change-Id: Icf8a2006924088efc86065927a648f7f53638657
ommon_time_server.cpp
|
| 354edbc80ec3f12539e08b32058702b7fe3a27cd |
20-Jan-2012 |
John Grossman <johngro@google.com> |
Implement new common_time service functionality.
Major re-factor of the common_time (formally aah_timesrv) service in
preparation for up-integration into Android master. This work
includes bug fixes, new features, and general code cleanup. High
points are listed below.
+ CommonClock interface has been enhanced to allow querying of many
more low level synchronization details; mostly for debugging, but in
theory useful to an application as well.
+ CommonTimeConfig interface has been implemented. This allows a
management process to configure a number of different parameters
(many of them new) to control the behavior of the common_time
service. Most importantly, the time service can be bound to a
specific network interface and should only operate on that interface
an no others.
+ Enhance log messages to be more useful in determining what the time
service state machine is doing and why.
+ Enhance information provided by dumpsys to provide many more details
about the quality of time sync and the network conditions which gave
rise to the current quality conditions.
Features, features, features....
+ Add a feature which lets the high level choose a different master
election endpoint so that multiple time synchronization domains can
co-exist on the same subnet (mostly to support a potential use case
of multiple home domains in a multiple dwelling environment like a
hotel, dormitory or apartment complex).
+ Add a feature which lets the high level assign a 64-bit group ID
which allows partitioning of time synchronization domains even when
the master election endpoint is shared (as it might be if broadcast
is being used instead of multicast)
+ Add an auto-disable feature which lets the time service drop into
network-less mode when there are no active clients of the
common_time service in the device. Mostly for phones, this allows
phones to not consume network/battery resources when they don't need
to maintain common time.
+ Add a feature which lets the high level choose the priority of the
common_time service in the master election protocol. This allows
high level decisions about things like mobile vs non-mobile, wired
ethernet vs WiFi to affect who ends up with the job of master on a
given network. Priority overrides at the low level also allow
clients coming in from network-less mode to lower their effective
priority as they join a new network so as to not disrupt any
stable long-running timeline which may already be active on the
network.
+ Add the ability to control some of the core parameters of the time
sync service which effect network load (like the sync polling
interval and the master announce interval)
Change-Id: I71af15a83cfa5ef0417b406928967fb9e02f55c6
ndroid.mk
lock_recovery.cpp
lock_recovery.h
ommon_clock.cpp
ommon_clock.h
ommon_clock_service.cpp
ommon_clock_service.h
ommon_time_config_service.cpp
ommon_time_config_service.h
ommon_time_server.cpp
ommon_time_server.h
ommon_time_server_api.cpp
ommon_time_server_packets.cpp
ommon_time_server_packets.h
ain.cpp
|
| 9387f4f80081128601da936fe5e6006809ff479c |
19-Jan-2012 |
John Grossman <johngro@google.com> |
Add native common time config service.
Define a native service interface for configuring and controlling the
common time service. Implement the native marshallers and stub the
implementation of the new interface.
Change-Id: Ia6a6a20ef3d221e8829c55be1dd5f98ed996c610
ndroid.mk
ommon_time_config_service.cpp
ommon_time_config_service.h
ommon_time_server.cpp
|
| 2627965d612c3b30b59c64631d40c8a810dabba4 |
18-Jan-2012 |
John Grossman <johngro@google.com> |
Add marshallers for the new common clock methods.
Add marshallers and stub implementations for new methods in the common
clock interface to support new functionality being added in the
process of integrating the common time service more closely with the
Java level of Android.
Change-Id: Iac2d3fb405d1b64cea1d8e13f988160afb76a06d
ommon_clock_service.cpp
ommon_clock_service.h
ommon_time_server.cpp
|
| 7f1d9e1c5301e58891db62061cee7d413542be81 |
17-Jan-2012 |
John Grossman <johngro@google.com> |
Move the definition of time server state.
Move the State enum up to the ICommonClock interface so it can be
returned for status/debugging up to clients.
Change-Id: I81fef5b96ffc69a4f2e9801b3744feea099ccd47
ommon_time_server.cpp
|
| 232f869c99b8b33276ddad8054fc3e89e44852e5 |
18-Jan-2012 |
John Grossman <johngro@google.com> |
De-AAH-ify the common time service.
Bulk name change to remove references to Android@Home from the common time
service in preparation for cleanup and up-integration into the master
branch. Basically, aah_timesrv is now common_time.
Change-Id: I3d3db212f96e8ba171aa36b9c58e27e4a336cb0a
ndroid.mk
lock_recovery.cpp
lock_recovery.h
ommon_clock.cpp
ommon_clock.h
ommon_clock_service.cpp
ommon_clock_service.h
ommon_time_server.cpp
iag_thread.cpp
iag_thread.h
|