diff options
author | Ewan Mellor <ewan@xensource.com> | 2007-02-25 23:17:14 +0000 |
---|---|---|
committer | Ewan Mellor <ewan@xensource.com> | 2007-02-25 23:17:14 +0000 |
commit | d8f5871da1f98195c4f8b86c1cd5188b729fdc5c (patch) | |
tree | 6061ed4d4fb47aaeb022f23d699393f95652d825 /tools | |
parent | 719e521fa2c52c1546d007702ed5869d67a33582 (diff) | |
download | xen-d8f5871da1f98195c4f8b86c1cd5188b729fdc5c.tar.gz xen-d8f5871da1f98195c4f8b86c1cd5188b729fdc5c.tar.bz2 xen-d8f5871da1f98195c4f8b86c1cd5188b729fdc5c.zip |
Replace VM.tools_version with a richer VM_guest_metrics class.
Signed-off-by: Ewan Mellor <ewan@xensource.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/libxen/include/xen_vm.h | 17 | ||||
-rw-r--r-- | tools/libxen/include/xen_vm_guest_metrics.h | 227 | ||||
-rw-r--r-- | tools/libxen/include/xen_vm_guest_metrics_decl.h | 30 | ||||
-rw-r--r-- | tools/libxen/src/xen_vm.c | 39 | ||||
-rw-r--r-- | tools/libxen/src/xen_vm_guest_metrics.c | 261 |
5 files changed, 547 insertions, 27 deletions
diff --git a/tools/libxen/include/xen_vm.h b/tools/libxen/include/xen_vm.h index 228a3dcb07..71a3f62ca4 100644 --- a/tools/libxen/include/xen_vm.h +++ b/tools/libxen/include/xen_vm.h @@ -30,6 +30,7 @@ #include "xen_vdi_decl.h" #include "xen_vif_decl.h" #include "xen_vm_decl.h" +#include "xen_vm_guest_metrics_decl.h" #include "xen_vm_metrics_decl.h" #include "xen_vm_power_state.h" #include "xen_vtpm_decl.h" @@ -144,11 +145,11 @@ typedef struct xen_vm_record bool platform_clock_offset; bool platform_enable_audio; char *pci_bus; - xen_string_string_map *tools_version; xen_string_string_map *other_config; int64_t domid; bool is_control_domain; struct xen_vm_metrics_record_opt *metrics; + struct xen_vm_guest_metrics_record_opt *guest_metrics; } xen_vm_record; /** @@ -534,13 +535,6 @@ xen_vm_get_pci_bus(xen_session *session, char **result, xen_vm vm); /** - * Get the tools_version field of the given VM. - */ -extern bool -xen_vm_get_tools_version(xen_session *session, xen_string_string_map **result, xen_vm vm); - - -/** * Get the other_config field of the given VM. */ extern bool @@ -569,6 +563,13 @@ xen_vm_get_metrics(xen_session *session, xen_vm_metrics *result, xen_vm vm); /** + * Get the guest_metrics field of the given VM. + */ +extern bool +xen_vm_get_guest_metrics(xen_session *session, xen_vm_guest_metrics *result, xen_vm vm); + + +/** * Set the name/label field of the given VM. */ extern bool diff --git a/tools/libxen/include/xen_vm_guest_metrics.h b/tools/libxen/include/xen_vm_guest_metrics.h new file mode 100644 index 0000000000..61c6c090ea --- /dev/null +++ b/tools/libxen/include/xen_vm_guest_metrics.h @@ -0,0 +1,227 @@ +/* + * Copyright (c) 2006-2007, XenSource Inc. + * + * This library is free software; you can redistribute it and/or + * modify it 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 (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef XEN_VM_GUEST_METRICS_H +#define XEN_VM_GUEST_METRICS_H + +#include "xen_common.h" +#include "xen_string_string_map.h" +#include "xen_vm_decl.h" +#include "xen_vm_guest_metrics_decl.h" + + +/* + * The VM_guest_metrics class. + * + * The metrics reported by the guest (as opposed to inferred from outside). + */ + + +/** + * Free the given xen_vm_guest_metrics. The given handle must have + * been allocated by this library. + */ +extern void +xen_vm_guest_metrics_free(xen_vm_guest_metrics vm_guest_metrics); + + +typedef struct xen_vm_guest_metrics_set +{ + size_t size; + xen_vm_guest_metrics *contents[]; +} xen_vm_guest_metrics_set; + +/** + * Allocate a xen_vm_guest_metrics_set of the given size. + */ +extern xen_vm_guest_metrics_set * +xen_vm_guest_metrics_set_alloc(size_t size); + +/** + * Free the given xen_vm_guest_metrics_set. The given set must have + * been allocated by this library. + */ +extern void +xen_vm_guest_metrics_set_free(xen_vm_guest_metrics_set *set); + + +typedef struct xen_vm_guest_metrics_record +{ + xen_vm_guest_metrics handle; + char *uuid; + struct xen_vm_record_opt *vm; + xen_string_string_map *os_version; + xen_string_string_map *pv_drivers_version; + xen_string_string_map *memory; + xen_string_string_map *disks; + xen_string_string_map *networks; + xen_string_string_map *other; +} xen_vm_guest_metrics_record; + +/** + * Allocate a xen_vm_guest_metrics_record. + */ +extern xen_vm_guest_metrics_record * +xen_vm_guest_metrics_record_alloc(void); + +/** + * Free the given xen_vm_guest_metrics_record, and all referenced + * values. The given record must have been allocated by this library. + */ +extern void +xen_vm_guest_metrics_record_free(xen_vm_guest_metrics_record *record); + + +typedef struct xen_vm_guest_metrics_record_opt +{ + bool is_record; + union + { + xen_vm_guest_metrics handle; + xen_vm_guest_metrics_record *record; + } u; +} xen_vm_guest_metrics_record_opt; + +/** + * Allocate a xen_vm_guest_metrics_record_opt. + */ +extern xen_vm_guest_metrics_record_opt * +xen_vm_guest_metrics_record_opt_alloc(void); + +/** + * Free the given xen_vm_guest_metrics_record_opt, and all referenced + * values. The given record_opt must have been allocated by this library. + */ +extern void +xen_vm_guest_metrics_record_opt_free(xen_vm_guest_metrics_record_opt *record_opt); + + +typedef struct xen_vm_guest_metrics_record_set +{ + size_t size; + xen_vm_guest_metrics_record *contents[]; +} xen_vm_guest_metrics_record_set; + +/** + * Allocate a xen_vm_guest_metrics_record_set of the given size. + */ +extern xen_vm_guest_metrics_record_set * +xen_vm_guest_metrics_record_set_alloc(size_t size); + +/** + * Free the given xen_vm_guest_metrics_record_set, and all referenced + * values. The given set must have been allocated by this library. + */ +extern void +xen_vm_guest_metrics_record_set_free(xen_vm_guest_metrics_record_set *set); + + + +typedef struct xen_vm_guest_metrics_record_opt_set +{ + size_t size; + xen_vm_guest_metrics_record_opt *contents[]; +} xen_vm_guest_metrics_record_opt_set; + +/** + * Allocate a xen_vm_guest_metrics_record_opt_set of the given size. + */ +extern xen_vm_guest_metrics_record_opt_set * +xen_vm_guest_metrics_record_opt_set_alloc(size_t size); + +/** + * Free the given xen_vm_guest_metrics_record_opt_set, and all + * referenced values. The given set must have been allocated by this library. + */ +extern void +xen_vm_guest_metrics_record_opt_set_free(xen_vm_guest_metrics_record_opt_set *set); + + +/** + * Get a record containing the current state of the given + * VM_guest_metrics. + */ +extern bool +xen_vm_guest_metrics_get_record(xen_session *session, xen_vm_guest_metrics_record **result, xen_vm_guest_metrics vm_guest_metrics); + + +/** + * Get a reference to the VM_guest_metrics instance with the specified + * UUID. + */ +extern bool +xen_vm_guest_metrics_get_by_uuid(xen_session *session, xen_vm_guest_metrics *result, char *uuid); + + +/** + * Get the uuid field of the given VM_guest_metrics. + */ +extern bool +xen_vm_guest_metrics_get_uuid(xen_session *session, char **result, xen_vm_guest_metrics vm_guest_metrics); + + +/** + * Get the VM field of the given VM_guest_metrics. + */ +extern bool +xen_vm_guest_metrics_get_vm(xen_session *session, xen_vm *result, xen_vm_guest_metrics vm_guest_metrics); + + +/** + * Get the os_version field of the given VM_guest_metrics. + */ +extern bool +xen_vm_guest_metrics_get_os_version(xen_session *session, xen_string_string_map **result, xen_vm_guest_metrics vm_guest_metrics); + + +/** + * Get the PV_drivers_version field of the given VM_guest_metrics. + */ +extern bool +xen_vm_guest_metrics_get_pv_drivers_version(xen_session *session, xen_string_string_map **result, xen_vm_guest_metrics vm_guest_metrics); + + +/** + * Get the memory field of the given VM_guest_metrics. + */ +extern bool +xen_vm_guest_metrics_get_memory(xen_session *session, xen_string_string_map **result, xen_vm_guest_metrics vm_guest_metrics); + + +/** + * Get the disks field of the given VM_guest_metrics. + */ +extern bool +xen_vm_guest_metrics_get_disks(xen_session *session, xen_string_string_map **result, xen_vm_guest_metrics vm_guest_metrics); + + +/** + * Get the networks field of the given VM_guest_metrics. + */ +extern bool +xen_vm_guest_metrics_get_networks(xen_session *session, xen_string_string_map **result, xen_vm_guest_metrics vm_guest_metrics); + + +/** + * Get the other field of the given VM_guest_metrics. + */ +extern bool +xen_vm_guest_metrics_get_other(xen_session *session, xen_string_string_map **result, xen_vm_guest_metrics vm_guest_metrics); + + +#endif diff --git a/tools/libxen/include/xen_vm_guest_metrics_decl.h b/tools/libxen/include/xen_vm_guest_metrics_decl.h new file mode 100644 index 0000000000..837528b919 --- /dev/null +++ b/tools/libxen/include/xen_vm_guest_metrics_decl.h @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2006-2007, XenSource Inc. + * + * This library is free software; you can redistribute it and/or + * modify it 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 (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef XEN_VM_GUEST_METRICS_DECL_H +#define XEN_VM_GUEST_METRICS_DECL_H + +typedef void *xen_vm_guest_metrics; + +struct xen_vm_guest_metrics_set; +struct xen_vm_guest_metrics_record; +struct xen_vm_guest_metrics_record_set; +struct xen_vm_guest_metrics_record_opt; +struct xen_vm_guest_metrics_record_opt_set; + +#endif diff --git a/tools/libxen/src/xen_vm.c b/tools/libxen/src/xen_vm.c index 1d93e6a840..910c9f8b31 100644 --- a/tools/libxen/src/xen_vm.c +++ b/tools/libxen/src/xen_vm.c @@ -32,6 +32,7 @@ #include "xen_vdi.h" #include "xen_vif.h" #include "xen_vm.h" +#include "xen_vm_guest_metrics.h" #include "xen_vm_metrics.h" #include "xen_vm_power_state_internal.h" #include "xen_vtpm.h" @@ -162,9 +163,6 @@ static const struct_member xen_vm_record_struct_members[] = { .key = "PCI_bus", .type = &abstract_type_string, .offset = offsetof(xen_vm_record, pci_bus) }, - { .key = "tools_version", - .type = &abstract_type_string_string_map, - .offset = offsetof(xen_vm_record, tools_version) }, { .key = "other_config", .type = &abstract_type_string_string_map, .offset = offsetof(xen_vm_record, other_config) }, @@ -176,7 +174,10 @@ static const struct_member xen_vm_record_struct_members[] = .offset = offsetof(xen_vm_record, is_control_domain) }, { .key = "metrics", .type = &abstract_type_ref, - .offset = offsetof(xen_vm_record, metrics) } + .offset = offsetof(xen_vm_record, metrics) }, + { .key = "guest_metrics", + .type = &abstract_type_ref, + .offset = offsetof(xen_vm_record, guest_metrics) } }; const abstract_type xen_vm_record_abstract_type_ = @@ -218,9 +219,9 @@ xen_vm_record_free(xen_vm_record *record) xen_string_string_map_free(record->hvm_boot_params); free(record->platform_serial); free(record->pci_bus); - xen_string_string_map_free(record->tools_version); xen_string_string_map_free(record->other_config); xen_vm_metrics_record_opt_free(record->metrics); + xen_vm_guest_metrics_record_opt_free(record->guest_metrics); free(record); } @@ -922,7 +923,7 @@ xen_vm_get_pci_bus(xen_session *session, char **result, xen_vm vm) bool -xen_vm_get_tools_version(xen_session *session, xen_string_string_map **result, xen_vm vm) +xen_vm_get_other_config(xen_session *session, xen_string_string_map **result, xen_vm vm) { abstract_value param_values[] = { @@ -933,13 +934,13 @@ xen_vm_get_tools_version(xen_session *session, xen_string_string_map **result, x abstract_type result_type = abstract_type_string_string_map; *result = NULL; - XEN_CALL_("VM.get_tools_version"); + XEN_CALL_("VM.get_other_config"); return session->ok; } bool -xen_vm_get_other_config(xen_session *session, xen_string_string_map **result, xen_vm vm) +xen_vm_get_domid(xen_session *session, int64_t *result, xen_vm vm) { abstract_value param_values[] = { @@ -947,16 +948,15 @@ xen_vm_get_other_config(xen_session *session, xen_string_string_map **result, xe .u.string_val = vm } }; - abstract_type result_type = abstract_type_string_string_map; + abstract_type result_type = abstract_type_int; - *result = NULL; - XEN_CALL_("VM.get_other_config"); + XEN_CALL_("VM.get_domid"); return session->ok; } bool -xen_vm_get_domid(xen_session *session, int64_t *result, xen_vm vm) +xen_vm_get_is_control_domain(xen_session *session, bool *result, xen_vm vm) { abstract_value param_values[] = { @@ -964,15 +964,15 @@ xen_vm_get_domid(xen_session *session, int64_t *result, xen_vm vm) .u.string_val = vm } }; - abstract_type result_type = abstract_type_int; + abstract_type result_type = abstract_type_bool; - XEN_CALL_("VM.get_domid"); + XEN_CALL_("VM.get_is_control_domain"); return session->ok; } bool -xen_vm_get_is_control_domain(xen_session *session, bool *result, xen_vm vm) +xen_vm_get_metrics(xen_session *session, xen_vm_metrics *result, xen_vm vm) { abstract_value param_values[] = { @@ -980,15 +980,16 @@ xen_vm_get_is_control_domain(xen_session *session, bool *result, xen_vm vm) .u.string_val = vm } }; - abstract_type result_type = abstract_type_bool; + abstract_type result_type = abstract_type_string; - XEN_CALL_("VM.get_is_control_domain"); + *result = NULL; + XEN_CALL_("VM.get_metrics"); return session->ok; } bool -xen_vm_get_metrics(xen_session *session, xen_vm_metrics *result, xen_vm vm) +xen_vm_get_guest_metrics(xen_session *session, xen_vm_guest_metrics *result, xen_vm vm) { abstract_value param_values[] = { @@ -999,7 +1000,7 @@ xen_vm_get_metrics(xen_session *session, xen_vm_metrics *result, xen_vm vm) abstract_type result_type = abstract_type_string; *result = NULL; - XEN_CALL_("VM.get_metrics"); + XEN_CALL_("VM.get_guest_metrics"); return session->ok; } diff --git a/tools/libxen/src/xen_vm_guest_metrics.c b/tools/libxen/src/xen_vm_guest_metrics.c new file mode 100644 index 0000000000..44c9fabe97 --- /dev/null +++ b/tools/libxen/src/xen_vm_guest_metrics.c @@ -0,0 +1,261 @@ +/* + * Copyright (c) 2006-2007, XenSource Inc. + * + * This library is free software; you can redistribute it and/or + * modify it 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 (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#include <stddef.h> +#include <stdlib.h> + +#include "xen_common.h" +#include "xen_internal.h" +#include "xen_string_string_map.h" +#include "xen_vm.h" +#include "xen_vm_guest_metrics.h" + + +XEN_FREE(xen_vm_guest_metrics) +XEN_SET_ALLOC_FREE(xen_vm_guest_metrics) +XEN_ALLOC(xen_vm_guest_metrics_record) +XEN_SET_ALLOC_FREE(xen_vm_guest_metrics_record) +XEN_ALLOC(xen_vm_guest_metrics_record_opt) +XEN_RECORD_OPT_FREE(xen_vm_guest_metrics) +XEN_SET_ALLOC_FREE(xen_vm_guest_metrics_record_opt) + + +static const struct_member xen_vm_guest_metrics_record_struct_members[] = + { + { .key = "uuid", + .type = &abstract_type_string, + .offset = offsetof(xen_vm_guest_metrics_record, uuid) }, + { .key = "VM", + .type = &abstract_type_ref, + .offset = offsetof(xen_vm_guest_metrics_record, vm) }, + { .key = "os_version", + .type = &abstract_type_string_string_map, + .offset = offsetof(xen_vm_guest_metrics_record, os_version) }, + { .key = "PV_drivers_version", + .type = &abstract_type_string_string_map, + .offset = offsetof(xen_vm_guest_metrics_record, pv_drivers_version) }, + { .key = "memory", + .type = &abstract_type_string_string_map, + .offset = offsetof(xen_vm_guest_metrics_record, memory) }, + { .key = "disks", + .type = &abstract_type_string_string_map, + .offset = offsetof(xen_vm_guest_metrics_record, disks) }, + { .key = "networks", + .type = &abstract_type_string_string_map, + .offset = offsetof(xen_vm_guest_metrics_record, networks) }, + { .key = "other", + .type = &abstract_type_string_string_map, + .offset = offsetof(xen_vm_guest_metrics_record, other) } + }; + +const abstract_type xen_vm_guest_metrics_record_abstract_type_ = + { + .typename = STRUCT, + .struct_size = sizeof(xen_vm_guest_metrics_record), + .member_count = + sizeof(xen_vm_guest_metrics_record_struct_members) / sizeof(struct_member), + .members = xen_vm_guest_metrics_record_struct_members + }; + + +void +xen_vm_guest_metrics_record_free(xen_vm_guest_metrics_record *record) +{ + if (record == NULL) + { + return; + } + free(record->handle); + free(record->uuid); + xen_vm_record_opt_free(record->vm); + xen_string_string_map_free(record->os_version); + xen_string_string_map_free(record->pv_drivers_version); + xen_string_string_map_free(record->memory); + xen_string_string_map_free(record->disks); + xen_string_string_map_free(record->networks); + xen_string_string_map_free(record->other); + free(record); +} + + +bool +xen_vm_guest_metrics_get_record(xen_session *session, xen_vm_guest_metrics_record **result, xen_vm_guest_metrics vm_guest_metrics) +{ + abstract_value param_values[] = + { + { .type = &abstract_type_string, + .u.string_val = vm_guest_metrics } + }; + + abstract_type result_type = xen_vm_guest_metrics_record_abstract_type_; + + *result = NULL; + XEN_CALL_("VM_guest_metrics.get_record"); + + if (session->ok) + { + (*result)->handle = xen_strdup_((*result)->uuid); + } + + return session->ok; +} + + +bool +xen_vm_guest_metrics_get_by_uuid(xen_session *session, xen_vm_guest_metrics *result, char *uuid) +{ + abstract_value param_values[] = + { + { .type = &abstract_type_string, + .u.string_val = uuid } + }; + + abstract_type result_type = abstract_type_string; + + *result = NULL; + XEN_CALL_("VM_guest_metrics.get_by_uuid"); + return session->ok; +} + + +bool +xen_vm_guest_metrics_get_vm(xen_session *session, xen_vm *result, xen_vm_guest_metrics vm_guest_metrics) +{ + abstract_value param_values[] = + { + { .type = &abstract_type_string, + .u.string_val = vm_guest_metrics } + }; + + abstract_type result_type = abstract_type_string; + + *result = NULL; + XEN_CALL_("VM_guest_metrics.get_VM"); + return session->ok; +} + + +bool +xen_vm_guest_metrics_get_os_version(xen_session *session, xen_string_string_map **result, xen_vm_guest_metrics vm_guest_metrics) +{ + abstract_value param_values[] = + { + { .type = &abstract_type_string, + .u.string_val = vm_guest_metrics } + }; + + abstract_type result_type = abstract_type_string_string_map; + + *result = NULL; + XEN_CALL_("VM_guest_metrics.get_os_version"); + return session->ok; +} + + +bool +xen_vm_guest_metrics_get_pv_drivers_version(xen_session *session, xen_string_string_map **result, xen_vm_guest_metrics vm_guest_metrics) +{ + abstract_value param_values[] = + { + { .type = &abstract_type_string, + .u.string_val = vm_guest_metrics } + }; + + abstract_type result_type = abstract_type_string_string_map; + + *result = NULL; + XEN_CALL_("VM_guest_metrics.get_PV_drivers_version"); + return session->ok; +} + + +bool +xen_vm_guest_metrics_get_memory(xen_session *session, xen_string_string_map **result, xen_vm_guest_metrics vm_guest_metrics) +{ + abstract_value param_values[] = + { + { .type = &abstract_type_string, + .u.string_val = vm_guest_metrics } + }; + + abstract_type result_type = abstract_type_string_string_map; + + *result = NULL; + XEN_CALL_("VM_guest_metrics.get_memory"); + return session->ok; +} + + +bool +xen_vm_guest_metrics_get_disks(xen_session *session, xen_string_string_map **result, xen_vm_guest_metrics vm_guest_metrics) +{ + abstract_value param_values[] = + { + { .type = &abstract_type_string, + .u.string_val = vm_guest_metrics } + }; + + abstract_type result_type = abstract_type_string_string_map; + + *result = NULL; + XEN_CALL_("VM_guest_metrics.get_disks"); + return session->ok; +} + + +bool +xen_vm_guest_metrics_get_networks(xen_session *session, xen_string_string_map **result, xen_vm_guest_metrics vm_guest_metrics) +{ + abstract_value param_values[] = + { + { .type = &abstract_type_string, + .u.string_val = vm_guest_metrics } + }; + + abstract_type result_type = abstract_type_string_string_map; + + *result = NULL; + XEN_CALL_("VM_guest_metrics.get_networks"); + return session->ok; +} + + +bool +xen_vm_guest_metrics_get_other(xen_session *session, xen_string_string_map **result, xen_vm_guest_metrics vm_guest_metrics) +{ + abstract_value param_values[] = + { + { .type = &abstract_type_string, + .u.string_val = vm_guest_metrics } + }; + + abstract_type result_type = abstract_type_string_string_map; + + *result = NULL; + XEN_CALL_("VM_guest_metrics.get_other"); + return session->ok; +} + + +bool +xen_vm_guest_metrics_get_uuid(xen_session *session, char **result, xen_vm_guest_metrics vm_guest_metrics) +{ + *result = session->ok ? xen_strdup_((char *)vm_guest_metrics) : NULL; + return session->ok; +} |