Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Few fixes for string type input #136

Merged
merged 1 commit into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions include/tdi/common/c_frontend/tdi_table_data.h
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,21 @@ tdi_status_t tdi_data_field_set_string(tdi_table_data_hdl *data_hdl,
const tdi_id_t field_id,
const char *val);

/**
* @brief Set value based on size. Valid only on fields with string type
*
* @param[in] data_hdl Data object handle
* @param[in] field_id Field ID
* @param[in] val String value
* @param[in] s Size of string value
*
* @return Status of the API call
*/
tdi_status_t tdi_data_field_set_string_with_size(tdi_table_data_hdl *data_hdl,
const tdi_id_t field_id,
const char *val,
const size_t s);

/**
* @brief Get value. Only valid on fields of size <= 64 bits
*
Expand Down
15 changes: 14 additions & 1 deletion include/tdi/common/tdi_table_data.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,26 @@ class TableData {
* @brief Set value. Valid only on fields with string type
*
* @param[in] field_id Field ID
* @param[in] value String value
* @param[in] str String value
*
* @return Status of the API call
*/
virtual tdi_status_t setValue(const tdi_id_t &field_id,
const std::string &str);

/**
* @brief Set value based on size. Valid only on fields with string type
*
* @param[in] field_id Field ID
* @param[in] str String value
* @param[in] s Size of string value
*
* @return Status of the API call
*/
virtual tdi_status_t setValue(const tdi_id_t &field_id,
const std::string &str,
const size_t &size);

/** @} */ // End of group Set APIs

/**
Expand Down
18 changes: 18 additions & 0 deletions src/c_frontend/tdi_table_data_c.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,24 @@ tdi_status_t tdi_data_field_set_string(tdi_table_data_hdl *data_hdl,
return data_field->setValue(field_id, str_val);
}

tdi_status_t tdi_data_field_set_string_with_size(tdi_table_data_hdl *data_hdl,
const tdi_id_t field_id,
const char *val,
const size_t s) {
auto data_field = reinterpret_cast<tdi::TableData *>(data_hdl);
std::string str_val = {0};
if (s > 0) {
/* we don't append directly as the data/value would be appended to NULL,
* instead, we want to assign the same value to str_val which val
* holds. */
str_val = val[0];
for (int i = 1; i < (int)s; i++) {
str_val += val[i];
}
}
return data_field->setValue(field_id, str_val, s);
}

tdi_status_t tdi_data_field_get_value(const tdi_table_data_hdl *data_hdl,
const tdi_id_t field_id,
uint64_t *val) {
Expand Down
7 changes: 7 additions & 0 deletions src/tdi_table_data.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,13 @@ tdi_status_t TableData::setValue(const tdi_id_t & /*field_id*/,
return TDI_NOT_SUPPORTED;
}

tdi_status_t TableData::setValue(const tdi_id_t & /*field_id*/,
const std::string & /*str*/,
const size_t & /*size*/) {
LOG_ERROR("%s:%d Not supported", __func__, __LINE__);
return TDI_NOT_SUPPORTED;
}

tdi_status_t TableData::getValue(const tdi_id_t & /*field_id*/,
uint64_t * /*value*/) const {
LOG_ERROR("%s:%d Not supported", __func__, __LINE__);
Expand Down
9 changes: 7 additions & 2 deletions tdi_python/tdiTable.py
Original file line number Diff line number Diff line change
Expand Up @@ -1109,8 +1109,13 @@ def _set_data_field(self, content, data_handle, data_fields):
value = c_bool(content[name])
sts = self._cintf.get_driver().tdi_data_field_set_bool(data_handle, info.id, value)
if self.data_type_cls.data_type_str(info.data_type) == "STRING":
value = c_char_p(content[name].encode('ascii'))
sts = self._cintf.get_driver().tdi_data_field_set_string(data_handle, info.id, value)
string = content[name]
if string[0:2] == "0x":
bytestr = bytes.fromhex(string[2:])
else:
bytestr = string.encode('ascii')
value = c_char_p(bytestr)
sts = self._cintf.get_driver().tdi_data_field_set_string_with_size(data_handle, info.id, value, len(bytestr))
"""
if self.data_type_cls.data_type_str(info.data_type) == "CONTAINER":
cont_list_len = len(content[name])
Expand Down
Loading