Skip to content

Commit e9108c4

Browse files
linnhoffClemensLinnhoff
authored andcommitted
reimplement buffer swap
Signed-off-by: linnhoff <linnhoff@fzd.tu-darmstadt.de>
1 parent 198d414 commit e9108c4

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

examples/OSMPDummySensor_flat/OSMPDummySensor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ void COSMPDummySensor::set_fmi_sensor_data_out()
170170
integer_vars[FMI_INTEGER_SENSORDATA_OUT_SIZE_IDX]=(fmi2Integer)currentOutputBuffer.length();
171171
normal_log("OSMP","Providing %08X %08X, writing from %p ...",integer_vars[FMI_INTEGER_SENSORDATA_OUT_BASEHI_IDX],integer_vars[FMI_INTEGER_SENSORDATA_OUT_BASELO_IDX],currentOutputBuffer.data());
172172
std::printf("Providing %08X %08X, writing from %p ...\n",integer_vars[FMI_INTEGER_SENSORDATA_OUT_BASEHI_IDX],integer_vars[FMI_INTEGER_SENSORDATA_OUT_BASELO_IDX],currentOutputBuffer.data());
173-
//swap(currentOutputBuffer,lastOutputBuffer);
173+
swap(currentOutputBuffer,lastOutputBuffer);
174174
}
175175

176176
void COSMPDummySensor::reset_fmi_sensor_data_out()

examples/OSMPDummySource_flat/OSMPDummySource.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,13 @@ void encode_pointer_to_integer(const void* ptr,fmi2Integer& hi,fmi2Integer& lo)
112112
#endif
113113
}
114114

115-
//void COSMPDummySource::set_fmi_sensor_view_out(const osi3::SensorView& data)
116115
void COSMPDummySource::set_fmi_sensor_view_out()
117116
{
118-
//data.SerializeToString(currentBuffer);
119-
//encode_pointer_to_integer(currentBuffer->data(),integer_vars[FMI_INTEGER_SENSORVIEW_OUT_BASEHI_IDX],integer_vars[FMI_INTEGER_SENSORVIEW_OUT_BASELO_IDX]);
120117
encode_pointer_to_integer(currentBuffer.data(), integer_vars[FMI_INTEGER_SENSORVIEW_OUT_BASEHI_IDX], integer_vars[FMI_INTEGER_SENSORVIEW_OUT_BASELO_IDX]);
121118
integer_vars[FMI_INTEGER_SENSORVIEW_OUT_SIZE_IDX]=(fmi2Integer)currentBuffer.length();
122119
normal_log("OSMP","Providing %08X %08X, writing from %p ...",integer_vars[FMI_INTEGER_SENSORVIEW_OUT_BASEHI_IDX],integer_vars[FMI_INTEGER_SENSORVIEW_OUT_BASELO_IDX],currentBuffer.data());
123120
std::printf("Providing %08X %08X, writing from %p ...\n",integer_vars[FMI_INTEGER_SENSORVIEW_OUT_BASEHI_IDX],integer_vars[FMI_INTEGER_SENSORVIEW_OUT_BASELO_IDX],currentBuffer.data());
124-
//swap(currentBuffer,lastBuffer);
121+
swap(currentBuffer,lastBuffer);
125122
}
126123

127124
void COSMPDummySource::reset_fmi_sensor_view_out()

examples/OSMPDummySource_flat/OSMPDummySource.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,7 @@ class COSMPDummySource {
192192
fmi2Integer integer_vars[FMI_INTEGER_VARS];
193193
fmi2Real real_vars[FMI_REAL_VARS];
194194
string string_vars[FMI_STRING_VARS];
195-
//string* currentBuffer;
196195
string currentBuffer;
197-
//string* lastBuffer;
198196
string lastBuffer;
199197

200198
/* Simple Accessors */

0 commit comments

Comments
 (0)