2010-08-14 19:59:25 +02:00
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
2010-01-23 01:52:57 +01:00
2010-02-03 13:03:47 +01:00
/***
This file is part of systemd .
Copyright 2010 Lennart Poettering
systemd is free software ; you can redistribute it and / or modify it
2012-04-12 00:20:58 +02:00
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation ; either version 2.1 of the License , or
2010-02-03 13:03:47 +01:00
( at your option ) any later version .
systemd is distributed in the hope that it will be useful , but
WITHOUT ANY WARRANTY ; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE . See the GNU
2012-04-12 00:20:58 +02:00
Lesser General Public License for more details .
2010-02-03 13:03:47 +01:00
2012-04-12 00:20:58 +02:00
You should have received a copy of the GNU Lesser General Public License
2010-02-03 13:03:47 +01:00
along with systemd ; If not , see < http : //www.gnu.org/licenses/>.
* * */
2010-01-28 02:44:47 +01:00
# include <errno.h>
2010-01-26 21:39:06 +01:00
# include "unit.h"
2010-05-24 01:45:54 +02:00
# include "unit-name.h"
2010-01-23 01:52:57 +01:00
# include "timer.h"
2010-05-24 01:45:54 +02:00
# include "dbus-timer.h"
2010-07-03 19:48:33 +02:00
# include "special.h"
2013-11-19 21:12:59 +01:00
# include "bus-util.h"
2010-05-24 01:45:54 +02:00
static const UnitActiveState state_translation_table [ _TIMER_STATE_MAX ] = {
[ TIMER_DEAD ] = UNIT_INACTIVE ,
[ TIMER_WAITING ] = UNIT_ACTIVE ,
[ TIMER_RUNNING ] = UNIT_ACTIVE ,
[ TIMER_ELAPSED ] = UNIT_ACTIVE ,
2010-08-31 00:23:34 +02:00
[ TIMER_FAILED ] = UNIT_FAILED
2010-05-24 01:45:54 +02:00
} ;
2013-11-19 21:12:59 +01:00
static int timer_dispatch ( sd_event_source * s , uint64_t usec , void * userdata ) ;
2010-05-24 01:45:54 +02:00
static void timer_init ( Unit * u ) {
Timer * t = TIMER ( u ) ;
assert ( u ) ;
2012-01-15 12:04:08 +01:00
assert ( u - > load_state = = UNIT_STUB ) ;
2010-05-24 01:45:54 +02:00
2014-07-29 12:23:31 +02:00
t - > next_elapse_monotonic_or_boottime = USEC_INFINITY ;
t - > next_elapse_realtime = USEC_INFINITY ;
2014-03-24 16:22:34 +01:00
t - > accuracy_usec = u - > manager - > default_timer_accuracy_usec ;
2010-05-24 01:45:54 +02:00
}
2010-01-23 01:52:57 +01:00
2013-01-17 02:27:06 +01:00
void timer_free_values ( Timer * t ) {
2010-05-24 01:45:54 +02:00
TimerValue * v ;
assert ( t ) ;
while ( ( v = t - > values ) ) {
2013-10-14 06:10:14 +02:00
LIST_REMOVE ( value , t - > values , v ) ;
2012-11-23 21:37:58 +01:00
if ( v - > calendar_spec )
calendar_spec_free ( v - > calendar_spec ) ;
2010-05-24 01:45:54 +02:00
free ( v ) ;
}
2013-01-17 02:27:06 +01:00
}
static void timer_done ( Unit * u ) {
Timer * t = TIMER ( u ) ;
assert ( t ) ;
timer_free_values ( t ) ;
2010-05-24 01:45:54 +02:00
2013-11-19 21:12:59 +01:00
t - > monotonic_event_source = sd_event_source_unref ( t - > monotonic_event_source ) ;
t - > realtime_event_source = sd_event_source_unref ( t - > realtime_event_source ) ;
2014-03-21 03:25:28 +01:00
free ( t - > stamp_path ) ;
2010-05-24 01:45:54 +02:00
}
static int timer_verify ( Timer * t ) {
assert ( t ) ;
2012-01-15 12:25:20 +01:00
if ( UNIT ( t ) - > load_state ! = UNIT_LOADED )
2010-05-24 01:45:54 +02:00
return 0 ;
if ( ! t - > values ) {
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
log_unit_error ( UNIT ( t ) , " Timer unit lacks value setting. Refusing. " ) ;
2010-05-24 01:45:54 +02:00
return - EINVAL ;
}
return 0 ;
}
2010-07-16 18:57:21 +02:00
static int timer_add_default_dependencies ( Timer * t ) {
int r ;
2014-08-04 22:15:52 +02:00
TimerValue * v ;
2010-07-16 18:57:21 +02:00
assert ( t ) ;
2013-03-25 21:20:08 +01:00
r = unit_add_dependency_by_name ( UNIT ( t ) , UNIT_BEFORE , SPECIAL_TIMERS_TARGET , NULL , true ) ;
if ( r < 0 )
return r ;
2010-10-29 06:04:03 +02:00
2015-05-11 22:51:49 +02:00
if ( UNIT ( t ) - > manager - > running_as = = MANAGER_SYSTEM ) {
2012-11-23 21:37:58 +01:00
r = unit_add_two_dependencies_by_name ( UNIT ( t ) , UNIT_AFTER , UNIT_REQUIRES , SPECIAL_SYSINIT_TARGET , NULL , true ) ;
if ( r < 0 )
2010-07-16 18:57:21 +02:00
return r ;
2014-08-04 22:15:52 +02:00
LIST_FOREACH ( value , v , t - > values ) {
if ( v - > base = = TIMER_CALENDAR ) {
r = unit_add_dependency_by_name ( UNIT ( t ) , UNIT_AFTER , SPECIAL_TIME_SYNC_TARGET , NULL , true ) ;
if ( r < 0 )
return r ;
break ;
}
}
2010-10-29 06:04:03 +02:00
}
2010-07-16 18:57:21 +02:00
2010-10-29 01:15:18 +02:00
return unit_add_two_dependencies_by_name ( UNIT ( t ) , UNIT_BEFORE , UNIT_CONFLICTS , SPECIAL_SHUTDOWN_TARGET , NULL , true ) ;
2010-07-16 18:57:21 +02:00
}
2014-03-21 03:25:28 +01:00
static int timer_setup_persistent ( Timer * t ) {
int r ;
assert ( t ) ;
if ( ! t - > persistent )
return 0 ;
2015-05-11 22:51:49 +02:00
if ( UNIT ( t ) - > manager - > running_as = = MANAGER_SYSTEM ) {
2014-03-21 03:25:28 +01:00
r = unit_require_mounts_for ( UNIT ( t ) , " /var/lib/systemd/timers " ) ;
if ( r < 0 )
return r ;
t - > stamp_path = strappend ( " /var/lib/systemd/timers/stamp- " , UNIT ( t ) - > id ) ;
} else {
const char * e ;
e = getenv ( " XDG_DATA_HOME " ) ;
if ( e )
2014-06-26 10:16:27 +02:00
t - > stamp_path = strjoin ( e , " /systemd/timers/stamp- " , UNIT ( t ) - > id , NULL ) ;
2014-03-21 03:25:28 +01:00
else {
_cleanup_free_ char * h = NULL ;
r = get_home_dir ( & h ) ;
2014-11-28 18:23:20 +01:00
if ( r < 0 )
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
return log_unit_error_errno ( UNIT ( t ) , r , " Failed to determine home directory: %m " ) ;
2014-03-21 03:25:28 +01:00
t - > stamp_path = strjoin ( h , " /.local/share/systemd/timers/stamp- " , UNIT ( t ) - > id , NULL ) ;
}
}
if ( ! t - > stamp_path )
return log_oom ( ) ;
return 0 ;
}
2010-05-24 01:45:54 +02:00
static int timer_load ( Unit * u ) {
Timer * t = TIMER ( u ) ;
int r ;
assert ( u ) ;
2012-01-15 12:04:08 +01:00
assert ( u - > load_state = = UNIT_STUB ) ;
2010-05-24 01:45:54 +02:00
2012-11-23 21:37:58 +01:00
r = unit_load_fragment_and_dropin ( u ) ;
if ( r < 0 )
2010-05-24 01:45:54 +02:00
return r ;
2012-01-15 12:04:08 +01:00
if ( u - > load_state = = UNIT_LOADED ) {
2010-05-24 01:45:54 +02:00
2013-04-23 20:53:16 +02:00
if ( set_isempty ( u - > dependencies [ UNIT_TRIGGERS ] ) ) {
2012-01-06 23:08:54 +01:00
Unit * x ;
r = unit_load_related_unit ( u , " .service " , & x ) ;
if ( r < 0 )
2010-05-24 01:45:54 +02:00
return r ;
2013-04-23 20:53:16 +02:00
r = unit_add_two_dependencies ( u , UNIT_BEFORE , UNIT_TRIGGERS , x , true ) ;
if ( r < 0 )
return r ;
2012-01-06 23:08:54 +01:00
}
2014-03-21 03:25:28 +01:00
r = timer_setup_persistent ( t ) ;
if ( r < 0 )
return r ;
if ( u - > default_dependencies ) {
2012-11-23 21:37:58 +01:00
r = timer_add_default_dependencies ( t ) ;
if ( r < 0 )
2010-07-03 19:48:33 +02:00
return r ;
2012-11-23 21:37:58 +01:00
}
2010-05-24 01:45:54 +02:00
}
return timer_verify ( t ) ;
}
static void timer_dump ( Unit * u , FILE * f , const char * prefix ) {
2013-11-21 22:07:51 +01:00
char buf [ FORMAT_TIMESPAN_MAX ] ;
2010-05-24 01:45:54 +02:00
Timer * t = TIMER ( u ) ;
2013-04-23 20:53:16 +02:00
Unit * trigger ;
2010-05-24 01:45:54 +02:00
TimerValue * v ;
2010-01-26 04:18:44 +01:00
2013-04-23 20:53:16 +02:00
trigger = UNIT_TRIGGER ( u ) ;
2010-05-24 01:45:54 +02:00
fprintf ( f ,
" %sTimer State: %s \n "
2012-02-03 04:03:21 +01:00
" %sResult: %s \n "
2013-11-21 22:07:51 +01:00
" %sUnit: %s \n "
2014-03-24 16:09:54 +01:00
" %sPersistent: %s \n "
" %sWakeSystem: %s \n "
2013-11-21 22:07:51 +01:00
" %sAccuracy: %s \n " ,
2010-05-24 01:45:54 +02:00
prefix , timer_state_to_string ( t - > state ) ,
2012-02-03 04:03:21 +01:00
prefix , timer_result_to_string ( t - > result ) ,
2013-11-21 22:07:51 +01:00
prefix , trigger ? trigger - > id : " n/a " ,
2014-03-24 16:09:54 +01:00
prefix , yes_no ( t - > persistent ) ,
prefix , yes_no ( t - > wake_system ) ,
2013-11-21 22:07:51 +01:00
prefix , format_timespan ( buf , sizeof ( buf ) , t - > accuracy_usec , 1 ) ) ;
2010-05-24 01:45:54 +02:00
2012-11-23 21:37:58 +01:00
LIST_FOREACH ( value , v , t - > values ) {
if ( v - > base = = TIMER_CALENDAR ) {
_cleanup_free_ char * p = NULL ;
calendar_spec_to_string ( v - > calendar_spec , & p ) ;
fprintf ( f ,
" %s%s: %s \n " ,
prefix ,
timer_base_to_string ( v - > base ) ,
strna ( p ) ) ;
} else {
char timespan1 [ FORMAT_TIMESPAN_MAX ] ;
fprintf ( f ,
" %s%s: %s \n " ,
prefix ,
timer_base_to_string ( v - > base ) ,
2014-09-29 14:31:14 +02:00
format_timespan ( timespan1 , sizeof ( timespan1 ) , v - > value , 0 ) ) ;
2012-11-23 21:37:58 +01:00
}
}
2010-05-24 01:45:54 +02:00
}
static void timer_set_state ( Timer * t , TimerState state ) {
TimerState old_state ;
2010-01-26 04:18:44 +01:00
assert ( t ) ;
2010-05-24 01:45:54 +02:00
old_state = t - > state ;
t - > state = state ;
2012-11-23 21:37:58 +01:00
if ( state ! = TIMER_WAITING ) {
2013-11-19 21:12:59 +01:00
t - > monotonic_event_source = sd_event_source_unref ( t - > monotonic_event_source ) ;
t - > realtime_event_source = sd_event_source_unref ( t - > realtime_event_source ) ;
2012-11-23 21:37:58 +01:00
}
2010-05-24 01:45:54 +02:00
if ( state ! = old_state )
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
log_unit_debug ( UNIT ( t ) , " Changed %s -> %s " , timer_state_to_string ( old_state ) , timer_state_to_string ( state ) ) ;
2010-05-24 01:45:54 +02:00
2011-01-20 13:17:22 +01:00
unit_notify ( UNIT ( t ) , state_translation_table [ old_state ] , state_translation_table [ state ] , true ) ;
2010-05-24 01:45:54 +02:00
}
static void timer_enter_waiting ( Timer * t , bool initial ) ;
2015-04-24 15:27:19 +02:00
static int timer_coldplug ( Unit * u ) {
2010-05-24 01:45:54 +02:00
Timer * t = TIMER ( u ) ;
assert ( t ) ;
assert ( t - > state = = TIMER_DEAD ) ;
if ( t - > deserialized_state ! = t - > state ) {
2015-04-24 15:27:19 +02:00
if ( t - > deserialized_state = = TIMER_WAITING )
timer_enter_waiting ( t , false ) ;
else
2010-05-24 01:45:54 +02:00
timer_set_state ( t , t - > deserialized_state ) ;
}
return 0 ;
}
2012-02-03 04:03:21 +01:00
static void timer_enter_dead ( Timer * t , TimerResult f ) {
2010-05-24 01:45:54 +02:00
assert ( t ) ;
2012-02-03 04:03:21 +01:00
if ( f ! = TIMER_SUCCESS )
t - > result = f ;
2010-05-24 01:45:54 +02:00
2012-02-03 04:03:21 +01:00
timer_set_state ( t , t - > result ! = TIMER_SUCCESS ? TIMER_FAILED : TIMER_DEAD ) ;
2010-05-24 01:45:54 +02:00
}
2014-03-24 16:09:54 +01:00
static usec_t monotonic_to_boottime ( usec_t t ) {
usec_t a , b ;
if ( t < = 0 )
return 0 ;
a = now ( CLOCK_BOOTTIME ) ;
b = now ( CLOCK_MONOTONIC ) ;
if ( t + a > b )
return t + a - b ;
else
return 0 ;
}
2010-05-24 01:45:54 +02:00
static void timer_enter_waiting ( Timer * t , bool initial ) {
2012-11-23 21:37:58 +01:00
bool found_monotonic = false , found_realtime = false ;
2014-03-24 16:09:54 +01:00
usec_t ts_realtime , ts_monotonic ;
usec_t base = 0 ;
TimerValue * v ;
2010-05-24 01:45:54 +02:00
int r ;
2014-03-24 16:09:54 +01:00
/* If we shall wake the system we use the boottime clock
* rather than the monotonic clock . */
ts_realtime = now ( CLOCK_REALTIME ) ;
ts_monotonic = now ( t - > wake_system ? CLOCK_BOOTTIME : CLOCK_MONOTONIC ) ;
t - > next_elapse_monotonic_or_boottime = t - > next_elapse_realtime = 0 ;
2010-05-24 01:45:54 +02:00
LIST_FOREACH ( value , v , t - > values ) {
if ( v - > disabled )
continue ;
2012-11-23 21:37:58 +01:00
if ( v - > base = = TIMER_CALENDAR ) {
2014-03-21 03:25:28 +01:00
usec_t b ;
/* If we know the last time this was
* triggered , schedule the job based relative
* to that . If we don ' t just start from
* now . */
2012-11-23 21:37:58 +01:00
2014-03-24 16:09:54 +01:00
b = t - > last_trigger . realtime > 0 ? t - > last_trigger . realtime : ts_realtime ;
2014-03-21 03:25:28 +01:00
r = calendar_spec_next_usec ( v - > calendar_spec , b , & v - > next_elapse ) ;
2012-11-23 21:37:58 +01:00
if ( r < 0 )
continue ;
if ( ! found_realtime )
t - > next_elapse_realtime = v - > next_elapse ;
2010-10-27 00:01:12 +02:00
else
2012-11-23 21:37:58 +01:00
t - > next_elapse_realtime = MIN ( t - > next_elapse_realtime , v - > next_elapse ) ;
2010-05-24 01:45:54 +02:00
2012-11-23 21:37:58 +01:00
found_realtime = true ;
2010-05-24 01:45:54 +02:00
2012-11-23 21:37:58 +01:00
} else {
switch ( v - > base ) {
2010-05-24 01:45:54 +02:00
2012-11-23 21:37:58 +01:00
case TIMER_ACTIVE :
if ( state_translation_table [ t - > state ] = = UNIT_ACTIVE )
base = UNIT ( t ) - > inactive_exit_timestamp . monotonic ;
else
2014-03-24 16:09:54 +01:00
base = ts_monotonic ;
2012-11-23 21:37:58 +01:00
break ;
2010-05-24 01:45:54 +02:00
2012-11-23 21:37:58 +01:00
case TIMER_BOOT :
/* CLOCK_MONOTONIC equals the uptime on Linux */
base = 0 ;
break ;
2010-05-24 01:45:54 +02:00
2012-11-23 21:37:58 +01:00
case TIMER_STARTUP :
base = UNIT ( t ) - > manager - > userspace_timestamp . monotonic ;
break ;
2010-05-24 01:45:54 +02:00
2012-11-23 21:37:58 +01:00
case TIMER_UNIT_ACTIVE :
2010-05-24 01:45:54 +02:00
2013-04-23 22:42:31 +02:00
base = UNIT_TRIGGER ( UNIT ( t ) ) - > inactive_exit_timestamp . monotonic ;
if ( base < = 0 )
2014-03-21 03:25:28 +01:00
base = t - > last_trigger . monotonic ;
2013-04-23 22:42:31 +02:00
if ( base < = 0 )
2012-11-23 21:37:58 +01:00
continue ;
2010-05-24 01:45:54 +02:00
2012-11-23 21:37:58 +01:00
break ;
2010-05-24 01:45:54 +02:00
2012-11-23 21:37:58 +01:00
case TIMER_UNIT_INACTIVE :
2010-05-24 01:45:54 +02:00
2013-04-23 22:42:31 +02:00
base = UNIT_TRIGGER ( UNIT ( t ) ) - > inactive_enter_timestamp . monotonic ;
if ( base < = 0 )
2014-03-21 03:25:28 +01:00
base = t - > last_trigger . monotonic ;
2013-04-23 22:42:31 +02:00
if ( base < = 0 )
2012-11-23 21:37:58 +01:00
continue ;
2010-05-24 01:45:54 +02:00
2012-11-23 21:37:58 +01:00
break ;
2010-05-24 01:45:54 +02:00
2012-11-23 21:37:58 +01:00
default :
assert_not_reached ( " Unknown timer base " ) ;
}
2010-05-24 01:45:54 +02:00
2014-03-24 16:09:54 +01:00
if ( t - > wake_system )
base = monotonic_to_boottime ( base ) ;
2012-11-23 21:37:58 +01:00
v - > next_elapse = base + v - > value ;
2014-03-24 16:09:54 +01:00
if ( ! initial & & v - > next_elapse < ts_monotonic & & IN_SET ( v - > base , TIMER_ACTIVE , TIMER_BOOT , TIMER_STARTUP ) ) {
2013-04-23 22:42:31 +02:00
/* This is a one time trigger, disable it now */
2012-11-23 21:37:58 +01:00
v - > disabled = true ;
continue ;
}
if ( ! found_monotonic )
2014-03-24 16:09:54 +01:00
t - > next_elapse_monotonic_or_boottime = v - > next_elapse ;
2012-11-23 21:37:58 +01:00
else
2014-03-24 16:09:54 +01:00
t - > next_elapse_monotonic_or_boottime = MIN ( t - > next_elapse_monotonic_or_boottime , v - > next_elapse ) ;
2012-11-23 21:37:58 +01:00
found_monotonic = true ;
}
2010-05-24 01:45:54 +02:00
}
2012-11-23 21:37:58 +01:00
if ( ! found_monotonic & & ! found_realtime ) {
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
log_unit_debug ( UNIT ( t ) , " Timer is elapsed. " ) ;
2010-05-24 01:45:54 +02:00
timer_set_state ( t , TIMER_ELAPSED ) ;
return ;
}
2012-11-23 21:37:58 +01:00
if ( found_monotonic ) {
char buf [ FORMAT_TIMESPAN_MAX ] ;
2014-03-24 16:09:54 +01:00
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
log_unit_debug ( UNIT ( t ) , " Monotonic timer elapses in %s. " , format_timespan ( buf , sizeof ( buf ) , t - > next_elapse_monotonic_or_boottime > ts_monotonic ? t - > next_elapse_monotonic_or_boottime - ts_monotonic : 0 , 0 ) ) ;
2010-05-24 01:45:54 +02:00
2013-11-19 21:12:59 +01:00
if ( t - > monotonic_event_source ) {
2014-03-24 16:09:54 +01:00
r = sd_event_source_set_time ( t - > monotonic_event_source , t - > next_elapse_monotonic_or_boottime ) ;
2013-11-19 21:12:59 +01:00
if ( r < 0 )
goto fail ;
r = sd_event_source_set_enabled ( t - > monotonic_event_source , SD_EVENT_ONESHOT ) ;
2015-05-13 18:30:14 +02:00
if ( r < 0 )
goto fail ;
} else {
2014-03-24 02:49:09 +01:00
r = sd_event_add_time (
UNIT ( t ) - > manager - > event ,
& t - > monotonic_event_source ,
2014-03-24 16:09:54 +01:00
t - > wake_system ? CLOCK_BOOTTIME_ALARM : CLOCK_MONOTONIC ,
t - > next_elapse_monotonic_or_boottime , t - > accuracy_usec ,
2014-03-24 02:49:09 +01:00
timer_dispatch , t ) ;
2015-05-13 18:30:14 +02:00
if ( r < 0 )
goto fail ;
2013-11-19 21:12:59 +01:00
2015-05-13 18:30:14 +02:00
( void ) sd_event_source_set_description ( t - > monotonic_event_source , " timer-monotonic " ) ;
}
2015-04-29 16:05:32 +02:00
2013-11-19 21:12:59 +01:00
} else if ( t - > monotonic_event_source ) {
2014-03-21 03:25:28 +01:00
r = sd_event_source_set_enabled ( t - > monotonic_event_source , SD_EVENT_OFF ) ;
2013-11-19 21:12:59 +01:00
if ( r < 0 )
goto fail ;
}
2012-11-23 21:37:58 +01:00
if ( found_realtime ) {
char buf [ FORMAT_TIMESTAMP_MAX ] ;
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
log_unit_debug ( UNIT ( t ) , " Realtime timer elapses at %s. " , format_timestamp ( buf , sizeof ( buf ) , t - > next_elapse_realtime ) ) ;
2012-11-23 21:37:58 +01:00
2013-11-19 21:12:59 +01:00
if ( t - > realtime_event_source ) {
r = sd_event_source_set_time ( t - > realtime_event_source , t - > next_elapse_realtime ) ;
if ( r < 0 )
goto fail ;
r = sd_event_source_set_enabled ( t - > realtime_event_source , SD_EVENT_ONESHOT ) ;
2015-05-13 18:30:14 +02:00
if ( r < 0 )
goto fail ;
} else {
2014-03-24 02:49:09 +01:00
r = sd_event_add_time (
UNIT ( t ) - > manager - > event ,
& t - > realtime_event_source ,
2014-03-24 16:09:54 +01:00
t - > wake_system ? CLOCK_REALTIME_ALARM : CLOCK_REALTIME ,
2014-03-24 02:49:09 +01:00
t - > next_elapse_realtime , t - > accuracy_usec ,
timer_dispatch , t ) ;
2015-05-13 18:30:14 +02:00
if ( r < 0 )
goto fail ;
2013-11-19 21:12:59 +01:00
2015-05-13 18:30:14 +02:00
( void ) sd_event_source_set_description ( t - > realtime_event_source , " timer-realtime " ) ;
}
2015-04-29 16:05:32 +02:00
2013-11-19 21:12:59 +01:00
} else if ( t - > realtime_event_source ) {
2014-03-21 03:25:28 +01:00
r = sd_event_source_set_enabled ( t - > realtime_event_source , SD_EVENT_OFF ) ;
2013-11-19 21:12:59 +01:00
if ( r < 0 )
goto fail ;
}
2010-05-24 01:45:54 +02:00
timer_set_state ( t , TIMER_WAITING ) ;
return ;
fail :
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
log_unit_warning_errno ( UNIT ( t ) , r , " Failed to enter waiting state: %m " ) ;
2012-02-03 04:03:21 +01:00
timer_enter_dead ( t , TIMER_FAILURE_RESOURCES ) ;
2010-05-24 01:45:54 +02:00
}
static void timer_enter_running ( Timer * t ) {
2013-11-19 21:12:59 +01:00
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL ;
2010-05-24 01:45:54 +02:00
int r ;
2010-07-08 02:43:18 +02:00
2010-05-24 01:45:54 +02:00
assert ( t ) ;
2010-07-13 00:27:27 +02:00
/* Don't start job if we are supposed to go down */
2013-04-26 02:57:41 +02:00
if ( unit_stop_pending ( UNIT ( t ) ) )
2010-07-13 00:27:27 +02:00
return ;
2013-04-23 20:53:16 +02:00
r = manager_add_job ( UNIT ( t ) - > manager , JOB_START , UNIT_TRIGGER ( UNIT ( t ) ) ,
JOB_REPLACE , true , & error , NULL ) ;
2012-11-23 21:37:58 +01:00
if ( r < 0 )
2010-05-24 01:45:54 +02:00
goto fail ;
2014-03-21 03:25:28 +01:00
dual_timestamp_get ( & t - > last_trigger ) ;
2014-04-02 20:18:44 +02:00
if ( t - > stamp_path )
2014-11-28 20:51:01 +01:00
touch_file ( t - > stamp_path , true , t - > last_trigger . realtime , UID_INVALID , GID_INVALID , 0 ) ;
2013-04-23 22:42:31 +02:00
2010-05-24 01:45:54 +02:00
timer_set_state ( t , TIMER_RUNNING ) ;
return ;
fail :
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
log_unit_warning ( UNIT ( t ) , " Failed to queue unit startup job: %s " , bus_error_message ( & error , r ) ) ;
2012-02-03 04:03:21 +01:00
timer_enter_dead ( t , TIMER_FAILURE_RESOURCES ) ;
2010-05-24 01:45:54 +02:00
}
static int timer_start ( Unit * u ) {
Timer * t = TIMER ( u ) ;
2014-11-06 09:47:02 +01:00
TimerValue * v ;
2010-05-24 01:45:54 +02:00
assert ( t ) ;
2010-08-31 00:23:34 +02:00
assert ( t - > state = = TIMER_DEAD | | t - > state = = TIMER_FAILED ) ;
2010-05-24 05:25:33 +02:00
2013-04-23 20:53:16 +02:00
if ( UNIT_TRIGGER ( u ) - > load_state ! = UNIT_LOADED )
2010-05-24 05:25:33 +02:00
return - ENOENT ;
2010-05-24 01:45:54 +02:00
2014-03-21 03:25:28 +01:00
t - > last_trigger = DUAL_TIMESTAMP_NULL ;
2014-11-06 09:47:02 +01:00
/* Reenable all timers that depend on unit activation time */
LIST_FOREACH ( value , v , t - > values )
if ( v - > base = = TIMER_ACTIVE )
v - > disabled = false ;
2014-03-21 03:25:28 +01:00
if ( t - > stamp_path ) {
struct stat st ;
if ( stat ( t - > stamp_path , & st ) > = 0 )
t - > last_trigger . realtime = timespec_load ( & st . st_atim ) ;
2014-04-02 20:18:44 +02:00
else if ( errno = = ENOENT )
/* The timer has never run before,
* make sure a stamp file exists .
*/
2014-11-28 20:52:55 +01:00
touch_file ( t - > stamp_path , true , USEC_INFINITY , UID_INVALID , GID_INVALID , 0 ) ;
2014-03-21 03:25:28 +01:00
}
2012-02-03 04:03:21 +01:00
t - > result = TIMER_SUCCESS ;
2010-05-24 01:45:54 +02:00
timer_enter_waiting ( t , true ) ;
2015-01-28 15:07:13 +01:00
return 1 ;
2010-05-24 01:45:54 +02:00
}
static int timer_stop ( Unit * u ) {
Timer * t = TIMER ( u ) ;
assert ( t ) ;
assert ( t - > state = = TIMER_WAITING | | t - > state = = TIMER_RUNNING | | t - > state = = TIMER_ELAPSED ) ;
2012-02-03 04:03:21 +01:00
timer_enter_dead ( t , TIMER_SUCCESS ) ;
2015-01-28 15:07:13 +01:00
return 1 ;
2010-05-24 01:45:54 +02:00
}
static int timer_serialize ( Unit * u , FILE * f , FDSet * fds ) {
Timer * t = TIMER ( u ) ;
assert ( u ) ;
assert ( f ) ;
assert ( fds ) ;
unit_serialize_item ( u , f , " state " , timer_state_to_string ( t - > state ) ) ;
2012-02-03 04:03:21 +01:00
unit_serialize_item ( u , f , " result " , timer_result_to_string ( t - > result ) ) ;
2010-05-24 01:45:54 +02:00
2014-03-21 03:25:28 +01:00
if ( t - > last_trigger . realtime > 0 )
unit_serialize_item_format ( u , f , " last-trigger-realtime " , " % " PRIu64 , t - > last_trigger . realtime ) ;
if ( t - > last_trigger . monotonic > 0 )
unit_serialize_item_format ( u , f , " last-trigger-monotonic " , " % " PRIu64 , t - > last_trigger . monotonic ) ;
2010-05-24 01:45:54 +02:00
return 0 ;
}
static int timer_deserialize_item ( Unit * u , const char * key , const char * value , FDSet * fds ) {
Timer * t = TIMER ( u ) ;
2014-03-21 03:25:28 +01:00
int r ;
2010-05-24 01:45:54 +02:00
assert ( u ) ;
assert ( key ) ;
assert ( value ) ;
assert ( fds ) ;
if ( streq ( key , " state " ) ) {
TimerState state ;
2012-11-23 21:37:58 +01:00
state = timer_state_from_string ( value ) ;
if ( state < 0 )
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
log_unit_debug ( u , " Failed to parse state value: %s " , value ) ;
2010-05-24 01:45:54 +02:00
else
t - > deserialized_state = state ;
2012-02-03 04:03:21 +01:00
} else if ( streq ( key , " result " ) ) {
TimerResult f ;
f = timer_result_from_string ( value ) ;
if ( f < 0 )
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
log_unit_debug ( u , " Failed to parse result value: %s " , value ) ;
2012-02-03 04:03:21 +01:00
else if ( f ! = TIMER_SUCCESS )
t - > result = f ;
2014-03-21 03:25:28 +01:00
} else if ( streq ( key , " last-trigger-realtime " ) ) {
r = safe_atou64 ( value , & t - > last_trigger . realtime ) ;
if ( r < 0 )
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
log_unit_debug ( u , " Failed to parse last-trigger-realtime value: %s " , value ) ;
2014-03-21 03:25:28 +01:00
} else if ( streq ( key , " last-trigger-monotonic " ) ) {
r = safe_atou64 ( value , & t - > last_trigger . monotonic ) ;
if ( r < 0 )
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
log_unit_debug ( u , " Failed to parse last-trigger-monotonic value: %s " , value ) ;
2012-02-03 04:03:21 +01:00
2010-05-24 01:45:54 +02:00
} else
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
log_unit_debug ( u , " Unknown serialization key: %s " , key ) ;
2010-05-24 01:45:54 +02:00
return 0 ;
2010-01-26 04:18:44 +01:00
}
2013-05-03 04:51:50 +02:00
_pure_ static UnitActiveState timer_active_state ( Unit * u ) {
2010-05-24 01:45:54 +02:00
assert ( u ) ;
return state_translation_table [ TIMER ( u ) - > state ] ;
}
2013-05-03 04:51:50 +02:00
_pure_ static const char * timer_sub_state_to_string ( Unit * u ) {
2010-05-24 01:45:54 +02:00
assert ( u ) ;
return timer_state_to_string ( TIMER ( u ) - > state ) ;
}
2013-11-19 21:12:59 +01:00
static int timer_dispatch ( sd_event_source * s , uint64_t usec , void * userdata ) {
Timer * t = TIMER ( userdata ) ;
2010-05-24 01:45:54 +02:00
assert ( t ) ;
2010-01-23 01:52:57 +01:00
2010-05-24 01:45:54 +02:00
if ( t - > state ! = TIMER_WAITING )
2013-11-19 21:12:59 +01:00
return 0 ;
2010-01-23 01:52:57 +01:00
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
log_unit_debug ( UNIT ( t ) , " Timer elapsed. " ) ;
2010-05-24 01:45:54 +02:00
timer_enter_running ( t ) ;
2013-11-19 21:12:59 +01:00
return 0 ;
2010-01-23 01:52:57 +01:00
}
2013-04-23 20:53:16 +02:00
static void timer_trigger_notify ( Unit * u , Unit * other ) {
Timer * t = TIMER ( u ) ;
TimerValue * v ;
2010-05-24 01:45:54 +02:00
2013-04-23 20:53:16 +02:00
assert ( u ) ;
assert ( other ) ;
2010-05-24 01:45:54 +02:00
2013-04-23 20:53:16 +02:00
if ( other - > load_state ! = UNIT_LOADED )
return ;
2010-05-24 01:45:54 +02:00
2013-04-23 20:53:16 +02:00
/* Reenable all timers that depend on unit state */
LIST_FOREACH ( value , v , t - > values )
if ( v - > base = = TIMER_UNIT_ACTIVE | |
v - > base = = TIMER_UNIT_INACTIVE )
v - > disabled = false ;
2010-05-24 05:25:33 +02:00
2013-04-23 20:53:16 +02:00
switch ( t - > state ) {
2010-05-24 01:45:54 +02:00
2013-04-23 20:53:16 +02:00
case TIMER_WAITING :
case TIMER_ELAPSED :
2010-05-24 01:45:54 +02:00
2013-04-23 20:53:16 +02:00
/* Recalculate sleep time */
timer_enter_waiting ( t , false ) ;
break ;
2010-05-24 01:45:54 +02:00
2013-04-23 20:53:16 +02:00
case TIMER_RUNNING :
2010-05-24 01:45:54 +02:00
2013-04-23 20:53:16 +02:00
if ( UNIT_IS_INACTIVE_OR_FAILED ( unit_active_state ( other ) ) ) {
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
log_unit_debug ( UNIT ( t ) , " Got notified about unit deactivation. " ) ;
2010-05-24 01:45:54 +02:00
timer_enter_waiting ( t , false ) ;
2013-04-23 20:53:16 +02:00
}
break ;
2010-05-24 01:45:54 +02:00
2013-04-23 20:53:16 +02:00
case TIMER_DEAD :
case TIMER_FAILED :
break ;
2010-05-24 01:45:54 +02:00
2013-04-23 20:53:16 +02:00
default :
assert_not_reached ( " Unknown timer state " ) ;
2010-05-24 01:45:54 +02:00
}
}
2010-08-31 00:23:34 +02:00
static void timer_reset_failed ( Unit * u ) {
2010-07-18 04:58:01 +02:00
Timer * t = TIMER ( u ) ;
assert ( t ) ;
2010-08-31 00:23:34 +02:00
if ( t - > state = = TIMER_FAILED )
2010-07-18 04:58:01 +02:00
timer_set_state ( t , TIMER_DEAD ) ;
2012-02-03 04:03:21 +01:00
t - > result = TIMER_SUCCESS ;
2010-07-18 04:58:01 +02:00
}
2012-11-25 00:32:40 +01:00
static void timer_time_change ( Unit * u ) {
Timer * t = TIMER ( u ) ;
assert ( u ) ;
if ( t - > state ! = TIMER_WAITING )
return ;
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
log_unit_debug ( u , " Time change, recalculating next elapse. " ) ;
2012-11-25 00:32:40 +01:00
timer_enter_waiting ( t , false ) ;
}
2010-05-24 01:45:54 +02:00
static const char * const timer_state_table [ _TIMER_STATE_MAX ] = {
[ TIMER_DEAD ] = " dead " ,
[ TIMER_WAITING ] = " waiting " ,
[ TIMER_RUNNING ] = " running " ,
[ TIMER_ELAPSED ] = " elapsed " ,
2010-08-31 00:23:34 +02:00
[ TIMER_FAILED ] = " failed "
2010-05-24 01:45:54 +02:00
} ;
DEFINE_STRING_TABLE_LOOKUP ( timer_state , TimerState ) ;
static const char * const timer_base_table [ _TIMER_BASE_MAX ] = {
2010-07-04 21:12:10 +02:00
[ TIMER_ACTIVE ] = " OnActiveSec " ,
[ TIMER_BOOT ] = " OnBootSec " ,
[ TIMER_STARTUP ] = " OnStartupSec " ,
[ TIMER_UNIT_ACTIVE ] = " OnUnitActiveSec " ,
2012-11-23 21:37:58 +01:00
[ TIMER_UNIT_INACTIVE ] = " OnUnitInactiveSec " ,
[ TIMER_CALENDAR ] = " OnCalendar "
2010-05-24 01:45:54 +02:00
} ;
DEFINE_STRING_TABLE_LOOKUP ( timer_base , TimerBase ) ;
2012-02-03 04:03:21 +01:00
static const char * const timer_result_table [ _TIMER_RESULT_MAX ] = {
[ TIMER_SUCCESS ] = " success " ,
[ TIMER_FAILURE_RESOURCES ] = " resources "
} ;
DEFINE_STRING_TABLE_LOOKUP ( timer_result , TimerResult ) ;
2010-01-26 21:39:06 +01:00
const UnitVTable timer_vtable = {
2012-01-15 10:53:49 +01:00
. object_size = sizeof ( Timer ) ,
2013-11-19 21:12:59 +01:00
2011-08-01 00:43:05 +02:00
. sections =
" Unit \0 "
" Timer \0 "
" Install \0 " ,
2014-12-08 16:03:53 +01:00
. private_section = " Timer " ,
2010-01-23 01:52:57 +01:00
2010-05-24 01:45:54 +02:00
. init = timer_init ,
2010-01-26 04:18:44 +01:00
. done = timer_done ,
2010-05-24 01:45:54 +02:00
. load = timer_load ,
. coldplug = timer_coldplug ,
. dump = timer_dump ,
. start = timer_start ,
. stop = timer_stop ,
. serialize = timer_serialize ,
. deserialize_item = timer_deserialize_item ,
. active_state = timer_active_state ,
. sub_state_to_string = timer_sub_state_to_string ,
2013-04-23 20:53:16 +02:00
. trigger_notify = timer_trigger_notify ,
2010-08-31 00:23:34 +02:00
. reset_failed = timer_reset_failed ,
2012-11-25 00:32:40 +01:00
. time_change = timer_time_change ,
2010-07-18 04:58:01 +02:00
2010-08-20 02:26:05 +02:00
. bus_interface = " org.freedesktop.systemd1.Timer " ,
2013-11-19 21:12:59 +01:00
. bus_vtable = bus_timer_vtable ,
2014-12-08 16:03:53 +01:00
. bus_set_property = bus_timer_set_property ,
. can_transient = true ,
2010-01-23 01:52:57 +01:00
} ;