diff options
| author | jhb <jhb@FreeBSD.org> | 2009-06-18 17:11:24 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2009-06-18 17:11:24 +0000 |
| commit | 8e9eed3498e89e18499b64d123f534fd2a45dc1c (patch) | |
| tree | 328d619f9d104e840001f5914d066622451ecc47 /lib/libdtrace/common/dt_open.c | |
| parent | d35f41a58a07c7376a2ef17514741fad92f34f71 (diff) | |
| download | FreeBSD-src-8e9eed3498e89e18499b64d123f534fd2a45dc1c.zip FreeBSD-src-8e9eed3498e89e18499b64d123f534fd2a45dc1c.tar.gz | |
Import newer versions of these files from a 20080410 checkout of
OpenSolaris. Our local diffs to these files in HEAD already contain all
these changes (and in fact seem to be based on these versions of the files).
It seems the vendor branch just has older versions somehow.
Diffstat (limited to 'lib/libdtrace/common/dt_open.c')
| -rw-r--r-- | lib/libdtrace/common/dt_open.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/libdtrace/common/dt_open.c b/lib/libdtrace/common/dt_open.c index 5c04bee..86f1864 100644 --- a/lib/libdtrace/common/dt_open.c +++ b/lib/libdtrace/common/dt_open.c @@ -103,8 +103,9 @@ #define DT_VERS_1_4_1 DT_VERSION_NUMBER(1, 4, 1) #define DT_VERS_1_5 DT_VERSION_NUMBER(1, 5, 0) #define DT_VERS_1_6 DT_VERSION_NUMBER(1, 6, 0) -#define DT_VERS_LATEST DT_VERS_1_6 -#define DT_VERS_STRING "Sun D 1.6" +#define DT_VERS_1_6_1 DT_VERSION_NUMBER(1, 6, 1) +#define DT_VERS_LATEST DT_VERS_1_6_1 +#define DT_VERS_STRING "Sun D 1.6.1" const dt_version_t _dtrace_versions[] = { DT_VERS_1_0, /* D API 1.0.0 (PSARC 2001/466) Solaris 10 FCS */ @@ -117,6 +118,7 @@ const dt_version_t _dtrace_versions[] = { DT_VERS_1_4_1, /* D API 1.4.1 Solaris Express 4/07 */ DT_VERS_1_5, /* D API 1.5 Solaris Express 7/07 */ DT_VERS_1_6, /* D API 1.6 */ + DT_VERS_1_6_1, /* D API 1.6.1 */ 0 }; @@ -1291,6 +1293,9 @@ dtrace_close(dtrace_hdl_t *dtp) dt_dirpath_t *dirp; int i; + if (dtp->dt_procs != NULL) + dt_proc_hash_destroy(dtp); + while ((pgp = dt_list_next(&dtp->dt_programs)) != NULL) dt_program_destroy(dtp, pgp); @@ -1319,9 +1324,6 @@ dtrace_close(dtrace_hdl_t *dtp) while ((pvp = dt_list_next(&dtp->dt_provlist)) != NULL) dt_provider_destroy(dtp, pvp); - if (dtp->dt_procs != NULL) - dt_proc_hash_destroy(dtp); - if (dtp->dt_fd != -1) (void) close(dtp->dt_fd); if (dtp->dt_ftfd != -1) |
