i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Flushing last changes in preparation of replacing the old BMessage with Message4.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16707 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2006-03-11 17:36:13 +00:00
parent 40fc37b0ae
commit be25ae8698
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/app/Message4.cpp
+22 -10
View File
@@ -55,6 +55,12 @@ static status_t handle_reply(port_id replyPort, int32 *pCode,
static status_t convert_message(const KMessage *fromMessage, static status_t convert_message(const KMessage *fromMessage,
BMessage *toMessage); BMessage *toMessage);
extern "C" {
// private os function to set the owning team of an area
status_t _kern_transfer_area(area_id area, void **_address,
uint32 addressSpec, team_id target);
}
BBlockCache *BMessage::sMsgCache = NULL; BBlockCache *BMessage::sMsgCache = NULL;
port_id BMessage::sReplyPorts[sNumReplyPorts]; port_id BMessage::sReplyPorts[sNumReplyPorts];
@@ -174,7 +180,7 @@ BMessage::_InitHeader()
{ {
DEBUG_FUNCTION_ENTER; DEBUG_FUNCTION_ENTER;
fHeader = (message_header *)malloc(sizeof(message_header)); fHeader = (message_header *)malloc(sizeof(message_header));
memset(fHeader, 0, sizeof(message_header)); memset(fHeader, 0, sizeof(message_header) - sizeof(message_header::hash_table));
fHeader->format = kMessageMagic4; fHeader->format = kMessageMagic4;
fHeader->flags = MESSAGE_FLAG_VALID; fHeader->flags = MESSAGE_FLAG_VALID;
@@ -804,8 +810,8 @@ BMessage::_NativeFlatten(char *buffer, ssize_t size) const
/* we have to sync the what code as it is a public member */ /* we have to sync the what code as it is a public member */
fHeader->what = what; fHeader->what = what;
fHeader->fields_checksum = BPrivate::CalculateChecksum((uint8 *)fFields, fHeader->fields_size); //fHeader->fields_checksum = BPrivate::CalculateChecksum((uint8 *)fFields, fHeader->fields_size);
fHeader->data_checksum = BPrivate::CalculateChecksum((uint8 *)fData, fHeader->data_size); //fHeader->data_checksum = BPrivate::CalculateChecksum((uint8 *)fData, fHeader->data_size);
memcpy(buffer, fHeader, min_c(sizeof(message_header), (size_t)size)); memcpy(buffer, fHeader, min_c(sizeof(message_header), (size_t)size));
buffer += sizeof(message_header); buffer += sizeof(message_header);
@@ -835,8 +841,8 @@ BMessage::_NativeFlatten(BDataIO *stream, ssize_t *size) const
/* we have to sync the what code as it is a public member */ /* we have to sync the what code as it is a public member */
fHeader->what = what; fHeader->what = what;
fHeader->fields_checksum = BPrivate::CalculateChecksum((uint8 *)fFields, fHeader->fields_size); //fHeader->fields_checksum = BPrivate::CalculateChecksum((uint8 *)fFields, fHeader->fields_size);
fHeader->data_checksum = BPrivate::CalculateChecksum((uint8 *)fData, fHeader->data_size); //fHeader->data_checksum = BPrivate::CalculateChecksum((uint8 *)fData, fHeader->data_size);
ssize_t result1 = stream->Write(fHeader, sizeof(message_header)); ssize_t result1 = stream->Write(fHeader, sizeof(message_header));
if (result1 != sizeof(message_header)) if (result1 != sizeof(message_header))
@@ -1091,13 +1097,13 @@ BMessage::Unflatten(const char *flatBuffer)
} }
} }
if (fHeader->fields_checksum != BPrivate::CalculateChecksum((uint8 *)fFields, fHeader->fields_size) /*if (fHeader->fields_checksum != BPrivate::CalculateChecksum((uint8 *)fFields, fHeader->fields_size)
|| fHeader->data_checksum != BPrivate::CalculateChecksum((uint8 *)fData, fHeader->data_size)) { || fHeader->data_checksum != BPrivate::CalculateChecksum((uint8 *)fData, fHeader->data_size)) {
debug_printf("checksum mismatch 2\n"); debug_printf("checksum mismatch 1\n");
_Clear(); _Clear();
_InitHeader(); _InitHeader();
return B_BAD_VALUE; return B_BAD_VALUE;
} }*/
return B_OK; return B_OK;
} }
@@ -1177,13 +1183,13 @@ BMessage::Unflatten(BDataIO *stream)
return B_BAD_VALUE; return B_BAD_VALUE;
} }
if (fHeader->fields_checksum != BPrivate::CalculateChecksum((uint8 *)fFields, fHeader->fields_size) /*if (fHeader->fields_checksum != BPrivate::CalculateChecksum((uint8 *)fFields, fHeader->fields_size)
|| fHeader->data_checksum != BPrivate::CalculateChecksum((uint8 *)fData, fHeader->data_size)) { || fHeader->data_checksum != BPrivate::CalculateChecksum((uint8 *)fData, fHeader->data_size)) {
debug_printf("checksum mismatch 2\n"); debug_printf("checksum mismatch 2\n");
_Clear(); _Clear();
_InitHeader(); _InitHeader();
return B_BAD_VALUE; return B_BAD_VALUE;
} }*/
return B_OK; return B_OK;
} }
@@ -1855,6 +1861,12 @@ BMessage::_SendMessage(port_id port, int32 token, bigtime_t timeout,
result = _FlattenToArea(&header); result = _FlattenToArea(&header);
buffer = (char *)header; buffer = (char *)header;
size = sizeof(message_header); size = sizeof(message_header);
port_info info;
get_port_info(port, &info);
void *address = NULL;
_kern_transfer_area(header->shared_area, &address, B_ANY_ADDRESS,
info.team);
} else { } else {
size = _NativeFlattenedSize(); size = _NativeFlattenedSize();
buffer = (char *)malloc(size); buffer = (char *)malloc(size);