diff options
| author | Sverker Eriksson <[email protected]> | 2010-11-09 17:02:31 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2010-11-09 17:02:31 +0100 |
| commit | 033584eab11944fa8e3c2b55747cce887cd98877 (patch) | |
| tree | 4a17a4d87e330cd8277118aa2908dc2713030968 /erts | |
| parent | f26528bbea0a24674e797a58b97117c1f8cf163f (diff) | |
| parent | 24524dbd7867a27ba0550dbfd2c3fafed5ae0ca5 (diff) | |
| download | otp-033584eab11944fa8e3c2b55747cce887cd98877.tar.gz otp-033584eab11944fa8e3c2b55747cce887cd98877.tar.bz2 otp-033584eab11944fa8e3c2b55747cce887cd98877.zip | |
Merge branch 'sverker/doc-fixes/OTP-8880' into dev
* sverker/doc-fixes/OTP-8880:
Documentation update to ETS and drivers
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/doc/src/driver.xml | 7 | ||||
| -rw-r--r-- | erts/doc/src/driver_entry.xml | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/erts/doc/src/driver.xml b/erts/doc/src/driver.xml index 006a6160de..db455312ec 100644 --- a/erts/doc/src/driver.xml +++ b/erts/doc/src/driver.xml @@ -196,11 +196,14 @@ static ErlDrvData start(ErlDrvPort port, char *command) <p>We call disconnect to log out from the database. (This should have been done from Erlang, but just in case.)</p> <code type="none"><![CDATA[ - static int do_disconnect(our_data_t* data, ei_x_buff* x); +static int do_disconnect(our_data_t* data, ei_x_buff* x); static void stop(ErlDrvData drv_data) { - do_disconnect((our_data_t*)drv_data, NULL); + our_data_t* data = (our_data_t*)drv_data; + + do_disconnect(data, NULL); + driver_free(data); } ]]></code> <p>We use the binary format only to return data to the emulator; diff --git a/erts/doc/src/driver_entry.xml b/erts/doc/src/driver_entry.xml index e71b48bd92..dd949d4048 100644 --- a/erts/doc/src/driver_entry.xml +++ b/erts/doc/src/driver_entry.xml @@ -172,7 +172,7 @@ typedef struct erl_drv_entry { added to the driver list.) The driver should return 0, or if the driver can't initialize, -1.</p> </item> - <tag><marker id="start"/>int (*start)(ErlDrvPort port, char* command)</tag> + <tag><marker id="start"/>ErlDrvData (*start)(ErlDrvPort port, char* command)</tag> <item> <p>This is called when the driver is instantiated, when <c>open_port/2</c> is called. The driver should return a @@ -188,7 +188,9 @@ typedef struct erl_drv_entry { <p>This is called when the port is closed, with <c>port_close/1</c> or <c>Port ! {self(), close}</c>. Note that terminating the port owner process also closes the - port.</p> + port. If <c>drv_data</c> is a pointer to memory allocated in + <c>start</c>, then <c>stop</c> is the place to deallocate that + memory.</p> </item> <tag><marker id="output"/>void (*output)(ErlDrvData drv_data, char *buf, int len)</tag> <item> |