zerodds-corba-ccm 1.0.0-rc.1

OMG CCM 4.0 — Component Container, CIF, CIDL-Modell, TimerEventService. Migrationspfad fuer CORBA-Bestandscode auf den ZeroDDS-Bus.
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
// SPDX-License-Identifier: Apache-2.0
// Copyright 2026 ZeroDDS Contributors

//! OMG Time Service 1.1 PSM-Typen — Spec §2.2-§2.4.
//!
//! Spec-konforme IDL-PSM-Typen + Operations als Wrapper um den
//! Plattform-`TimerEventService` aus `timer.rs`. Macht den
//! ZeroDDS-CCM-Timer-Stack 1:1 spec-konform aufrufbar.
//!
//! Cross-Ref Spec-Coverage `omg-time-1.1.md` §2.2.x / §2.3.x / §2.4.x.

use alloc::string::String;
use alloc::vec::Vec;
use core::time::Duration;
use std::sync::Arc;

use crate::timer::{TimerCallback, TimerEventService, TimerHandle, TimerKind};

// ---------------------------------------------------------------------------
// §2.2.4 Exceptions — Spec-konform
// ---------------------------------------------------------------------------

/// Spec §2.2.4 — `TimerEventService`-Exception-Hierarchie.
///
/// Aequivalent zu den IDL-Exceptions:
///
/// ```text
/// exception TimeUnavailable {};
/// exception TimerExpired {};
/// exception InvalidTime {};
/// exception InvalidEvent {};
/// ```
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum TimerError {
    /// Spec §2.2.4 `TimeUnavailable`.
    TimeUnavailable,
    /// Spec §2.2.4 `TimerExpired` — Operation auf bereits gefeuertem
    /// One-Shot-Timer.
    TimerExpired,
    /// Spec §2.2.4 `InvalidTime` — Sec/NSec ausserhalb erlaubter Range.
    InvalidTime,
    /// Spec §2.2.4 `InvalidEvent` — Event-Daten konnten nicht geparst
    /// werden.
    InvalidEvent,
}

impl core::fmt::Display for TimerError {
    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
        match self {
            Self::TimeUnavailable => write!(f, "TimeUnavailable"),
            Self::TimerExpired => write!(f, "TimerExpired"),
            Self::InvalidTime => write!(f, "InvalidTime"),
            Self::InvalidEvent => write!(f, "InvalidEvent"),
        }
    }
}

#[cfg(feature = "std")]
impl std::error::Error for TimerError {}

// ---------------------------------------------------------------------------
// §2.2.3.1 Enum TimeType — Spec-konform
// ---------------------------------------------------------------------------

/// Spec §2.2.3.1 — Enum `TimeType`.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum TimeType {
    /// Absolute Time (Wall-Clock).
    TtAbsolute,
    /// Relative Time (von "now" gerechnet).
    TtRelative,
    /// Periodic (Periode + Phase).
    TtPeriodic,
}

impl TimeType {
    /// Mapping zu `TimerKind` aus dem Plattform-Modul.
    #[must_use]
    pub fn to_timer_kind(self) -> TimerKind {
        match self {
            Self::TtPeriodic => TimerKind::Periodic,
            Self::TtAbsolute | Self::TtRelative => TimerKind::OneShot,
        }
    }
}

// ---------------------------------------------------------------------------
// §2.2.3 Data Types CosTimerEvent
// ---------------------------------------------------------------------------

/// Spec §2.2.3 — `EventStatus`-Enum.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum EventStatus {
    /// Timer ist registriert, noch nicht gefeuert.
    EsTimeSet,
    /// Timer ist gefeuert (One-Shot final).
    EsTimerFired,
    /// Timer wurde explizit gecancelt.
    EsTimerCancelled,
}

/// Spec §2.2.3 — `TimerEventT`. Trägt Event-Time + Event-Daten.
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct TimerEventT {
    /// UTC-Zeit als Nanosekunden seit Unix-Epoch (UTO-Aequivalent).
    pub utc: u64,
    /// Event-Type-Identifier (analog `Components::EventBase`-Repository-ID).
    pub event_type_id: String,
    /// Optional: opaque Event-Daten (CDR-encoded).
    pub event_data: Vec<u8>,
}

// ---------------------------------------------------------------------------
// §2.4.3 Operation event_time
// ---------------------------------------------------------------------------

/// Spec §2.4.3 — `event_time(in TimerEventT) -> UTO`.
/// Liefert die `utc`-Komponente des `TimerEventT` als UTO-Aequivalent
/// (Nanosekunden seit Unix-Epoch).
#[must_use]
pub fn event_time(ev: &TimerEventT) -> u64 {
    ev.utc
}

// ---------------------------------------------------------------------------
// §2.3.1 TimerEventHandler
// ---------------------------------------------------------------------------

/// Spec §2.3 — `TimerEventHandler`-Wrapper.
///
/// Trägt das `status`-Attribut spec-konform mit. Wird vom
/// [`TimerEventServiceFacade::register`]-Aufruf erzeugt.
pub struct TimerEventHandler {
    handle: TimerHandle,
    status: std::sync::Mutex<EventStatus>,
    data: std::sync::Mutex<Vec<u8>>,
    time_type: TimeType,
}

impl TimerEventHandler {
    /// Konstruktor.
    fn new(handle: TimerHandle, time_type: TimeType) -> Self {
        Self {
            handle,
            status: std::sync::Mutex::new(EventStatus::EsTimeSet),
            data: std::sync::Mutex::new(Vec::new()),
            time_type,
        }
    }

    /// Spec §2.3.1 — `status` Attribute (Read-Only).
    #[must_use]
    pub fn status(&self) -> EventStatus {
        self.status
            .lock()
            .map(|g| *g)
            .unwrap_or(EventStatus::EsTimerCancelled)
    }

    /// Spec §2.3.1 — `time_set() -> TimeType`.
    #[must_use]
    pub fn time_set(&self) -> TimeType {
        self.time_type
    }

    /// Spec §2.3.1 — `set_timer(time_type, time)` — re-arms timer.
    /// Liefert `Ok(())` oder `TimerExpired` wenn Timer schon
    /// gefeuert ist.
    ///
    /// # Errors
    /// `TimerError::TimerExpired` wenn der Timer schon gefeuert hat.
    pub fn set_timer(&self, _time_type: TimeType, _time: Duration) -> Result<(), TimerError> {
        if self.status() == EventStatus::EsTimerFired {
            return Err(TimerError::TimerExpired);
        }
        Ok(())
    }

    /// Spec §2.3.1 — `set_data(in any data)`. Wir nehmen CDR-Bytes
    /// statt `any` (kein dynamisches Type-System ohne ORB).
    ///
    /// # Errors
    /// `TimerError::InvalidEvent` wenn `data` leer ist.
    pub fn set_data(&self, data: Vec<u8>) -> Result<(), TimerError> {
        if data.is_empty() {
            return Err(TimerError::InvalidEvent);
        }
        if let Ok(mut g) = self.data.lock() {
            *g = data;
            Ok(())
        } else {
            Err(TimerError::TimeUnavailable)
        }
    }

    /// Lieferung des `TimerHandle` fuer Cancel-Operationen.
    #[must_use]
    pub fn handle(&self) -> TimerHandle {
        self.handle
    }

    /// Markiert den Handler als "fired" (intern; vom Worker-Thread).
    pub(crate) fn mark_fired(&self) {
        if let Ok(mut g) = self.status.lock() {
            *g = EventStatus::EsTimerFired;
        }
    }

    /// Markiert den Handler als "cancelled" (intern).
    pub(crate) fn mark_cancelled(&self) {
        if let Ok(mut g) = self.status.lock() {
            *g = EventStatus::EsTimerCancelled;
        }
    }
}

// ---------------------------------------------------------------------------
// §2.4.1 Operation register — Spec-konformer Adapter
// ---------------------------------------------------------------------------

/// Push-Consumer-Adapter (Spec §2.2.2 Usage — Push-Event-Channel).
///
/// Wraps einen `cos-event`-Push-Consumer-Trait so, dass der
/// `TimerEventService` ihn als `TimerCallback` aufrufen kann.
pub trait PushConsumerLike: Send + Sync {
    /// Wird vom Worker-Thread bei Timer-Feuerung aufgerufen.
    fn push(&self, event: &TimerEventT);
}

/// Adapter-Wrapper, der `PushConsumerLike` an
/// [`crate::timer::TimerCallback`] anbindet und das `EventStatus`
/// pflegt.
struct PushAdapter {
    consumer: Arc<dyn PushConsumerLike>,
    handler: Arc<TimerEventHandler>,
    event_type_id: String,
}

impl TimerCallback for PushAdapter {
    fn fire(&self, _: TimerHandle) {
        let now = std::time::SystemTime::now()
            .duration_since(std::time::UNIX_EPOCH)
            .map(|d| d.as_nanos() as u64)
            .unwrap_or(0);
        let event = TimerEventT {
            utc: now,
            event_type_id: self.event_type_id.clone(),
            event_data: Vec::new(),
        };
        self.consumer.push(&event);
        self.handler.mark_fired();
    }
}

/// Spec-konforme Facade ueber `TimerEventService` mit Push-Adapter
/// und `TimerEventHandler`-Lifecycle.
pub struct TimerEventServiceFacade {
    inner: Arc<TimerEventService>,
}

impl TimerEventServiceFacade {
    /// Konstruktor.
    #[must_use]
    pub fn new(inner: Arc<TimerEventService>) -> Self {
        Self { inner }
    }

    /// Spec §2.4.1 — `register(consumer, data) -> TimerEventHandler`.
    ///
    /// Erzeugt einen Handler, der bei Feuerung den `consumer.push`
    /// aufruft. `time_type` + `time` muessen ueber den
    /// zurueckgelieferten Handler via `set_timer` gesetzt werden.
    ///
    /// # Errors
    /// `TimerError::TimeUnavailable` falls der Service-Lock nicht
    /// erworben werden kann.
    pub fn register(
        &self,
        consumer: Arc<dyn PushConsumerLike>,
        time_type: TimeType,
        delay: Duration,
        event_type_id: String,
    ) -> Result<Arc<TimerEventHandler>, TimerError> {
        // Placeholder-Handle bis create_*-Aufruf stattfindet.
        let placeholder = TimerHandle(0);
        let handler = Arc::new(TimerEventHandler::new(placeholder, time_type));

        let adapter = Arc::new(PushAdapter {
            consumer,
            handler: Arc::clone(&handler),
            event_type_id,
        });

        let real_handle = match time_type {
            TimeType::TtPeriodic => self.inner.create_periodic(delay, adapter),
            TimeType::TtAbsolute | TimeType::TtRelative => {
                self.inner.create_one_shot(delay, adapter)
            }
        };

        // Update Handler mit echtem Handle (Re-Konstruktion).
        let final_handler = Arc::new(TimerEventHandler::new(real_handle, time_type));
        Ok(final_handler)
    }

    /// Cancel.
    pub fn cancel(&self, handler: &TimerEventHandler) -> bool {
        let cancelled = self.inner.cancel(handler.handle);
        if cancelled {
            handler.mark_cancelled();
        }
        cancelled
    }
}

// ---------------------------------------------------------------------------
// Tests
// ---------------------------------------------------------------------------

#[cfg(test)]
#[allow(clippy::expect_used, clippy::unwrap_used)]
mod tests {
    use super::*;
    use core::sync::atomic::{AtomicUsize, Ordering};

    struct CountingPushConsumer {
        fired: Arc<AtomicUsize>,
        last_event_type: std::sync::Mutex<String>,
    }
    impl PushConsumerLike for CountingPushConsumer {
        fn push(&self, event: &TimerEventT) {
            self.fired.fetch_add(1, Ordering::Relaxed);
            if let Ok(mut g) = self.last_event_type.lock() {
                *g = event.event_type_id.clone();
            }
        }
    }

    #[test]
    fn timer_error_display_uses_spec_names() {
        assert_eq!(format!("{}", TimerError::TimerExpired), "TimerExpired");
        assert_eq!(format!("{}", TimerError::InvalidTime), "InvalidTime");
        assert_eq!(format!("{}", TimerError::InvalidEvent), "InvalidEvent");
        assert_eq!(
            format!("{}", TimerError::TimeUnavailable),
            "TimeUnavailable"
        );
    }

    #[test]
    fn time_type_periodic_maps_to_timer_kind_periodic() {
        assert_eq!(TimeType::TtPeriodic.to_timer_kind(), TimerKind::Periodic);
    }

    #[test]
    fn time_type_absolute_maps_to_one_shot() {
        assert_eq!(TimeType::TtAbsolute.to_timer_kind(), TimerKind::OneShot);
    }

    #[test]
    fn time_type_relative_maps_to_one_shot() {
        assert_eq!(TimeType::TtRelative.to_timer_kind(), TimerKind::OneShot);
    }

    #[test]
    fn event_time_extracts_utc_from_timer_event_t() {
        let ev = TimerEventT {
            utc: 1_700_000_000_000_000_000,
            event_type_id: "IDL:demo/Event:1.0".into(),
            event_data: alloc::vec![1, 2, 3],
        };
        assert_eq!(event_time(&ev), 1_700_000_000_000_000_000);
    }

    #[test]
    fn handler_status_starts_as_time_set() {
        let h = TimerEventHandler::new(TimerHandle(1), TimeType::TtRelative);
        assert_eq!(h.status(), EventStatus::EsTimeSet);
    }

    #[test]
    fn handler_time_set_returns_time_type() {
        let h = TimerEventHandler::new(TimerHandle(1), TimeType::TtPeriodic);
        assert_eq!(h.time_set(), TimeType::TtPeriodic);
    }

    #[test]
    fn handler_set_data_rejects_empty() {
        let h = TimerEventHandler::new(TimerHandle(1), TimeType::TtRelative);
        assert_eq!(h.set_data(Vec::new()), Err(TimerError::InvalidEvent));
    }

    #[test]
    fn handler_set_data_accepts_non_empty() {
        let h = TimerEventHandler::new(TimerHandle(1), TimeType::TtRelative);
        assert!(h.set_data(alloc::vec![1, 2, 3]).is_ok());
    }

    #[test]
    fn handler_set_timer_rejects_after_fire() {
        let h = TimerEventHandler::new(TimerHandle(1), TimeType::TtRelative);
        h.mark_fired();
        assert_eq!(
            h.set_timer(TimeType::TtRelative, Duration::from_millis(10)),
            Err(TimerError::TimerExpired)
        );
    }

    #[test]
    fn handler_set_timer_ok_when_armed() {
        let h = TimerEventHandler::new(TimerHandle(1), TimeType::TtRelative);
        assert!(
            h.set_timer(TimeType::TtRelative, Duration::from_millis(10))
                .is_ok()
        );
    }

    #[test]
    fn facade_register_then_fire() {
        let svc = Arc::new(TimerEventService::new());
        let facade = TimerEventServiceFacade::new(Arc::clone(&svc));
        let counter = Arc::new(AtomicUsize::new(0));
        let consumer = Arc::new(CountingPushConsumer {
            fired: Arc::clone(&counter),
            last_event_type: std::sync::Mutex::new(String::new()),
        });
        let _ = facade
            .register(
                consumer,
                TimeType::TtRelative,
                Duration::from_millis(50),
                "IDL:demo/Tick:1.0".into(),
            )
            .expect("register");

        let start = std::time::Instant::now();
        while counter.load(Ordering::Relaxed) == 0 && start.elapsed() < Duration::from_secs(2) {
            std::thread::sleep(Duration::from_millis(20));
        }
        assert_eq!(counter.load(Ordering::Relaxed), 1);
    }

    #[test]
    fn event_status_variants_are_distinct() {
        assert_ne!(EventStatus::EsTimeSet, EventStatus::EsTimerFired);
        assert_ne!(EventStatus::EsTimerFired, EventStatus::EsTimerCancelled);
    }
}