← Back to branch summary

~clint-fewbar/ubuntu/precise/erlang/merge-15b

« back to all changes in this revision

Viewing changes to erts/emulator/test/driver_SUITE_data/timer_drv.c

  • Committer: Package Import Robot
  • Author(s): Sergei Golovan
  • Date: 2011-12-15 19:20:10 UTC
  • mfrom: (1.1.18) (3.5.15 sid)
  • mto: (3.5.16 sid)
  • mto: This revision was merged to the branch mainline in revision 33.
  • Revision ID: package-import@ubuntu.com-20111215192010-jnxcfe3tbrpp0big
Tags: 1:15.b-dfsg-1
* New upstream release.
* Upload to experimental because this release breaks external drivers
  API along with ABI, so several applications are to be fixed.
* Removed SSL patch because the old SSL implementation is removed from
  the upstream distribution.
* Removed never used patch which added native code to erlang beam files.
* Removed the erlang-docbuilder binary package because the docbuilder
  application was dropped by upstream.
* Documented dropping ${erlang-docbuilder:Depends} substvar in
  erlang-depends(1) manpage.
* Made erlang-base and erlang-base-hipe provide virtual package
  erlang-abi-15.b (the number means the first erlang version, which
  provides current ABI).

Show diffs side-by-side

added added

removed removed

Lines of Context:
erts/emulator/test/driver_SUITE_data/timer_drv.c
22
22
 
23
23
static ErlDrvPort erlang_port;
24
24
static ErlDrvData timer_start(ErlDrvPort, char*);
25
 
static void timer_stop(ErlDrvData), timer_read(ErlDrvData, char*, int), timer(ErlDrvData);
 
25
static void timer_stop(ErlDrvData);
 
26
static void timer_read(ErlDrvData, char*, ErlDrvSizeT);
 
27
static void timer(ErlDrvData);
26
28
 
27
29
static ErlDrvEntry timer_driver_entry =
28
30
{
38
40
    NULL,
39
41
    timer,
40
42
    NULL,
 
43
    NULL,
 
44
    NULL,
 
45
    NULL,
 
46
    NULL,
 
47
    ERL_DRV_EXTENDED_MARKER,
 
48
    ERL_DRV_EXTENDED_MAJOR_VERSION,
 
49
    ERL_DRV_EXTENDED_MINOR_VERSION,
 
50
    0,
 
51
    NULL,
 
52
    NULL,
41
53
    NULL
42
54
};
43
55
 
57
69
}
58
70
 
59
71
/* set the timer, this is monitored from erlang measuring the time */
60
 
static void timer_read(ErlDrvData port, char *buf, int len)
 
72
static void timer_read(ErlDrvData p, char *buf, ErlDrvSizeT len)
61
73
{
 
74
    ErlDrvPort port = (ErlDrvPort) p;
62
75
    char reply[1];
63
76
 
64
77
    if (buf[0] == START_TIMER) {