From 16ba0dc5ca98127d39c627ae8888ea61d907efc8 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sat, 11 Mar 2006 17:52:56 +0000 Subject: [PATCH] Removing old BMessage implementation. Message4 will replace it in the next commit. This will allow to fix message related problems like drag and drop and scripting. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16708 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/app/Message.h | 434 ----- headers/private/app/MessageBody.h | 256 --- headers/private/app/MessageField.h | 791 --------- headers/private/app/MessagePrivate.h | 83 - headers/private/app/MessageUtils.h | 205 --- src/kits/app/Message.cpp | 2236 -------------------------- src/kits/app/MessageBody.cpp | 400 ----- src/kits/app/MessageField.cpp | 45 - src/kits/app/MessageUtils.cpp | 135 -- 9 files changed, 4585 deletions(-) delete mode 100644 headers/os/app/Message.h delete mode 100644 headers/private/app/MessageBody.h delete mode 100644 headers/private/app/MessageField.h delete mode 100644 headers/private/app/MessagePrivate.h delete mode 100644 headers/private/app/MessageUtils.h delete mode 100644 src/kits/app/Message.cpp delete mode 100644 src/kits/app/MessageBody.cpp delete mode 100644 src/kits/app/MessageField.cpp delete mode 100644 src/kits/app/MessageUtils.cpp diff --git a/headers/os/app/Message.h b/headers/os/app/Message.h deleted file mode 100644 index 0b1975ac3a..0000000000 --- a/headers/os/app/Message.h +++ /dev/null @@ -1,434 +0,0 @@ -/* - * Copyright 2001-2005, Haiku Inc. All Rights Reserved. - * Distributed under the terms of the MIT License. - * - * Authors: - * Erik Jaesler (erik@cgsoftware.com) - * DarkWyrm - */ -#ifdef USING_MESSAGE4 -# include -#else - -#ifndef _MESSAGE_H -#define _MESSAGE_H - -#include -#include -#include -#include -#include - -// for convenience -#include -#include - - -class BBlockCache; -class BMessenger; -class BHandler; -class BString; -struct entry_ref; - -// Private or reserved --------------------------------------------------------- -extern "C" void _msg_cache_cleanup_(); -extern "C" int _init_message_(); -extern "C" int _delete_message_(); - - -// Name lengths and Scripting specifiers --------------------------------------- -#define B_FIELD_NAME_LENGTH 255 -#define B_PROPERTY_NAME_LENGTH 255 - -enum { - B_NO_SPECIFIER = 0, - B_DIRECT_SPECIFIER, - B_INDEX_SPECIFIER, - B_REVERSE_INDEX_SPECIFIER, - B_RANGE_SPECIFIER, - B_REVERSE_RANGE_SPECIFIER, - B_NAME_SPECIFIER, - B_ID_SPECIFIER, - - B_SPECIFIERS_END = 128 - // app-defined specifiers start at B_SPECIFIERS_END+1 -}; - -namespace BPrivate { - class BMessageBody; -} - -// BMessage class -------------------------------------------------------------- -class BMessage { -public: - uint32 what; - - BMessage(); - BMessage(uint32 what); - BMessage(const BMessage &a_message); -virtual ~BMessage(); - - BMessage &operator=(const BMessage &msg); - -// Statistics and misc info - status_t GetInfo(type_code typeRequested, int32 which, char **name, - type_code *typeReturned, int32 *count = NULL) const; - - status_t GetInfo(const char *name, type_code *type, int32 *c = 0) const; - status_t GetInfo(const char *name, type_code *type, bool *fixed_size) const; - - int32 CountNames(type_code type) const; - bool IsEmpty() const; - bool IsSystem() const; - bool IsReply() const; - void PrintToStream() const; - - status_t Rename(const char *old_entry, const char *new_entry); - -// Delivery info - bool WasDelivered() const; - bool IsSourceWaiting() const; - bool IsSourceRemote() const; - BMessenger ReturnAddress() const; - const BMessage *Previous() const; - bool WasDropped() const; - BPoint DropPoint(BPoint *offset = NULL) const; - -// Replying - status_t SendReply(uint32 command, BHandler *reply_to = NULL); - status_t SendReply(BMessage *the_reply, BHandler *reply_to = NULL, - bigtime_t timeout = B_INFINITE_TIMEOUT); - status_t SendReply(BMessage *the_reply, BMessenger reply_to, - bigtime_t timeout = B_INFINITE_TIMEOUT); - - status_t SendReply(uint32 command, BMessage *reply_to_reply); - status_t SendReply(BMessage *the_reply, BMessage *reply_to_reply, - bigtime_t send_timeout = B_INFINITE_TIMEOUT, - bigtime_t reply_timeout = B_INFINITE_TIMEOUT); - -// Flattening data - ssize_t FlattenedSize() const; - status_t Flatten(char *buffer, ssize_t size) const; - status_t Flatten(BDataIO *stream, ssize_t *size = NULL) const; - status_t Unflatten(const char *flat_buffer); - status_t Unflatten(BDataIO *stream); - - -// Specifiers (scripting) - status_t AddSpecifier(const char *property); - status_t AddSpecifier(const char *property, int32 index); - status_t AddSpecifier(const char *property, int32 index, int32 range); - status_t AddSpecifier(const char *property, const char *name); - status_t AddSpecifier(const BMessage *specifier); - - status_t SetCurrentSpecifier(int32 index); - status_t GetCurrentSpecifier(int32 *index, BMessage *specifier = NULL, - int32 *form = NULL, const char **property = NULL) const; - bool HasSpecifiers() const; - status_t PopSpecifier(); - -// Adding data - status_t AddRect(const char *name, BRect a_rect); - status_t AddPoint(const char *name, BPoint a_point); - status_t AddString(const char *name, const char *a_string); - status_t AddString(const char *name, const BString& a_string); - status_t AddInt8(const char *name, int8 val); - status_t AddInt16(const char *name, int16 val); - status_t AddInt32(const char *name, int32 val); - status_t AddInt64(const char *name, int64 val); - status_t AddBool(const char *name, bool a_boolean); - status_t AddFloat(const char *name, float a_float); - status_t AddDouble(const char *name, double a_double); - status_t AddPointer(const char *name, const void *ptr); - status_t AddMessenger(const char *name, BMessenger messenger); - status_t AddRef(const char *name, const entry_ref *ref); - status_t AddMessage(const char *name, const BMessage *msg); - status_t AddFlat(const char *name, BFlattenable *obj, int32 count = 1); - status_t AddData(const char *name, type_code type, const void *data, - ssize_t numBytes, bool is_fixed_size = true, int32 count = 1); - -// Removing data - status_t RemoveData(const char *name, int32 index = 0); - status_t RemoveName(const char *name); - status_t MakeEmpty(); - -// Finding data - status_t FindRect(const char *name, BRect *rect) const; - status_t FindRect(const char *name, int32 index, BRect *rect) const; - status_t FindPoint(const char *name, BPoint *pt) const; - status_t FindPoint(const char *name, int32 index, BPoint *pt) const; - status_t FindString(const char *name, const char **str) const; - status_t FindString(const char *name, int32 index, const char **str) const; - status_t FindString(const char *name, BString *str) const; - status_t FindString(const char *name, int32 index, BString *str) const; - status_t FindInt8(const char *name, int8 *value) const; - status_t FindInt8(const char *name, int32 index, int8 *val) const; - status_t FindInt16(const char *name, int16 *value) const; - status_t FindInt16(const char *name, int32 index, int16 *val) const; - status_t FindInt32(const char *name, int32 *value) const; - status_t FindInt32(const char *name, int32 index, int32 *val) const; - status_t FindInt64(const char *name, int64 *value) const; - status_t FindInt64(const char *name, int32 index, int64 *val) const; - status_t FindBool(const char *name, bool *value) const; - status_t FindBool(const char *name, int32 index, bool *value) const; - status_t FindFloat(const char *name, float *f) const; - status_t FindFloat(const char *name, int32 index, float *f) const; - status_t FindDouble(const char *name, double *d) const; - status_t FindDouble(const char *name, int32 index, double *d) const; - status_t FindPointer(const char *name, void **ptr) const; - status_t FindPointer(const char *name, int32 index, void **ptr) const; - status_t FindMessenger(const char *name, BMessenger *m) const; - status_t FindMessenger(const char *name, int32 index, BMessenger *m) const; - status_t FindRef(const char *name, entry_ref *ref) const; - status_t FindRef(const char *name, int32 index, entry_ref *ref) const; - status_t FindMessage(const char *name, BMessage *msg) const; - status_t FindMessage(const char *name, int32 index, BMessage *msg) const; - status_t FindFlat(const char *name, BFlattenable *obj) const; - status_t FindFlat(const char *name, int32 index, BFlattenable *obj) const; - status_t FindData(const char *name, type_code type, - const void **data, ssize_t *numBytes) const; - status_t FindData(const char *name, type_code type, int32 index, - const void **data, ssize_t *numBytes) const; - -// Replacing data - status_t ReplaceRect(const char *name, BRect a_rect); - status_t ReplaceRect(const char *name, int32 index, BRect a_rect); - status_t ReplacePoint(const char *name, BPoint a_point); - status_t ReplacePoint(const char *name, int32 index, BPoint a_point); - status_t ReplaceString(const char *name, const char *string); - status_t ReplaceString(const char *name, int32 index, const char *string); - status_t ReplaceString(const char *name, const BString& string); - status_t ReplaceString(const char *name, int32 index, const BString& string); - status_t ReplaceInt8(const char *name, int8 val); - status_t ReplaceInt8(const char *name, int32 index, int8 val); - status_t ReplaceInt16(const char *name, int16 val); - status_t ReplaceInt16(const char *name, int32 index, int16 val); - status_t ReplaceInt32(const char *name, int32 val); - status_t ReplaceInt32(const char *name, int32 index, int32 val); - status_t ReplaceInt64(const char *name, int64 val); - status_t ReplaceInt64(const char *name, int32 index, int64 val); - status_t ReplaceBool(const char *name, bool a_bool); - status_t ReplaceBool(const char *name, int32 index, bool a_bool); - status_t ReplaceFloat(const char *name, float a_float); - status_t ReplaceFloat(const char *name, int32 index, float a_float); - status_t ReplaceDouble(const char *name, double a_double); - status_t ReplaceDouble(const char *name, int32 index, double a_double); - status_t ReplacePointer(const char *name, const void *ptr); - status_t ReplacePointer(const char *name,int32 index,const void *ptr); - status_t ReplaceMessenger(const char *name, BMessenger messenger); - status_t ReplaceMessenger(const char *name, int32 index, BMessenger msngr); - status_t ReplaceRef( const char *name,const entry_ref *ref); - status_t ReplaceRef( const char *name, int32 index, const entry_ref *ref); - status_t ReplaceMessage(const char *name, const BMessage *msg); - status_t ReplaceMessage(const char *name, int32 index, const BMessage *msg); - status_t ReplaceFlat(const char *name, BFlattenable *obj); - status_t ReplaceFlat(const char *name, int32 index, BFlattenable *obj); - status_t ReplaceData(const char *name, type_code type, - const void *data, ssize_t data_size); - status_t ReplaceData(const char *name, type_code type, int32 index, - const void *data, ssize_t data_size); - - void *operator new(size_t size); - void *operator new(size_t, void* p); - void operator delete(void *ptr, size_t size); - -// Private, reserved, or obsolete ---------------------------------------------- - bool HasRect(const char *, int32 n = 0) const; - bool HasPoint(const char *, int32 n = 0) const; - bool HasString(const char *, int32 n = 0) const; - bool HasInt8(const char *, int32 n = 0) const; - bool HasInt16(const char *, int32 n = 0) const; - bool HasInt32(const char *, int32 n = 0) const; - bool HasInt64(const char *, int32 n = 0) const; - bool HasBool(const char *, int32 n = 0) const; - bool HasFloat(const char *, int32 n = 0) const; - bool HasDouble(const char *, int32 n = 0) const; - bool HasPointer(const char *, int32 n = 0) const; - bool HasMessenger(const char *, int32 n = 0) const; - bool HasRef(const char *, int32 n = 0) const; - bool HasMessage(const char *, int32 n = 0) const; - bool HasFlat(const char *, const BFlattenable *) const; - bool HasFlat(const char *,int32 ,const BFlattenable *) const; - bool HasData(const char *, type_code , int32 n = 0) const; - BRect FindRect(const char *, int32 n = 0) const; - BPoint FindPoint(const char *, int32 n = 0) const; - const char *FindString(const char *, int32 n = 0) const; - int8 FindInt8(const char *, int32 n = 0) const; - int16 FindInt16(const char *, int32 n = 0) const; - int32 FindInt32(const char *, int32 n = 0) const; - int64 FindInt64(const char *, int32 n = 0) const; - bool FindBool(const char *, int32 n = 0) const; - float FindFloat(const char *, int32 n = 0) const; - double FindDouble(const char *, int32 n = 0) const; - - class Private; - -private: - class Header; - -friend class BMessageQueue; -friend class BMessenger; -friend class BApplication; -friend class Header; -friend class Private; - -friend inline void _set_message_target_(BMessage *, int32, bool); -friend inline void _set_message_reply_(BMessage *, BMessenger); -friend inline int32 _get_message_target_(BMessage *); -friend inline bool _use_preferred_target_(BMessage *); - - // deprecated - BMessage(BMessage *a_message); - -virtual void _ReservedMessage1(); -virtual void _ReservedMessage2(); -virtual void _ReservedMessage3(); - - void init_data(); - status_t flatten_target_info(BDataIO *stream, - ssize_t size, - uchar flags) const; - status_t real_flatten(char *result, - ssize_t size) const; - status_t real_flatten(BDataIO *stream) const; - char *stack_flatten(char *stack_ptr, - ssize_t stack_size, - bool incl_reply, - ssize_t *size = NULL) const; - - status_t _UnflattenKMessage(const char *buffer); - - ssize_t calc_size(uchar flags) const; - ssize_t calc_hdr_size(uchar flags) const; - status_t nfind_data( const char *name, - type_code type, - int32 index, - const void **data, - ssize_t *data_size) const; - status_t copy_data( const char *name, - type_code type, - int32 index, - void *data, - ssize_t data_size) const; - - status_t _send_(port_id port, - int32 token, - bigtime_t timeout, - bool reply_required, - BMessenger &reply_to) const; - status_t send_message(port_id port, - team_id port_owner, - int32 token, - BMessage *reply, - bigtime_t send_timeout, - bigtime_t reply_timeout) const; -static status_t _SendFlattenedMessage(void *data, int32 size, - port_id port, int32 token, bigtime_t timeout); - -static void _StaticInit(); -static void _StaticCleanup(); -static void _StaticCacheCleanup(); - - enum { sNumReplyPorts = 3 }; -static port_id sReplyPorts[sNumReplyPorts]; -static long sReplyPortInUse[sNumReplyPorts]; -static int32 sGetCachedReplyPort(); - -static BBlockCache *sMsgCache; - - struct dyn_array { - int32 fLogicalBytes; - int32 fPhysicalBytes; - int32 fChunkSize; - int32 fCount; - int32 fEntryHdrSize; - }; - - struct entry_hdr : public dyn_array { - entry_hdr *fNext; - uint32 fType; - uchar fNameLength; - char fName[1]; - }; - - struct var_chunk { - int32 fDataSize; - char fData[1]; - }; - - entry_hdr *entry_find(const char *name, uint32 type,status_t *result=NULL) const; - void entry_remove(entry_hdr *entry); - - void *da_create(int32 header_size, int32 chunk_size, - bool fixed, int32 nchunks); - status_t da_add_data(dyn_array **da, const void *data, int32 size); - void *da_find_data(dyn_array *da, int32 index, - int32 *size = NULL) const; - status_t da_delete_data(dyn_array **pda, int32 index); - status_t da_replace_data(dyn_array **pda, int32 index, - const void *data, int32 dsize); - int32 da_calc_size(int32 hdr_size, int32 chunksize, - bool is_fixed, int32 nchunks) const; - void *da_grow(dyn_array **pda, int32 increase); - void da_dump(dyn_array *da); - - int32 da_chunk_hdr_size() const - { return sizeof(int32); } - int32 da_chunk_size(var_chunk *v) const - { return (v->fDataSize + da_chunk_hdr_size() + 7) & ~7; } - var_chunk *da_first_chunk(dyn_array *da) const - { return (var_chunk *) da_start_of_data(da); } - var_chunk *da_next_chunk(var_chunk *v) const - { return (var_chunk *) (((char*) v) + da_chunk_size(v)); } - var_chunk *da_chunk_ptr(void *data) const - { return (var_chunk*) (((char *) data) - da_chunk_hdr_size()); } - - int32 da_pad_8(int32 val) const - { return (val + 7) & ~7; } - int32 da_total_size(dyn_array *da) const - { return (int32)sizeof(dyn_array) + da->fEntryHdrSize + - da->fPhysicalBytes; } - int32 da_total_logical_size(dyn_array *da) const - { return (int32)sizeof(dyn_array) + da->fEntryHdrSize + - da->fLogicalBytes; } - char *da_start_of_data(dyn_array *da) const - { return ((char *) da) + (sizeof(dyn_array) + - da->fEntryHdrSize); } - bool da_is_mini_data(dyn_array *da) const - { return ((da->fLogicalBytes <= (int32) UCHAR_MAX) && - (da->fCount <= (int32) UCHAR_MAX));} - void da_swap_var_sized(dyn_array *da); - void da_swap_fixed_sized(dyn_array *da); - - BMessage *fQueueLink; - int32 fTarget; - BMessage *fOriginal; - uint32 fChangeCount; - int32 fCurSpecifier; - uint32 fPtrOffset; - - // ejaesler: Stealing one for my whacky BMessageBody l33tness - uint32 _reserved[2]; - BPrivate::BMessageBody* fBody; - - BMessage::entry_hdr *fEntries; - - struct reply_to_info { - port_id port; - int32 target; - team_id team; - bool preferred; - } fReplyTo; - - bool fPreferred; - bool fReplyRequired; - bool fReplyDone; - bool fIsReply; - bool fWasDelivered; - bool fReadOnly; - bool fHasSpecifiers; -}; - -#endif // _MESSAGE_H -#endif // USING_MESSAGE4 - diff --git a/headers/private/app/MessageBody.h b/headers/private/app/MessageBody.h deleted file mode 100644 index fe8290550c..0000000000 --- a/headers/private/app/MessageBody.h +++ /dev/null @@ -1,256 +0,0 @@ -//------------------------------------------------------------------------------ -// Copyright (c) 2001-2002, OpenBeOS -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// File Name: MessageBody.h -// Author(s): Erik Jaesler (erik@cgsoftware.com) -// Description: BMessageBody handles data storage and retrieval for -// BMessage. -//------------------------------------------------------------------------------ - -#ifndef MESSAGEBODY_H -#define MESSAGEBODY_H -#include -// Standard Includes ----------------------------------------------------------- -#include -#include -#include -#include - -// System Includes ------------------------------------------------------------- -#include -#include -#include -#include -//#include -#include -#include - -// Project Includes ------------------------------------------------------------ - -// Local Includes -------------------------------------------------------------- - -// Local Defines --------------------------------------------------------------- - -// Globals --------------------------------------------------------------------- - -enum { B_FLATTENABLE_TYPE = 'FLAT' }; - -using namespace std; - -namespace BPrivate { - -class BMessageBody -{ -public: - BMessageBody(); - BMessageBody(const BMessageBody& rhs); - ~BMessageBody(); - - BMessageBody& operator=(const BMessageBody& rhs); - -// Statistics and misc info - status_t GetInfo(type_code typeRequested, int32 which, char **name, - type_code *typeReturned, int32 *count = NULL) const; - - status_t GetInfo(const char *name, type_code *type, int32 *c = 0) const; - status_t GetInfo(const char *name, type_code *type, bool *fixed_size) const; - - int32 CountNames(type_code type) const; - bool IsEmpty() const; - bool IsSystem() const; - bool IsReply() const; - void PrintToStream() const; - - status_t Rename(const char *old_entry, const char *new_entry); - -// Flattening data - ssize_t FlattenedSize() const; - status_t Flatten(BDataIO *stream) const; - -// Removing data - status_t RemoveData(const char *name, int32 index = 0); - status_t RemoveName(const char *name); - status_t MakeEmpty(); - - bool HasData(const char* name, type_code t, int32 n) const; - - template - status_t AddData(const char* name, const T1& data, type_code type); - status_t AddData(const char* name, type_code type, const void* data, ssize_t numBytes, bool is_fixed_size, int32); - status_t FindData(const char* name, type_code type, int32 index, - const void** data, ssize_t* numBytes) const; - template - status_t FindData(const char* name, int32 index, T1* data, type_code type); - template - status_t ReplaceData(const char* name, int32 index, const T1& data, type_code type); - -#if 0 - void *operator new(size_t size); - void operator delete(void *ptr, size_t size); -#endif - -private: - BMessageField* FindData(const char *name, type_code type, - status_t& err) const; - - typedef std::map TMsgDataMap; - TMsgDataMap fData; - ssize_t fFlattenedSize; -}; -//------------------------------------------------------------------------------ -template -status_t BMessageBody::AddData(const char *name, const T1 &data, type_code type) -{ - // The flattened message format in R5 only allows 1 byte - // for the length of field names - if (!name || (strlen(name) > 255)) return B_BAD_VALUE; - - status_t err = B_OK; - BMessageField* BMF = FindData(name, type, err); - - if (err) - { - if (err == B_NAME_NOT_FOUND) - { - // Reset err; we'll create the field - err = B_OK; - } - else - { - // Looking for B_BAD_TYPE here in particular, which would indicate - // that we tried to add data of type X when we already had data of - // type Y with the same name - return err; - } - } - - if (!BMF) - { - BMF = new(nothrow) BMessageFieldImpl(name, type); - if (BMF) - { - fData[name] = BMF; - } - else - { - err = B_NO_MEMORY; - } - } - - if (!err) - { - BMessageFieldImpl* RItem = - dynamic_cast*>(BMF); - if (!RItem) - { - debugger("\n\n\tyou \033[44;1;37mB\033[41;1;37me\033[m screwed\n\n"); - } - RItem->AddItem(data); - } - - return err; -} -//------------------------------------------------------------------------------ -template -status_t BMessageBody::FindData(const char *name, int32 index, T1 *data, - type_code type) -{ - if (!name) - { - return B_BAD_VALUE; - } - if (index < 0) - { - return B_BAD_INDEX; - } - - status_t err = B_OK; - BMessageField* Item = FindData(name, type, err); - if (Item) - { - BMessageFieldImpl* RItem = - dynamic_cast*>(Item); - if (!RItem) - { - debugger("\n\n\tyou \033[44;1;37mB\033[41;1;37me" - "\033[m screwed\n\n"); - } - if (index < RItem->CountItems()) - { - *data = RItem->Data()[index]; - } - else - { - err = B_BAD_INDEX; - } - } - - return err; -} -//------------------------------------------------------------------------------ -template -status_t BMessageBody::ReplaceData(const char *name, int32 index, - const T1 &data, type_code type) -{ - if (!name) - { - return B_BAD_VALUE; - } - if (index < 0) - { - return B_BAD_INDEX; - } - - status_t err = B_OK; - BMessageField* Item = FindData(name, type, err); - if (Item) - { - BMessageFieldImpl* RItem = - dynamic_cast*>(Item); - if (!RItem) - { - debugger("\n\n\tyou \033[44;1;37mB\033[41;1;37me\033[m screwed\n\n"); - } - if (index < (int32)RItem->Data().Size()) - { - RItem->Data()[index] = data; - } - else - { - err = B_BAD_INDEX; - } - } - - return err; -} -//------------------------------------------------------------------------------ - -} // namespace BPrivate - -#endif //MESSAGEBODY_H - -/* - * $Log $ - * - * $Id $ - * - */ - diff --git a/headers/private/app/MessageField.h b/headers/private/app/MessageField.h deleted file mode 100644 index 6e958f457f..0000000000 --- a/headers/private/app/MessageField.h +++ /dev/null @@ -1,791 +0,0 @@ -//------------------------------------------------------------------------------ -// Copyright (c) 2001-2002, OpenBeOS -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// File Name: MessageField.h -// Author(s): Erik Jaesler (erik@cgsoftware.com) -// Description: BMessageField contains and manages the data for indiviual -// named field in BMessageBody -//------------------------------------------------------------------------------ - -#ifndef MESSAGEFIELD_H -#define MESSAGEFIELD_H - -// Standard Includes ----------------------------------------------------------- -#include -#include -#include -#include -#include - -// System Includes ------------------------------------------------------------- -#include -#include -#include -#include -#include -#include - -// Project Includes ------------------------------------------------------------ -#include -#include - -// Local Includes -------------------------------------------------------------- - -// Local Defines --------------------------------------------------------------- -// flags for each entry (the bitfield is 1 byte) -#define MSG_FLAG_VALID 0x01 -#define MSG_FLAG_MINI_DATA 0x02 -#define MSG_FLAG_FIXED_SIZE 0x04 -#define MSG_FLAG_SINGLE_ITEM 0x08 -#define MSG_FLAG_ALL 0x0F - -#define MSG_LAST_ENTRY 0x0 - -using namespace std; - -// Globals --------------------------------------------------------------------- -namespace BPrivate { - -class BMessageField -{ - public: - static const char* sNullData; - - BMessageField(const std::string& name, type_code t) - : fType(t), fName(name) - {;} - virtual ~BMessageField() {} - virtual const std::string& Name() const { return fName; } - virtual type_code Type() const { return fType; } - virtual bool FixedSize() const { return true; } - virtual ssize_t FlattenedSize() const { return 0; } - virtual status_t Flatten(BDataIO& stream) const = 0; - virtual ssize_t CountItems() const { return 0; } - virtual void RemoveItem(ssize_t index) = 0; - virtual void PrintToStream(const char* name) const; - virtual const void* DataAt(int32 index, ssize_t* size) const = 0; - - virtual BMessageField* Clone() const = 0; - - protected: - virtual void PrintDataItem(int32 index) const = 0; - - private: - type_code fType; - std::string fName; -}; - -//------------------------------------------------------------------------------ -template -struct BMessageFieldStoragePolicy -{ - class Store - { - public: - // Compiler-generated versions should be just fine - #if 0 - Store(); - Store(const Store& rhs); - ~Store(); - Store& operator=(const Store& rhs); - #endif - inline size_t Size() const { return fData.size(); } - inline T& operator[](uint index) { return fData[index]; } - inline const T& operator[](uint index) const { return fData[index]; } - inline void Add(const T& data) { fData.push_back(data); } - inline void Remove(uint index) { fData.erase(fData.begin() + index); } - inline void Copy(const Store& rhs) { fData = rhs.fData; } - - private: - std::vector fData; - }; -}; -//------------------------------------------------------------------------------ -template -struct BMessageFieldSizePolicy -{ - typedef typename BMessageFieldStoragePolicy::Store Store; - - inline static size_t Size(const T&) { return sizeof (T); } - inline static size_t Size(const Store& data) - { - return sizeof (T) * data.Size(); - } - inline static bool Fixed() { return true; } - inline static size_t Padding(const T&) { return 0; } - inline static size_t Padding(const Store& data) { return 0; } -}; -//------------------------------------------------------------------------------ -template -struct BMessageFieldPrintPolicy -{ - static void PrintData(const T& data) {;} -}; -//------------------------------------------------------------------------------ -template -struct BMessageFieldFlattenPolicy -{ - typedef BMessageFieldSizePolicy SizePolicy; - - inline static status_t Flatten(BDataIO& stream, const T& data) - { - return stream.Write((const void*)&data, SizePolicy::Size(data)); - } -}; -//------------------------------------------------------------------------------ -template -struct BMessageFieldGetDataPolicy -{ - inline static const void* GetData(const T* data) - { return (const void*)data; } -}; -//------------------------------------------------------------------------------ - -//------------------------------------------------------------------------------ -template -< - class T1, - class StoragePolicy = BMessageFieldStoragePolicy, - class SizePolicy = BMessageFieldSizePolicy, - class PrintPolicy = BMessageFieldPrintPolicy, - class FlattenPolicy = BMessageFieldFlattenPolicy, - class GetDataPolicy = BMessageFieldGetDataPolicy -> -class BMessageFieldImpl : public BMessageField -{ - public: - typedef typename StoragePolicy::Store StorageType; - - BMessageFieldImpl(const std::string& name, type_code type) - : BMessageField(name, type), - fMaxSize(0), - fFlags(MSG_FLAG_ALL) - {;} - virtual ~BMessageFieldImpl() {} - - virtual bool FixedSize() const - { return fFlags & MSG_FLAG_FIXED_SIZE; } - virtual ssize_t FlattenedSize() const; - virtual status_t Flatten(BDataIO& stream) const; - virtual ssize_t CountItems() const { return fData.Size(); } - virtual void AddItem(const T1& data); - virtual void RemoveItem(ssize_t index) - { fData.Remove(index); }; - - virtual const void* DataAt(int32 index, ssize_t* size) const; - - virtual BMessageField* Clone() const; - - StorageType& Data() { return fData; } - - protected: - virtual void PrintDataItem(int32 index) const; - - private: - StorageType fData; - size_t fMaxSize; - uchar fFlags; -}; -//------------------------------------------------------------------------------ - - -//------------------------------------------------------------------------------ -template -< - class T1, - class StoragePolicy, - class SizePolicy, - class PrintPolicy, - class FlattenPolicy, - class GetDataPolicy -> -ssize_t -BMessageFieldImpl:: -FlattenedSize() const -{ - // Mandatory stuff - ssize_t size = 1; // field flags byte - size += sizeof (type_code); // field type bytes - if (!(fFlags & MSG_FLAG_SINGLE_ITEM)) // item count byte - { - if (fFlags & MSG_FLAG_MINI_DATA) - ++size; // item count byte for mini data - else - size += 4; // item count bytes for maxi data - } - - if (fFlags & MSG_FLAG_MINI_DATA) - ++size; // data length byte for mini data - else - size += 4; // data length bytes for maxi data - - ++size; // name length byte - size += Name().length(); // name length - - // item data length - size += SizePolicy::Size(fData); - - // Calculate any necessary padding - if (!SizePolicy::Fixed()) - { - size += 4 * fData.Size(); - size += SizePolicy::Padding(fData); -#if 0 - for (uint32 i = 0; i < fData.Size(); ++i) - { - // pad to 8-byte boundary, including size bytes in calculation - size += calc_padding(SizePolicy::Size(fData[i]) + 4, 8); - // item size bytes - size += 4; - } -#endif - } - - return size; -} -//------------------------------------------------------------------------------ -template -< - class T1, - class StoragePolicy, - class SizePolicy, - class PrintPolicy, - class FlattenPolicy, - class GetDataPolicy -> -status_t -BMessageFieldImpl:: -Flatten(BDataIO& stream) const -{ - status_t err = B_OK; - type_code type = Type(); - uint32 count = fData.Size(); - uint8 nameLen = Name().length(); - size_t size = SizePolicy::Size(fData); - - err = stream.Write(&fFlags, sizeof (fFlags)); - - // Field type_code - if (err >= 0) - err = stream.Write(&type, sizeof (type_code)); - - // Item count, if more than one - if (err >= 0 && !(fFlags & MSG_FLAG_SINGLE_ITEM)) - { - if (fFlags & MSG_FLAG_MINI_DATA) - { - uint8 miniCount = count; - err = stream.Write(&miniCount, sizeof (miniCount)); - } - else - { - err = stream.Write(&count, sizeof (count)); - } - } - - // Data length - if (err >= 0) - { - if (!(fFlags & MSG_FLAG_FIXED_SIZE)) - { - // Add the bytes for holding the item size for each item - size += 4 * fData.Size(); - size += SizePolicy::Padding(fData); - } - if (fFlags & MSG_FLAG_MINI_DATA) - { - uint8 miniSize = size; - err = stream.Write(&miniSize, sizeof (miniSize)); - } - else - { - err = stream.Write(&size, sizeof (size)); - } - } - - // Name length - if (err >= 0) - err = stream.Write(&nameLen, sizeof (nameLen)); - - // Name - if (err >= 0) - err = stream.Write(Name().c_str(), Name().length()); - - // Actual data items - for (uint32 i = 0; i < fData.Size() && err >= 0; ++i) - { - if (!SizePolicy::Fixed()) - { - size = (int32)SizePolicy::Size(fData[i]); - err = stream.Write(&size, sizeof (size)); - } - if (err >= 0) - { - err = FlattenPolicy::Flatten(stream, fData[i]); - } - if (err >= 0 && !SizePolicy::Fixed()) - { - // Add any necessary padding - err = stream.Write(BMessageField::sNullData, - SizePolicy::Padding(fData[i])); - } - } - - if (err >= 0) - err = B_OK; - return err; -} -//------------------------------------------------------------------------------ -template -< - class T1, - class StoragePolicy, - class SizePolicy, - class PrintPolicy, - class FlattenPolicy, - class GetDataPolicy -> -void -BMessageFieldImpl:: -AddItem(const T1& data) -{ - fData.Add(data); - - if (fMaxSize) - { - if ((fFlags & MSG_FLAG_FIXED_SIZE) && - (!SizePolicy::Fixed() || - fMaxSize != SizePolicy::Size(data))) - { - fMaxSize = max(SizePolicy::Size(data), fMaxSize); - fFlags &= ~MSG_FLAG_FIXED_SIZE; - } - } - else - { - if (!SizePolicy::Fixed()) - { - fFlags &= ~MSG_FLAG_FIXED_SIZE; - } - fMaxSize = SizePolicy::Size(data); - } - - if (fFlags & MSG_FLAG_MINI_DATA) - { - int32 size = SizePolicy::Size(fData); - if (!(fFlags & MSG_FLAG_FIXED_SIZE)) - { - size += 4 * fData.Size(); - size += SizePolicy::Padding(fData); - } - if (size > 255) - fFlags &= ~MSG_FLAG_MINI_DATA; - } - - if (fData.Size() > 1) - fFlags &= ~MSG_FLAG_SINGLE_ITEM; -} -//------------------------------------------------------------------------------ -template -< - class T1, - class StoragePolicy, - class SizePolicy, - class PrintPolicy, - class FlattenPolicy, - class GetDataPolicy -> -const void* -BMessageFieldImpl:: -DataAt(int32 index, ssize_t* size) const -{ - if (index < CountItems()) - { - *size = SizePolicy::Size(fData[index]); - const T1& ref = fData[index]; - const T1* data = &ref; - - return GetDataPolicy::GetData(data);//(const void*)data; - } - - return NULL; -} -//------------------------------------------------------------------------------ -template -< - class T1, - class StoragePolicy, - class SizePolicy, - class PrintPolicy, - class FlattenPolicy, - class GetDataPolicy -> -BMessageField* -BMessageFieldImpl:: -Clone() const -{ - BMessageFieldImpl* BMF = - new(nothrow) BMessageFieldImpl(Name(), Type()); - if (BMF) - { - BMF->fMaxSize = fMaxSize; - BMF->fFlags = fFlags; - BMF->fData.Copy(fData); - } - return BMF; -} -//------------------------------------------------------------------------------ -template -< - class T1, - class StoragePolicy, - class SizePolicy, - class PrintPolicy, - class FlattenPolicy, - class GetDataPolicy -> -void -BMessageFieldImpl:: -PrintDataItem(int32 index) const -{ - if (index && FixedSize()) - { - std::printf(" "); - } - else - { - std::printf("size=%2ld, ", SizePolicy::Size(fData[index])); - } - std::printf("data[%ld]: ", index); - PrintPolicy::PrintData(fData[index]); -} -//------------------------------------------------------------------------------ - - -// Print policy specializations ------------------------------------------------ -template<> struct BMessageFieldPrintPolicy -{ - static void PrintData(const bool& b) { std::printf("%d", int(b)); } -}; -template<> struct BMessageFieldPrintPolicy -{ - static void PrintData(const int8& i) - { std::printf("0x%X (%d, '%c')", int(i), int(i), char(i)); } -}; -template<> struct BMessageFieldPrintPolicy -{ - static void PrintData(const int16& i) - { std::printf("0x%X (%d, '%c')", i, i, char(i)); } -}; -template<> struct BMessageFieldPrintPolicy -{ - static void PrintData(const int32& i) - { std::printf("0x%lX (%ld, '%c')", i, i, char(i)); } -}; -template<> struct BMessageFieldPrintPolicy -{ - static void PrintData(const int64& i) - { std::printf("0x%LX (%Ld, '%c')", i, i, char(i)); } -}; -template<> struct BMessageFieldPrintPolicy -{ - static void PrintData(const float& f) { std::printf("%.4f", f); } -}; -template<> struct BMessageFieldPrintPolicy -{ - static void PrintData(const double& d) { std::printf("%.8f", d); } -}; -template<> struct BMessageFieldPrintPolicy -{ - static void PrintData(const BString& s) { std::printf("\"%s\"", s.String()); } -}; -template<> struct BMessageFieldPrintPolicy -{ - static void PrintData(const BPoint& p) { std::printf("BPoint(x:%.1f, y:%.1f)", p.x, p.y); } -}; -template<> struct BMessageFieldPrintPolicy -{ - static void PrintData(const BRect& r) - { std::printf("BRect(l:%.1f, t:%.1f, r:%.1f, b:%.1f)", r.left, r.top, r.right, r.bottom); } -}; -template<> struct BMessageFieldPrintPolicy -{ - static void PrintData(const entry_ref& ref) - { - std::printf("device=%ld, directory=%Ld, name=\"%s\", path=\"%s\"", - ref.device, ref.directory, ref.name, BPath(&ref).Path()); - } -}; -// Storage policy specializations ---------------------------------------------- -template<> -struct BMessageFieldStoragePolicy -{ - class Store - { - private: - struct Boolean - { - Boolean() : data(bool()) {;} - Boolean(bool b) : data(b) {;} - bool data; - }; - - public: - inline size_t Size() const - { return fData.size(); } - inline bool& operator[](uint index) - { return fData[index].data; } - inline const bool& operator[](uint index) const - { return fData[index].data; } - inline void Add(const bool& data) - { - fData.push_back(data); - } - inline void Remove(uint index) - { - fData.erase(fData.begin() + index); - } - inline void Copy(const Store& rhs) - { - if (&fData != &rhs.fData) - { - fData = rhs.fData; - } - } - - private: - std::vector fData; - }; -}; -//------------------------------------------------------------------------------ -template<> -struct BMessageFieldStoragePolicy -{ - class Store - { - public: - inline size_t Size() const - { return fData.size(); } - inline BDataBuffer& operator[](uint index) - { return fData[index]; } - inline const BDataBuffer& operator[](uint index) const - { return fData[index]; } - inline void Add(const BDataBuffer& data) - { fData.push_back(data); } - inline void Remove(uint index) - { fData.erase(fData.begin() + index); } - void Copy(const Store& rhs) - { - if (&fData == &rhs.fData) - { - return; - } - - fData.clear(); - for (size_t i = 0; i < rhs.Size(); ++i) - { - Add(BDataBuffer(rhs[i], true)); - } - } - - private: - std::vector fData; - }; -}; -// Size policy specializations ------------------------------------------------- -template<> struct BMessageFieldSizePolicy -{ - typedef BMessageFieldStoragePolicy::Store Store; - - inline static size_t Size(const BString& s) { return s.Length() + 1; } - inline static size_t Size(const Store& data) - { - size_t size = 0; - for (uint32 i = 0; i < data.Size(); ++i) - { - size += Size(data[i]); - } - return size; - } - inline static bool Fixed() { return false; } - inline static size_t Padding(const BString& s) - { - // Padding calculations are only done for variable-sized items, - // which by definition have four bytes of size info preceeding the - // actual data; those four bytes are included in the padding - // calculation. Padding is calculated to an 8-byte boundary - return calc_padding(Size(s) + 4, 8); - } - inline static size_t Padding(const Store& data) - { - size_t size = 0; - for (uint32 i = 0; i < data.Size(); ++i) - { - size += Padding(data[i]); - } - return size; - } -}; -//------------------------------------------------------------------------------ -template<> struct BMessageFieldSizePolicy -{ - typedef BMessageFieldStoragePolicy::Store Store; - - inline static size_t Size(const BDataBuffer& db) - { return db.BufferSize(); } - inline static size_t Size(const Store& data) - { - size_t size = 0; - for (uint32 i = 0; i < data.Size(); ++i) - { - size += Size(data[i]); - } - - return size; - } - inline static bool Fixed() { return false; } - inline static size_t Padding(const BDataBuffer& db) - { - // Padding calculations are only done for variable-sized items, - // which by definition have four bytes of size info preceeding the - // actual data; those four bytes are included in the padding - // calculation. Padding is calculated to an 8-byte boundary - return calc_padding(Size(db) + 4, 8); - } - inline static size_t Padding(const Store& data) - { - size_t size = 0; - for (uint32 i = 0; i < data.Size(); ++i) - { - size += Padding(data[i]); - } - return size; - } -}; -//------------------------------------------------------------------------------ -template<> struct BMessageFieldSizePolicy -{ - typedef BMessageFieldStoragePolicy::Store Store; - - inline static size_t Size(const BMessage* msg) - { return msg->FlattenedSize(); } - inline static size_t Size(const Store& data) - { - size_t size = 0; - for (uint32 i = 0; i < data.Size(); ++i) - { - size += Size(data[i]); - } - - return size; - } - inline static bool Fixed() { return false; } - inline static size_t Padding(const BMessage* msg) - { - // Padding calculations are only done for variable-sized items, - // which by definition have four bytes of size info preceeding the - // actual data; those four bytes are included in the padding - // calculation. Padding is calculated to an 8-byte boundary - return calc_padding(Size(msg) + 4, 8); - } - inline static size_t Padding(const Store& data) - { - size_t size = 0; - for (uint32 i = 0; i < data.Size(); ++i) - { - size += Padding(data[i]); - } - return size; - } -}; -// Flatten policy specializations ---------------------------------------------- -template<> -struct BMessageFieldFlattenPolicy -{ - typedef BMessageFieldSizePolicy SizePolicy; - - static status_t Flatten(BDataIO& stream, const BString& data) - { - size_t size = SizePolicy::Size(data); - status_t err = stream.Write((const void*)data.String(), size); - - if (err > 0) - err = B_OK; - return err; - } -}; -//------------------------------------------------------------------------------ -template<> -struct BMessageFieldFlattenPolicy -{ - typedef BMessageFieldSizePolicy SizePolicy; - - static status_t Flatten(BDataIO& stream, const BMessage* data) - { - status_t err = data->Flatten(&stream); - - if (err > 0) - err = B_OK; - return err; - } -}; -//------------------------------------------------------------------------------ -template<> -struct BMessageFieldFlattenPolicy -{ - typedef BMessageFieldSizePolicy SizePolicy; - - static status_t Flatten(BDataIO& stream, const BDataBuffer& db) - { - size_t size = SizePolicy::Size(db); - status_t err = stream.Write(db.Buffer(), size); - if (err > 0) - err = B_OK; - return err; - } -}; -// GetData policy specializations ---------------------------------------------- -template<> -struct BMessageFieldGetDataPolicy -{ - inline static const void* GetData(const BDataBuffer* data) - { return data->Buffer(); } -}; -//------------------------------------------------------------------------------ -template<> -struct BMessageFieldGetDataPolicy -{ - inline static const void* GetData(const BString* data) - { return data->String(); } -}; -//------------------------------------------------------------------------------ - -} // namespace BPrivate - -#endif // MESSAGEFIELD_H - -/* - * $Log $ - * - * $Id $ - * - */ - diff --git a/headers/private/app/MessagePrivate.h b/headers/private/app/MessagePrivate.h deleted file mode 100644 index be1ae2aff0..0000000000 --- a/headers/private/app/MessagePrivate.h +++ /dev/null @@ -1,83 +0,0 @@ -//------------------------------------------------------------------------------ -// MessagePrivate.h -// -//------------------------------------------------------------------------------ - -#ifdef USING_MESSAGE4 -# include -#else - -#ifndef MESSAGEPRIVATE_H -#define MESSAGEPRIVATE_H - -#include -#include -#include -#include - -class BMessage::Private { - public: - Private(BMessage* msg) : fMessage(msg) {;} - Private(BMessage& msg) : fMessage(&msg) {;} - - inline void SetTarget(int32 token) - { - fMessage->fTarget = token; - fMessage->fPreferred = token == B_PREFERRED_TOKEN; - } - - inline void SetReply(team_id team, port_id port, int32 token) - { - fMessage->fReplyTo.port = port; - fMessage->fReplyTo.target = token; - fMessage->fReplyTo.team = team; - fMessage->fReplyTo.preferred = token == B_PREFERRED_TOKEN; - } - - inline void SetReply(BMessenger messenger) - { - BMessenger::Private mp(messenger); - fMessage->fReplyTo.port = mp.Port(); - fMessage->fReplyTo.target = mp.Token(); - fMessage->fReplyTo.team = mp.Team(); - fMessage->fReplyTo.preferred = mp.IsPreferredTarget(); - } - - inline int32 GetTarget() - { - return fMessage->fTarget; - } - - inline bool UsePreferredTarget() - { - return fMessage->fPreferred; - } - - static inline status_t SendFlattenedMessage(void *data, int32 size, - port_id port, int32 token, bigtime_t timeout) - { - return BMessage::_SendFlattenedMessage(data, size, port, token, - timeout); - } - - static inline void StaticInit() - { - BMessage::_StaticInit(); - } - - static inline void StaticCleanup() - { - BMessage::_StaticCleanup(); - } - - static inline void StaticCacheCleanup() - { - BMessage::_StaticCacheCleanup(); - } - - private: - BMessage* fMessage; -}; - -#endif // MESSAGEPRIVATE_H -#endif // USING_MESSAGE4 diff --git a/headers/private/app/MessageUtils.h b/headers/private/app/MessageUtils.h deleted file mode 100644 index a96333ae8b..0000000000 --- a/headers/private/app/MessageUtils.h +++ /dev/null @@ -1,205 +0,0 @@ -#ifdef USING_MESSAGE4 -# include -#else -//------------------------------------------------------------------------------ -// MessageUtils.h -// -//------------------------------------------------------------------------------ - -#ifndef MESSAGEUTILS_H -#define MESSAGEUTILS_H - -// Standard Includes ----------------------------------------------------------- - -// System Includes ------------------------------------------------------------- -#include -#include -#include -#include -#include -#include -#include - -// Project Includes ------------------------------------------------------------ - -// Local Includes -------------------------------------------------------------- - -// Local Defines --------------------------------------------------------------- - -// Globals --------------------------------------------------------------------- - -uint32 _checksum_(const uchar *buf, int32 size); - -namespace BPrivate { // Only putting these here because Be did - -status_t entry_ref_flatten(char* buffer, size_t* size, const entry_ref* ref); -status_t entry_ref_unflatten(entry_ref* ref, const char* buffer, size_t size); -status_t entry_ref_swap(char* buffer, size_t size); - -size_t calc_padding(size_t size, size_t boundary); - -} // namespace BPrivate - -//------------------------------------------------------------------------------ -// _set_message_target_ -/*! \brief Sets the target of a message. - - \param message The message. - \param token The target handler token. - \param preferred Indicates whether to use the looper's preferred handler. -*/ -inline -void -_set_message_target_(BMessage *message, int32 token, bool preferred) -{ - message->fTarget = token; - message->fPreferred = preferred; -} -//------------------------------------------------------------------------------ -// _set_message_reply_ -/*! \brief Sets a message's reply target. - - \param message The message. - \param messenger The reply messenger. -*/ -inline -void -_set_message_reply_(BMessage *message, BMessenger messenger) -{ - BMessenger::Private messengerPrivate(messenger); - message->fReplyTo.port = messengerPrivate.Port(); - message->fReplyTo.target = messengerPrivate.Token(); - message->fReplyTo.team = messengerPrivate.Team(); - message->fReplyTo.preferred = messengerPrivate.IsPreferredTarget(); -} -//------------------------------------------------------------------------------ -inline int32 _get_message_target_(BMessage *msg) -{ - return msg->fTarget; -} -//------------------------------------------------------------------------------ -inline bool _use_preferred_target_(BMessage *msg) -{ - return msg->fPreferred; -} -//------------------------------------------------------------------------------ -inline status_t normalize_err(status_t err) -{ - return err >= 0 ? B_OK : err; -} -//------------------------------------------------------------------------------ -template -inline void byte_swap(T& /*data*/) -{ - // Specialize for data types which actually swap -} -//------------------------------------------------------------------------------ -inline void write_helper(BDataIO* stream, const void* data, size_t size, - status_t& err) -{ - err = normalize_err(stream->Write(data, size)); -} -//------------------------------------------------------------------------------ -// Will the template madness never cease?? -template -inline status_t write_helper(BDataIO* stream, T& data, status_t& err) -{ - return normalize_err(stream->Write((const void*)data, sizeof (T))); -} -//------------------------------------------------------------------------------ -class TReadHelper -{ - public: - TReadHelper(BDataIO* stream) - : fStream(stream), err(B_OK), fSwap(false) - { - ; - } - - TReadHelper(BDataIO* stream, bool swap) - : fStream(stream), err(B_OK), fSwap(swap) - { - ; - } - - template inline void operator()(T& data) - { - err = normalize_err(fStream->Read((void*)&data, sizeof (T))); - if (err) - throw err; - - if (IsSwapping()) - { - byte_swap(data); - } - } - - template inline void operator()(T data, size_t len) - { - err = normalize_err(fStream->Read((void*)data, len)); - if (err) - throw err; - } - - status_t Status() { return err; } - void SetSwap(bool yesNo) { fSwap = yesNo; } - bool IsSwapping() { return fSwap; } - - private: - BDataIO* fStream; - status_t err; - bool fSwap; -}; -//------------------------------------------------------------------------------ -class TChecksumHelper -{ - public: - TChecksumHelper(uchar* buffer) : fBuffer(buffer), fBufPtr(buffer) {;} - - template inline void Cache(const T& data) - { - *((T*)fBufPtr) = data; - fBufPtr += sizeof (T); - } - - int32 CheckSum(); - - private: - uchar* fBuffer; - uchar* fBufPtr; -}; -//------------------------------------------------------------------------------ -template inline status_t read_helper(BDataIO* stream, T& data) -{ - return normalize_err(stream->Read((void*)&data, sizeof (T))); -} -//------------------------------------------------------------------------------ -template<> inline void byte_swap(double& data) -{ - data = __swap_double(data); -} -template<> inline void byte_swap(float& data) -{ - data = __swap_float(data); -} -template<> inline void byte_swap(int64& data) -{ - data = __swap_int64(data); -} -template<> inline void byte_swap(int32& data) -{ - data = __swap_int32(data); -} -template<> inline void byte_swap(int16& data) -{ - data = __swap_int16(data); -} -template<> inline void byte_swap(entry_ref& data) -{ - byte_swap(data.device); - byte_swap(data.directory); -} -//------------------------------------------------------------------------------ - -#endif // MESSAGEUTILS_H -#endif // USING_MESSAGE4 diff --git a/src/kits/app/Message.cpp b/src/kits/app/Message.cpp deleted file mode 100644 index ee38159012..0000000000 --- a/src/kits/app/Message.cpp +++ /dev/null @@ -1,2236 +0,0 @@ -/* - * Copyright 2001-2005, Haiku. - * Distributed under the terms of the MIT License. - * - * Authors: - * Erik Jaesler (erik@cgsoftware.com) - * DarkWyrm - * Ingo Weinhold - */ - -#ifdef USING_MESSAGE4 -# include "Message4.cpp" -#else - -/** BMessage class creates objects that store data and that - * can be processed in a message loop. BMessage objects - * are also used as data containers by the archiving and - * the scripting mechanisms. - */ - -// debugging -//#define DBG(x) x -#define DBG(x) ; -#define PRINT(x) DBG({ printf("[%6ld] ", find_thread(NULL)); printf x; }) - -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include "dano_message.h" - - -static const uint32 kMessageMagic = 'FOB1'; -static const uint32 kMessageMagicSwapped = '1BOF'; - -static const uint32 kMessageMagicDano = 'FOB2'; -static const uint32 kMessageMagicDanoSwapped = '2BOF'; - -// flags for the overall message (the bitfield is 1 byte) -#define MSG_FLAG_BIG_ENDIAN 0x01 -#define MSG_FLAG_INCL_TARGET 0x02 -#define MSG_FLAG_INCL_REPLY 0x04 -#define MSG_FLAG_SCRIPT_MSG 0x08 -// These are for future improvement -#if 0 -#define MSG_FLAG_USE_PREFERRED 0x10 -#define MSG_FLAG_REPLY_WANTED 0x20 -#define MSG_FLAG_REPLY_DONE 0x40 -#define MSG_FLAG_IS_REPLY 0x80 - -#define MSG_FLAG_HDR_MASK 0xF0 -#endif - -#define MSG_HEADER_MAX_SIZE 38 -#define MSG_NAME_MAX_SIZE 256 - -// Globals --------------------------------------------------------------------- - -using namespace BPrivate; - -const char* B_SPECIFIER_ENTRY = "specifiers"; -const char* B_PROPERTY_ENTRY = "property"; -const char* B_PROPERTY_NAME_ENTRY = "name"; - -BBlockCache* BMessage::sMsgCache = NULL; -port_id BMessage::sReplyPorts[sNumReplyPorts]; -long BMessage::sReplyPortInUse[sNumReplyPorts]; - - -static status_t handle_reply(port_id reply_port, - int32* pCode, - bigtime_t timeout, - BMessage* reply); - -static status_t convert_message(const KMessage *fromMessage, - BMessage *toMessage); - -static ssize_t min_hdr_size(); - - -// #pragma mark - - -class BMessage::Header { -public: - Header() {} - Header(const BMessage &message) { ReadFrom(message); } - - status_t SetMagic(uint32 magic); - - status_t ReadFrom(BDataIO &stream); - void ReadFrom(const BMessage &message); - status_t WriteTo(BDataIO &stream, bool calculateCheckSum = true) const; - void WriteTo(BMessage &message) const; - - uint32 CalculateCheckSum() const; - uint32 CalculateHeaderSize() const; - - bool IsSwapped() const { return fSwapped; } - - bool HasTarget() const { return (fFlags & MSG_FLAG_INCL_TARGET); } - void SetTarget(int32 token); - - void Dump() const; - -private: - uint32 fMagic; - int32 fBodySize; - uint32 fWhat; - uint8 fFlags; - int32 fTargetToken; - port_id fReplyPort; - int32 fReplyToken; - team_id fReplyTeam; - bool fReplyRequired; - bool fReplyDone; - bool fIsReply; - bool fSwapped; -}; - - -status_t -BMessage::Header::SetMagic(uint32 magic) -{ - if (magic == kMessageMagicSwapped) { - fSwapped = true; - } else if (magic == kMessageMagic) { - fSwapped = false; - } else { - // This is *not* a message - return B_NOT_A_MESSAGE; - } - - fMagic = magic; - return B_OK; -} - - -// ReadFrom -status_t -BMessage::Header::ReadFrom(BDataIO &stream) -{ - int32 checkSum; - uchar csBuffer[MSG_HEADER_MAX_SIZE]; - - TReadHelper read_helper(&stream); - TChecksumHelper checksum_helper(csBuffer); - int32 flattenedSize; - - try { - read_helper.SetSwap(fSwapped); - - // get the checksum - read_helper(checkSum); - // get the size - read_helper(flattenedSize); - checksum_helper.Cache(flattenedSize); - // Get the what - read_helper(fWhat); - checksum_helper.Cache(fWhat); - // Get the flags - read_helper(fFlags); - checksum_helper.Cache(fFlags); - - if (fFlags & MSG_FLAG_BIG_ENDIAN) { - // TODO: ??? - // Isn't this already indicated by the byte order of the message version? - } - if (fFlags & MSG_FLAG_INCL_TARGET) { - // Get the target data - read_helper(fTargetToken); - checksum_helper.Cache(fTargetToken); - } - if (fFlags & MSG_FLAG_INCL_REPLY) { - // Get the reply port - read_helper(fReplyPort); - read_helper(fReplyToken); - read_helper(fReplyTeam); - checksum_helper.Cache(fReplyPort); - checksum_helper.Cache(fReplyToken); - checksum_helper.Cache(fReplyTeam); - - // Get the "big flags" - uint8 bigFlags; - // Get the preferred flag - read_helper(bigFlags); - checksum_helper.Cache(bigFlags); - if (bigFlags) - fTargetToken = B_PREFERRED_TOKEN; - - // Get the reply requirement flag - read_helper(bigFlags); - checksum_helper.Cache(bigFlags); - fReplyRequired = bigFlags; - - // Get the reply done flag - read_helper(bigFlags); - checksum_helper.Cache(bigFlags); - fReplyDone = bigFlags; - - // Get the "is reply" flag - read_helper(bigFlags); - checksum_helper.Cache(bigFlags); - fIsReply = bigFlags; - } - } catch (status_t& e) { - return e; - } - - fBodySize = flattenedSize - CalculateHeaderSize(); - - if (checkSum != checksum_helper.CheckSum()) - return B_NOT_A_MESSAGE; - - return B_OK; -} - -// ReadFrom -void -BMessage::Header::ReadFrom(const BMessage &message) -{ - fMagic = kMessageMagic; - - fBodySize = message.fBody->FlattenedSize(); - fWhat = message.what; - fFlags = 0; -#ifdef B_HOST_IS_BENDIAN - fFlags |= MSG_FLAG_BIG_ENDIAN; -#endif - if (message.HasSpecifiers()) - fFlags |= MSG_FLAG_SCRIPT_MSG; - if (message.fTarget != B_NULL_TOKEN) - fFlags |= MSG_FLAG_INCL_TARGET; - if (message.fReplyTo.port >= 0 && - message.fReplyTo.target != B_NULL_TOKEN && - message.fReplyTo.team >= 0) { - fFlags |= MSG_FLAG_INCL_REPLY; - } - fTargetToken = message.fTarget; - fReplyPort = message.fReplyTo.port; - fReplyToken = message.fReplyTo.target; - fReplyTeam = message.fReplyTo.team; - fReplyRequired = message.fReplyRequired; - fReplyDone = message.fReplyDone; - fIsReply = message.fIsReply; -} - -// WriteTo -status_t -BMessage::Header::WriteTo(BDataIO &stream, bool calculateCheckSum) const -{ - status_t err = B_OK; - int32 data; - - // Write the version of the binary data format - data = fMagic; - write_helper(&stream, (const void*)&data, sizeof (data), err); - if (!err) { - // compute checksum - data = (calculateCheckSum ? CalculateCheckSum() : 0); - write_helper(&stream, (const void*)&data, sizeof (data), err); - } - if (!err) { - // Write the flattened size of the entire message - data = CalculateHeaderSize() + fBodySize; - write_helper(&stream, (const void*)&data, sizeof (data), err); - } - if (!err) { - // Write the 'what' member - write_helper(&stream, (const void*)&fWhat, sizeof (fWhat), err); - } - if (!err) { - // Write the header flags - write_helper(&stream, (const void*)&fFlags, sizeof (fFlags), err); - } - - // Write targeting info if necessary - if (!err && (fFlags & MSG_FLAG_INCL_TARGET)) { - data = fTargetToken; - write_helper(&stream, (const void*)&data, sizeof (data), err); - } - - // Write reply info if necessary - if (!err && (fFlags & MSG_FLAG_INCL_REPLY)) { - write_helper(&stream, (const void*)&fReplyPort, sizeof(fReplyPort), - err); - if (!err) { - write_helper(&stream, (const void*)&fReplyToken, - sizeof(fReplyToken), err); - } - if (!err) { - write_helper(&stream, (const void*)&fReplyTeam, - sizeof(fReplyTeam), err); - } - - uint8 bigFlags; - if (!err) { - bigFlags = fTargetToken == B_PREFERRED_TOKEN ? 1 : 0; - write_helper(&stream, (const void*)&bigFlags, sizeof(bigFlags), - err); - } - if (!err) - { - bigFlags = fReplyRequired ? 1 : 0; - write_helper(&stream, (const void*)&bigFlags, sizeof(bigFlags), - err); - } - if (!err) - { - bigFlags = fReplyDone ? 1 : 0; - write_helper(&stream, (const void*)&bigFlags, sizeof(bigFlags), - err); - } - if (!err) - { - bigFlags = fIsReply ? 1 : 0; - write_helper(&stream, (const void*)&bigFlags, sizeof(bigFlags), - err); - } - } - - return err; -} - -// WriteTo -void -BMessage::Header::WriteTo(BMessage &message) const -{ - // Make way for the new data - message.MakeEmpty(); - - message.what = fWhat; - message.fHasSpecifiers = fFlags & MSG_FLAG_SCRIPT_MSG; - - message.fPreferred = fTargetToken == B_PREFERRED_TOKEN; - message.fTarget = fTargetToken; - - if (fFlags & MSG_FLAG_INCL_REPLY) { - // Get the reply port - message.fReplyTo.port = fReplyPort; - message.fReplyTo.target = fReplyToken; - message.fReplyTo.team = fReplyTeam; - - message.fWasDelivered = true; - - message.fReplyRequired = fReplyRequired; - message.fReplyDone = fReplyDone; - message.fIsReply = fIsReply; - } -} - -// CalculateCheckSum -uint32 -BMessage::Header::CalculateCheckSum() const -{ - uchar buffer[MSG_HEADER_MAX_SIZE]; - BMemoryIO stream(buffer, sizeof(buffer)); - WriteTo(stream, false); - int32 size = stream.Position(); - return _checksum_(buffer + 8, size - 8); -} - -// CalculateHeaderSize -uint32 -BMessage::Header::CalculateHeaderSize() const -{ - ssize_t size = min_hdr_size(); - - if (fTargetToken != B_NULL_TOKEN) - size += sizeof (fTargetToken); - - if (fReplyPort >= 0 && fReplyToken != B_NULL_TOKEN && fReplyTeam >= 0) { - size += sizeof (fReplyPort); - size += sizeof (fReplyToken); - size += sizeof (fReplyTeam); - - size += 4; // For the "big" flags - } - - return size; -} - -// SetTarget -void -BMessage::Header::SetTarget(int32 token) -{ - fTargetToken = token; - if (fTargetToken == B_NULL_TOKEN) - fFlags &= ~MSG_FLAG_INCL_TARGET; - else - fFlags |= MSG_FLAG_INCL_TARGET; -} - -// Dump -void -BMessage::Header::Dump() const -{ - printf("BMessage::Header:\n"); - printf(" magic: %lx\n", fMagic); - printf(" body size: %ld\n", fBodySize); - printf(" what: %lx\n", fWhat); - printf(" flags: %x\n", fFlags); - printf(" target token: %ld\n", fTargetToken); - printf(" reply port: %ld\n", fReplyPort); - printf(" reply token: %ld\n", fReplyToken); - printf(" reply team: %ld\n", fReplyTeam); - printf(" reply required: %d\n", fReplyRequired); - printf(" reply done: %d\n", fReplyDone); - printf(" is reply: %d\n", fIsReply); - printf(" swapped: %d\n", fSwapped); -} - -// #pragma mark - - -void BMessage::_ReservedMessage1() {} -void BMessage::_ReservedMessage2() {} -void BMessage::_ReservedMessage3() {} - -//------------------------------------------------------------------------------ -BMessage::BMessage() - : what(0), fBody(NULL) -{ - init_data(); -} -//------------------------------------------------------------------------------ -BMessage::BMessage(uint32 w) - : fBody(NULL) -{ - init_data(); - what = w; -} -//------------------------------------------------------------------------------ -BMessage::BMessage(const BMessage& a_message) - : fBody(NULL) -{ - init_data(); - *this = a_message; -} -//------------------------------------------------------------------------------ -BMessage::BMessage(BMessage *a_message) - : fBody(NULL) -{ - init_data(); - *this = *a_message; -} -//------------------------------------------------------------------------------ -BMessage::~BMessage() -{ - if (IsSourceWaiting()) - { - SendReply(B_NO_REPLY); - } - delete fBody; -} -//------------------------------------------------------------------------------ -BMessage& BMessage::operator=(const BMessage& msg) -{ - what = msg.what; - - fQueueLink = msg.fQueueLink; - fTarget = msg.fTarget; - fOriginal = msg.fOriginal; - fChangeCount = msg.fChangeCount; - fCurSpecifier = msg.fCurSpecifier; - fPtrOffset = msg.fPtrOffset; - - fEntries = msg.fEntries; - - fReplyTo.port = msg.fReplyTo.port; - fReplyTo.target = msg.fReplyTo.target; - fReplyTo.team = msg.fReplyTo.team; - fReplyTo.preferred = msg.fReplyTo.preferred; - - fPreferred = msg.fPreferred; - fReplyRequired = msg.fReplyRequired; - fReplyDone = msg.fReplyDone; - fIsReply = msg.fIsReply; - fWasDelivered = msg.fWasDelivered; - fReadOnly = msg.fReadOnly; - fHasSpecifiers = msg.fHasSpecifiers; - - *fBody = *(msg.fBody); - return *this; -} -//------------------------------------------------------------------------------ -void BMessage::init_data() -{ - what = 0; - - fQueueLink = NULL; - fTarget = B_NULL_TOKEN; - fOriginal = NULL; - fChangeCount = 0; - fCurSpecifier = -1; - fPtrOffset = 0; - - fEntries = NULL; - - fReplyTo.port = -1; - fReplyTo.target = B_NULL_TOKEN; - fReplyTo.team = -1; - fReplyTo.preferred = false; - - fPreferred = false; - fReplyRequired = false; - fReplyDone = false; - fIsReply = false; - fWasDelivered = false; - fReadOnly = false; - fHasSpecifiers = false; - - if (fBody) - { - fBody->MakeEmpty(); - } - else - { - fBody = new BPrivate::BMessageBody; - } -} -//------------------------------------------------------------------------------ -status_t BMessage::GetInfo(type_code typeRequested, int32 which, char** name, - type_code* typeReturned, int32* count) const -{ - return fBody->GetInfo(typeRequested, which, name, typeReturned, count); -} -//------------------------------------------------------------------------------ -status_t BMessage::GetInfo(const char* name, type_code* type, int32* c) const -{ - return fBody->GetInfo(name, type, c); -} -//------------------------------------------------------------------------------ -status_t BMessage::GetInfo(const char* name, type_code* type, - bool* fixed_size) const -{ - return fBody->GetInfo(name, type, fixed_size); -} -//------------------------------------------------------------------------------ -int32 BMessage::CountNames(type_code type) const -{ - return fBody->CountNames(type); -} -//------------------------------------------------------------------------------ -bool BMessage::IsEmpty() const -{ - return fBody->IsEmpty(); -} -//------------------------------------------------------------------------------ -bool BMessage::IsSystem() const -{ - char a = char(what >> 24); - char b = char(what >> 16); - char c = char(what >> 8); - char d = char(what); - - // The BeBook says: - // ... we've adopted a strict convention for assigning values to all - // Be-defined constants. The value assigned will always be formed by - // combining four characters into a multicharacter constant, with the - // characters limited to uppercase letters and the underbar - // Between that and what's in AppDefs.h, this algo seems like a safe bet: - if (a == '_' && isupper(b) && isupper(c) && isupper(d)) - { - return true; - } - - return false; -} -//------------------------------------------------------------------------------ -bool BMessage::IsReply() const -{ - return fIsReply; -} -//------------------------------------------------------------------------------ -void BMessage::PrintToStream() const -{ - printf("\nBMessage: what = (0x%lX or %ld)\n", what, what); - fBody->PrintToStream(); -} -//------------------------------------------------------------------------------ -status_t BMessage::Rename(const char* old_entry, const char* new_entry) -{ - return fBody->Rename(old_entry, new_entry); -} -//------------------------------------------------------------------------------ -bool BMessage::WasDelivered() const -{ - return fWasDelivered; -} -//------------------------------------------------------------------------------ -bool BMessage::IsSourceWaiting() const -{ - return fReplyRequired && !fReplyDone; -} -//------------------------------------------------------------------------------ -bool BMessage::IsSourceRemote() const -{ - return WasDelivered() && fReplyTo.team != BPrivate::current_team(); -} -//------------------------------------------------------------------------------ -BMessenger BMessage::ReturnAddress() const -{ - if (WasDelivered()) - { - BMessenger messenger; - BMessenger::Private(messenger).SetTo(fReplyTo.team, fReplyTo.port, - fReplyTo.target); - return messenger; - } - - return BMessenger(); -} -//------------------------------------------------------------------------------ -const BMessage* BMessage::Previous() const -{ - // TODO: test - // In particular, look to see if the "_previous_" field is used in R5 - if (!fOriginal) - { - BMessage* fOriginal = new BMessage; - if (FindMessage("_previous_", fOriginal) != B_OK) - { - delete fOriginal; - fOriginal = NULL; - } - } - - return fOriginal; -} -//------------------------------------------------------------------------------ -bool BMessage::WasDropped() const -{ - return fReadOnly; -} -//------------------------------------------------------------------------------ -BPoint BMessage::DropPoint(BPoint* offset) const -{ - // TODO: Where do we get this stuff??? - if (offset) - { - *offset = FindPoint("_drop_offset_"); - } - return FindPoint("_drop_point_"); -} -//------------------------------------------------------------------------------ -status_t BMessage::SendReply(uint32 command, BHandler* reply_to) -{ - BMessage msg(command); - return SendReply(&msg, reply_to); -} -//------------------------------------------------------------------------------ -status_t BMessage::SendReply(BMessage* the_reply, BHandler* reply_to, - bigtime_t timeout) -{ - BMessenger messenger(reply_to); - return SendReply(the_reply, messenger, timeout); -} -//------------------------------------------------------------------------------ -#if 0 -template -status_t SendReplyHelper(BMessage* the_message, BMessage* the_reply, - Sender& the_sender) -{ - BMessenger messenger(the_message->fReplyTo.team, the_message->fReplyTo.port, - the_message->fReplyTo.target, - the_message->fReplyTo.preferred); - if (the_message->fReplyRequired) - { - if (the_message->fReplyDone) - { - return B_DUPLICATE_REPLY; - } - the_message->fReplyDone = true; - the_reply->fIsReply = true; - status_t err = the_sender.Send(messenger, the_reply); - the_reply->fIsReply = false; - if (err) - { - if (set_port_owner(messenger.fPort, messenger.fTeam) == B_BAD_TEAM_ID) - { - delete_port(messenger.fPort); - } - } - return err; - } - // no reply required - if (!the_message->fWasDelivered) - { - return B_BAD_REPLY; - } - -#if 0 - char tmp[0x800]; - ssize_t size; - char* p = stack_flatten(tmp, sizeof(tmp), true /* include reply */, &size); - the_reply->AddData("_previous_", B_RAW_TYPE, p ? p : tmp, &size); - if (p) - { - free(p); - } -#endif - the_reply->AddMessage("_previous_", the_message); - the_reply->fIsReply = true; - status_t err = the_sender.Send(messenger, the_reply); - the_reply->fIsReply = false; - the_reply->RemoveName("_previous_"); - return err; -}; -#endif -//------------------------------------------------------------------------------ -#if 0 -struct Sender1 -{ - BMessenger& reply_to; - bigtime_t timeout; - - Sender1(BMessenger& m, bigtime_t t) : reply_to(m), timeout(t) {;} - - status_t Send(BMessenger& messenger, BMessage* the_reply) - { - return messenger.SendMessage(the_reply, reply_to, timeout); - } -}; -status_t BMessage::SendReply(BMessage* the_reply, BMessenger reply_to, - bigtime_t timeout) -{ - Sender1 mySender(reply_to, timeout); - return SendReplyHelper(this, the_reply, mySender); -} -#endif -status_t BMessage::SendReply(BMessage* the_reply, BMessenger reply_to, - bigtime_t timeout) -{ - // TODO: test - BMessenger messenger; - - BMessenger::Private messengerPrivate(messenger); - messengerPrivate.SetTo(fReplyTo.team, fReplyTo.port, fReplyTo.target); - if (fReplyRequired) - { - if (fReplyDone) - { - return B_DUPLICATE_REPLY; - } - fReplyDone = true; - the_reply->fIsReply = true; - status_t err = messenger.SendMessage(the_reply, reply_to, timeout); - the_reply->fIsReply = false; - if (err) - { - if (set_port_owner(messengerPrivate.Port(), - messengerPrivate.Team()) == B_BAD_TEAM_ID) { - delete_port(messengerPrivate.Port()); - } - } - return err; - } - // no reply required - if (!fWasDelivered) - { - return B_BAD_REPLY; - } - - the_reply->AddMessage("_previous_", this); - the_reply->fIsReply = true; - status_t err = messenger.SendMessage(the_reply, reply_to, timeout); - the_reply->fIsReply = false; - the_reply->RemoveName("_previous_"); - return err; -} -//------------------------------------------------------------------------------ -status_t BMessage::SendReply(uint32 command, BMessage* reply_to_reply) -{ - BMessage msg(command); - return SendReply(&msg, reply_to_reply); -} -//------------------------------------------------------------------------------ -#if 0 -struct Sender2 -{ - BMessage* reply_to_reply; - bigtime_t send_timeout; - bigtime_t reply_timeout; - - Sender2(BMessage* m, bigtime_t t1, bigtime_t t2) - : reply_to_reply(m), send_timeout(t1), reply_timeout(t2) {;} - - status_t Send(BMessenger& messenger, BMessage* the_reply) - { - return messenger.SendMessage(the_reply, reply_to_reply, - send_timeout, reply_timeout); - } -}; -status_t BMessage::SendReply(BMessage* the_reply, BMessage* reply_to_reply, - bigtime_t send_timeout, bigtime_t reply_timeout) -{ - Sender2 mySender(reply_to_reply, send_timeout, reply_timeout); - return SendReplyHelper(this, the_reply, mySender); -} -#endif -status_t BMessage::SendReply(BMessage* the_reply, BMessage* reply_to_reply, - bigtime_t send_timeout, bigtime_t reply_timeout) -{ - // TODO: test - BMessenger messenger; - BMessenger::Private messengerPrivate(messenger); - messengerPrivate.SetTo(fReplyTo.team, fReplyTo.port, fReplyTo.target); - if (fReplyRequired) - { - if (fReplyDone) - { - return B_DUPLICATE_REPLY; - } - fReplyDone = true; - the_reply->fIsReply = true; - status_t err = messenger.SendMessage(the_reply, reply_to_reply, - send_timeout, reply_timeout); - the_reply->fIsReply = false; - if (err) - { - if (set_port_owner(messengerPrivate.Port(), - messengerPrivate.Team()) == B_BAD_TEAM_ID) { - delete_port(messengerPrivate.Port()); - } - } - return err; - } - // no reply required - if (!fWasDelivered) - { - return B_BAD_REPLY; - } - - the_reply->AddMessage("_previous_", this); - the_reply->fIsReply = true; - status_t err = messenger.SendMessage(the_reply, reply_to_reply, - send_timeout, reply_timeout); - the_reply->fIsReply = false; - the_reply->RemoveName("_previous_"); - return err; -} -//------------------------------------------------------------------------------ -ssize_t BMessage::FlattenedSize() const -{ - return calc_hdr_size(0) + fBody->FlattenedSize(); -} -//------------------------------------------------------------------------------ -status_t BMessage::Flatten(char* buffer, ssize_t size) const -{ - return real_flatten(buffer, size); -} -//------------------------------------------------------------------------------ -status_t BMessage::Flatten(BDataIO* stream, ssize_t* size) const -{ - status_t err = B_OK; - ssize_t len = FlattenedSize(); - char* buffer = new(nothrow) char[len]; - if (buffer) - { - err = Flatten(buffer, len); - if (!err) - { - // size is an optional parameter, don't crash on NULL - if (size != NULL) - { - *size = len; - } - err = stream->Write(buffer, len); - if (err > B_OK) - err = B_OK; - } - - delete[] buffer; - } - else - { - err = B_NO_MEMORY; - } - - return err; -} - - -status_t -BMessage::Unflatten(const char* buffer) -{ - if (!buffer) - return B_BAD_VALUE; - - uint32 magic = *(uint32*)buffer; - - // we support several message formats - this list is ordered - // by importance and frequency - - if (magic == kMessageMagic) { - // it appears to be a normal flattened BMessage - BMemoryIO memoryStream(buffer, ((uint32*)buffer)[2]); - return Unflatten(&memoryStream); - } - - // check whether this is a KMessage - if (((KMessage::Header*)buffer)->magic - == KMessage::kMessageHeaderMagic) - return _UnflattenKMessage(buffer); - - if (magic == kMessageMagicSwapped) { - // it appears to be a swapped flattened BMessage - uint32 size = ((uint32*)buffer)[2]; - - BMemoryIO memoryStream(buffer, __swap_int32(size)); - return Unflatten(&memoryStream); - } - - if (magic == kMessageMagicDano || magic == kMessageMagicDanoSwapped) { - // dano style message - BMemoryIO memoryStream(buffer, - BPrivate::dano_message_flattened_size(buffer)); - return Unflatten(&memoryStream); - } - - return B_NOT_A_MESSAGE; -} - - -status_t -BMessage::Unflatten(BDataIO* stream) -{ - TReadHelper reader(stream); - Header header; - status_t status = B_OK; - - // ToDo: while reading from a stream is certainly more convenient than - // from a buffer, it causes a lot of unnecessary copies, and therefore - // probably shouldn't be the preferred (or only) route. - - try { - uint32 magic; - reader(magic); - - status = header.SetMagic(magic); - if (status < B_OK) { - // we support reading Dano messages from disk as well - if (magic == kMessageMagicDano) - return BPrivate::unflatten_dano_message(magic, *stream, *this); - - return status; - } - - status = header.ReadFrom(*stream); - if (status < B_OK) { - printf("BMessage::Unflatten(): Reading the header failed: %lx\n", status); - return status; - } - - header.WriteTo(*this); - bool swap = header.IsSwapped(); - - uint32 count; - uint32 dataLen; - uint8 nameLen; - char name[MSG_NAME_MAX_SIZE]; - unsigned char* databuffer = NULL; - - int8 flags; - reader(flags); - - while (flags != MSG_LAST_ENTRY) { - type_code type; - reader(type); - - // Is there more than one data item? - if (flags & MSG_FLAG_SINGLE_ITEM) { - count = 1; - if (flags & MSG_FLAG_MINI_DATA) { - uint8 littleLen; - reader(littleLen); - dataLen = littleLen; - } else - reader(dataLen); - } else { - // Is there a little data? - if (flags & MSG_FLAG_MINI_DATA) { - // Get item count (1 byte) - uint8 littleCount; - reader(littleCount); - count = littleCount; - - // Get data length (1 byte) - uint8 littleLen; - reader(littleLen); - dataLen = littleLen; - } else { - // Is there a lot of data? - // Get item count (4 bytes) - reader(count); - // Get data length (4 bytes) - reader(dataLen); - } - } - - // Get the name length (1 byte) - reader(nameLen); - // Get the name (name length bytes) - reader(name, nameLen); - name[nameLen] = '\0'; - - // Copy the data into a new buffer to byte align it - databuffer = (unsigned char*)realloc(databuffer, dataLen); - if (!databuffer) - throw B_NO_MEMORY; - // Get the data - reader(databuffer, dataLen); - - if (swap) { - // Is the data fixed size? - if ((flags & MSG_FLAG_FIXED_SIZE) != 0) { - // Make sure to swap the data - status = swap_data(type, (void*)databuffer, dataLen, - B_SWAP_ALWAYS); - if (status < B_OK) - throw status; - } else if (type == B_REF_TYPE) { - // Is the data variable size? - // Apparently, entry_refs are the only variable-length data - // explicitely swapped -- the dev_t and ino_t - // specifically - byte_swap(*(entry_ref*)databuffer); - } - } - - // Add each data field to the message - uint32 itemSize = 0; - if (flags & MSG_FLAG_FIXED_SIZE) - itemSize = dataLen / count; - - unsigned char* dataPtr = databuffer; - - for (uint32 i = 0; i < count; ++i) { - // Line up for the next item - if (i) { - if (flags & MSG_FLAG_FIXED_SIZE) { - dataPtr += itemSize; - } else { - // Have to account for 8-byte boundary padding - // We add 4 because padding as calculated during - // flattening includes the four-byte size header - dataPtr += itemSize + calc_padding(itemSize + 4, 8); - } - } - - if ((flags & MSG_FLAG_FIXED_SIZE) == 0) { - itemSize = *(uint32*)dataPtr; - dataPtr += sizeof (uint32); - } - - status = AddData(name, type, dataPtr, itemSize, - flags & MSG_FLAG_FIXED_SIZE); - if (status < B_OK) - throw status; - } - - reader(flags); - } - } catch (status_t& e) { - status = e; - } - - return status; -} -//------------------------------------------------------------------------------ -status_t BMessage::AddSpecifier(const char* property) -{ - BMessage message(B_DIRECT_SPECIFIER); - status_t err = message.AddString(B_PROPERTY_ENTRY, property); - if (err) - return err; - - return AddSpecifier(&message); -} -//------------------------------------------------------------------------------ -status_t BMessage::AddSpecifier(const char* property, int32 index) -{ - BMessage message(B_INDEX_SPECIFIER); - status_t err = message.AddString(B_PROPERTY_ENTRY, property); - if (err) - return err; - - err = message.AddInt32("index", index); - if (err) - return err; - - return AddSpecifier(&message); -} -//------------------------------------------------------------------------------ -status_t BMessage::AddSpecifier(const char* property, int32 index, int32 range) -{ - if (range < 0) - return B_BAD_VALUE; - - BMessage message(B_RANGE_SPECIFIER); - status_t err = message.AddString(B_PROPERTY_ENTRY, property); - if (err) - return err; - - err = message.AddInt32("index", index); - if (err) - return err; - - err = message.AddInt32("range", range); - if (err) - return err; - - return AddSpecifier(&message); -} -//------------------------------------------------------------------------------ -status_t BMessage::AddSpecifier(const char* property, const char* name) -{ - BMessage message(B_NAME_SPECIFIER); - status_t err = message.AddString(B_PROPERTY_ENTRY, property); - if (err) - return err; - - err = message.AddString(B_PROPERTY_NAME_ENTRY, name); - if (err) - return err; - - return AddSpecifier(&message); -} -//------------------------------------------------------------------------------ -status_t BMessage::AddSpecifier(const BMessage* specifier) -{ - status_t err = AddMessage(B_SPECIFIER_ENTRY, specifier); - if (!err) - { - ++fCurSpecifier; - fHasSpecifiers = true; - } - return err; -} -//------------------------------------------------------------------------------ -status_t BMessage::SetCurrentSpecifier(int32 index) -{ - type_code type; - int32 count; - status_t err = GetInfo(B_SPECIFIER_ENTRY, &type, &count); - if (err) - return err; - - if (index < 0 || index >= count) - return B_BAD_INDEX; - - fCurSpecifier = index; - - return B_OK; -} -//------------------------------------------------------------------------------ -status_t BMessage::GetCurrentSpecifier(int32* index, BMessage* specifier, - int32* what, const char** property) const -{ - if (fCurSpecifier == -1 || !WasDelivered()) - return B_BAD_SCRIPT_SYNTAX; - - if (index) - *index = fCurSpecifier; - - if (specifier) - { - if (FindMessage(B_SPECIFIER_ENTRY, fCurSpecifier, specifier)) - return B_BAD_SCRIPT_SYNTAX; - - if (what) - *what = specifier->what; - - if (property) - { - if (specifier->FindString(B_PROPERTY_ENTRY, property)) - return B_BAD_SCRIPT_SYNTAX; - } - } - - return B_OK; -} -//------------------------------------------------------------------------------ -bool BMessage::HasSpecifiers() const -{ - return fHasSpecifiers; -} -//------------------------------------------------------------------------------ -status_t BMessage::PopSpecifier() -{ - if (fCurSpecifier < 0 || !WasDelivered()) - { - return B_BAD_VALUE; - } - - --fCurSpecifier; - return B_OK; -} -//------------------------------------------------------------------------------ -// return fBody->AddData(name, val, TYPESPEC); -// return fBody->FindData(name, index, val, TYPESPEC); -// return fBody->ReplaceData(name, index, val, TYPESPEC); -// return fBody->HasData(name, TYPESPEC, n); - -#define DEFINE_FUNCTIONS(TYPE, fnName, TYPESPEC) \ - status_t BMessage::Add ## fnName(const char* name, TYPE val) \ - { return AddData(name, TYPESPEC, &val, sizeof(TYPE)); } \ - status_t BMessage::Find ## fnName(const char* name, TYPE* p) const \ - { return Find ## fnName(name, 0, p); } \ - status_t BMessage::Find ## fnName(const char* name, int32 index, TYPE* p) const \ - { \ - void* ptr = NULL; ssize_t bytes = 0; status_t err = B_OK;\ - *p = TYPE(); \ - err = FindData(name, TYPESPEC, index, (const void**)&ptr, &bytes); \ - if (err == B_OK) \ - memcpy(p, ptr, sizeof(TYPE)); \ - return err; \ - } \ - status_t BMessage::Replace ## fnName(const char* name, TYPE val) \ - { return Replace ## fnName(name, 0, val); } \ - status_t BMessage::Replace ## fnName(const char *name, int32 index, TYPE val) \ - { return ReplaceData(name, TYPESPEC, index, &val, sizeof(TYPE)); } \ - bool BMessage::Has ## fnName(const char* name, int32 n) const \ - { return fBody->HasData(name, TYPESPEC, n); } - -DEFINE_FUNCTIONS(int8 , Int8 , B_INT8_TYPE) -DEFINE_FUNCTIONS(int16 , Int16 , B_INT16_TYPE) -DEFINE_FUNCTIONS(int32 , Int32 , B_INT32_TYPE) -DEFINE_FUNCTIONS(int64 , Int64 , B_INT64_TYPE) -DEFINE_FUNCTIONS(BPoint, Point , B_POINT_TYPE) -DEFINE_FUNCTIONS(BRect , Rect , B_RECT_TYPE) -DEFINE_FUNCTIONS(float , Float , B_FLOAT_TYPE) -DEFINE_FUNCTIONS(double, Double, B_DOUBLE_TYPE) -DEFINE_FUNCTIONS(bool , Bool , B_BOOL_TYPE) - -#undef DEFINE_FUNCTIONS - - -#define DEFINE_HAS_FUNCTION(fnName, TYPESPEC) \ - bool BMessage::Has ## fnName(const char* name, int32 n) const \ - { return HasData(name, TYPESPEC, n); } - -DEFINE_HAS_FUNCTION(Message , B_MESSAGE_TYPE) -DEFINE_HAS_FUNCTION(String , B_STRING_TYPE) -DEFINE_HAS_FUNCTION(Pointer , B_POINTER_TYPE) -DEFINE_HAS_FUNCTION(Messenger, B_MESSENGER_TYPE) -DEFINE_HAS_FUNCTION(Ref , B_REF_TYPE) - -#undef DEFINE_HAS_FUNCTION - -#define DEFINE_LAZY_FIND_FUNCTION(TYPE, fnName) \ - TYPE BMessage::Find ## fnName(const char* name, int32 n) const \ - { \ - TYPE i = 0; \ - Find ## fnName(name, n, &i); \ - return i; \ - } - -DEFINE_LAZY_FIND_FUNCTION(int8 , Int8) -DEFINE_LAZY_FIND_FUNCTION(int16 , Int16) -DEFINE_LAZY_FIND_FUNCTION(int32 , Int32) -DEFINE_LAZY_FIND_FUNCTION(int64 , Int64) -DEFINE_LAZY_FIND_FUNCTION(float , Float) -DEFINE_LAZY_FIND_FUNCTION(double , Double) -DEFINE_LAZY_FIND_FUNCTION(bool , Bool) -DEFINE_LAZY_FIND_FUNCTION(const char* , String) - -#undef DEFINE_LAZY_FIND_FUNCTION - -//------------------------------------------------------------------------------ - - -status_t -BMessage::AddString(const char* name, const char* string) -{ - return AddData(name, B_STRING_TYPE, string, string ? strlen(string) + 1 : 0); -} - - -status_t -BMessage::AddString(const char* name, const BString& string) -{ - return AddData(name, B_STRING_TYPE, string.String(), string.Length() + 1); -} - - -status_t -BMessage::AddPointer(const char* name, const void* pointer) -{ - return AddData(name, B_POINTER_TYPE, &pointer, sizeof(pointer)); -} - - -status_t -BMessage::AddMessenger(const char* name, BMessenger messenger) -{ - return AddData(name, B_MESSENGER_TYPE, &messenger, sizeof(messenger)); -} - - -status_t -BMessage::AddRef(const char* name, const entry_ref* ref) -{ - char* buffer = new(nothrow) char[sizeof(entry_ref) + B_PATH_NAME_LENGTH]; - if (buffer == NULL) - return B_NO_MEMORY; - - size_t size; - status_t err = entry_ref_flatten(buffer, &size, ref); - if (err >= B_OK) { - BDataBuffer databuffer((void*)buffer, size); - err = fBody->AddData(name, databuffer, B_REF_TYPE); - // ToDo: even if the code looks like it, test this for real - // if AddData() fails here, the buffer is freed automatically - // as part of the BDataBuffer destruction - } else - delete[] buffer; - - return err; -} - - -status_t -BMessage::AddMessage(const char* name, const BMessage* msg) -{ - ssize_t size = msg->FlattenedSize(); - char* buffer = new(nothrow) char[size]; - if (buffer == NULL) - return B_NO_MEMORY; - - status_t err = msg->Flatten(buffer, size); - if (err >= B_OK) { - BDataBuffer dataBuffer((void*)buffer, size); - err = fBody->AddData(name, dataBuffer, B_MESSAGE_TYPE); - // if AddData() fails here, the buffer is freed automatically - // as part of the BDataBuffer destruction - } else - delete[] buffer; - - return err; -} - - -status_t -BMessage::AddFlat(const char* name, BFlattenable* object, int32 count) -{ - ssize_t size = object->FlattenedSize(); - char* buffer = new(nothrow) char[size]; - if (buffer == NULL) - return B_NO_MEMORY; - - status_t err = object->Flatten((void*)buffer, size); - if (err >= B_OK) { - BDataBuffer dataBuffer((void*)buffer, size); - err = fBody->AddData(name, dataBuffer, object->TypeCode()); - // if AddData() fails here, the buffer is freed automatically - // as part of the BDataBuffer destruction - } else - delete[] buffer; - - return err; -} - - -status_t -BMessage::AddData(const char* name, type_code type, const void* data, - ssize_t numBytes, bool is_fixed_size, int32 /*count*/) -{ - /** @note - Because we're using vectors for our item storage, the count param - is no longer useful to us: dynamically adding more items is not - really a performance issue, so pre-allocating space for objects - gives us no real advantage. - */ - - // TODO: test - // In particular, we want to see what happens if is_fixed_size == true and - // the user attempts to add something bigger or smaller. We may need to - // enforce the size thing. - - BDataBuffer buffer((void*)data, numBytes, true); - return fBody->AddData(name, buffer, type); -} - - -status_t -BMessage::RemoveData(const char* name, int32 index) -{ - return fReadOnly ? B_ERROR : fBody->RemoveData(name, index); -} - - -status_t -BMessage::RemoveName(const char* name) -{ - return fReadOnly ? B_ERROR : fBody->RemoveName(name); -} - - -status_t -BMessage::MakeEmpty() -{ - return fReadOnly ? B_ERROR : fBody->MakeEmpty(); -} - - -status_t -BMessage::FindString(const char* name, const char** string) const -{ - return FindString(name, 0, string); -} - - -status_t -BMessage::FindString(const char* name, int32 index, - const char** string) const -{ - ssize_t bytes; - return FindData(name, B_STRING_TYPE, index, - (const void**)string, &bytes); -} - - -status_t -BMessage::FindString(const char* name, BString* string) const -{ - return FindString(name, 0, string); -} - - -status_t -BMessage::FindString(const char* name, int32 index, BString* string) const -{ - const char* cstr; - status_t err = FindString(name, index, &cstr); - if (err < B_OK) - return err; - - *string = cstr; - return B_OK; -} - - -status_t -BMessage::FindPointer(const char* name, void** ptr) const -{ - return FindPointer(name, 0, ptr); -} - - -status_t -BMessage::FindPointer(const char* name, int32 index, void** ptr) const -{ - void** data = NULL; - ssize_t size = 0; - status_t err = FindData(name, B_POINTER_TYPE, index, (const void**)&data, &size); - if (err == B_OK) - *ptr = *data; - else - *ptr = NULL; - return err; -} - - -status_t -BMessage::FindMessenger(const char* name, BMessenger* m) const -{ - return FindMessenger(name, 0, m); -} - - -status_t -BMessage::FindMessenger(const char* name, int32 index, BMessenger* m) const -{ - void* data = NULL; - ssize_t size = 0; - status_t err = FindData(name, B_MESSENGER_TYPE, index, (const void **)&data, &size); - if (err == B_OK) - memcpy(m, data, sizeof(BMessenger)); - else - *m = BMessenger(); - return err; -} - - -status_t -BMessage::FindRef(const char* name, entry_ref* ref) const -{ - return FindRef(name, 0, ref); -} - - -status_t -BMessage::FindRef(const char* name, int32 index, entry_ref* ref) const -{ - void* data = NULL; - ssize_t size = 0; - status_t err = FindData(name, B_REF_TYPE, index, (const void**)&data, &size); - if (err == B_OK) - err = entry_ref_unflatten(ref, (char*)data, size); - else - *ref = entry_ref(); - return err; -} - - -status_t -BMessage::FindMessage(const char* name, BMessage* msg) const -{ - return FindMessage(name, 0, msg); -} - - -status_t -BMessage::FindMessage(const char* name, int32 index, BMessage* msg) const -{ - void* data = NULL; - ssize_t size = 0; - status_t err = FindData(name, B_MESSAGE_TYPE, index, (const void**)&data, &size); - if (!err) - err = msg->Unflatten((const char*)data); - else - *msg = BMessage(); - return err; -} - - -status_t -BMessage::FindFlat(const char* name, BFlattenable* obj) const -{ - return FindFlat(name, 0, obj); -} - - -status_t -BMessage::FindFlat(const char* name, int32 index, BFlattenable* obj) const -{ - void* data = NULL; - ssize_t numBytes = 0; - status_t err = FindData(name, obj->TypeCode(), index, (const void**)&data, &numBytes); - if (!err) - err = obj->Unflatten(obj->TypeCode(), data, numBytes); - return err; -} - - -status_t -BMessage::FindData(const char* name, type_code type, const void** data, - ssize_t* numBytes) const -{ - return FindData(name, type, 0, data, numBytes); -} - - -status_t -BMessage::FindData(const char* name, type_code type, int32 index, - const void** data, ssize_t* numBytes) const -{ - return fBody->FindData(name, type, index, data, numBytes); -} - - -status_t -BMessage::ReplaceString(const char* name, const char* string) -{ - return ReplaceString(name, 0, string); -} - - -status_t -BMessage::ReplaceString(const char* name, int32 index, const char* string) -{ - return ReplaceData(name, B_STRING_TYPE, index, string, strlen(string)+1); -} - - -status_t -BMessage::ReplaceString(const char* name, const BString& string) -{ - return ReplaceString(name, 0, string); -} - - -status_t -BMessage::ReplaceString(const char* name, int32 index, const BString& string) -{ - return ReplaceData(name, B_STRING_TYPE, index, string.String(), string.Length()+1); -} - - -status_t -BMessage::ReplacePointer(const char* name, const void* ptr) -{ - return ReplacePointer(name, 0, ptr); -} - - -status_t -BMessage::ReplacePointer(const char* name, int32 index, const void* ptr) -{ - return ReplaceData(name, B_POINTER_TYPE, index, &ptr, sizeof(ptr)); -} - - -status_t -BMessage::ReplaceMessenger(const char* name, BMessenger messenger) -{ - return ReplaceData(name, B_MESSENGER_TYPE, 0, &messenger, sizeof(BMessenger)); -} - - -status_t -BMessage::ReplaceMessenger(const char* name, int32 index, BMessenger messenger) -{ - return ReplaceData(name, B_MESSENGER_TYPE, index, &messenger, sizeof(BMessenger)); -} - - -status_t -BMessage::ReplaceRef(const char* name, const entry_ref* ref) -{ - return ReplaceRef(name, 0, ref); -} - - -status_t -BMessage::ReplaceRef(const char* name, int32 index, const entry_ref* ref) -{ - char* buffer = new(nothrow) char[sizeof (entry_ref) + B_PATH_NAME_LENGTH]; - if (buffer == NULL) - return B_NO_MEMORY; - - size_t size; - status_t err = entry_ref_flatten(buffer, &size, ref); - if (err >= B_OK) { - BDataBuffer dataBuffer((void*)buffer, size); - err = fBody->ReplaceData(name, index, dataBuffer, B_REF_TYPE); - } else - delete[] buffer; - - return err; -} - - -status_t -BMessage::ReplaceMessage(const char* name, const BMessage* msg) -{ - return ReplaceMessage(name, 0, msg); -} - - -status_t -BMessage::ReplaceMessage(const char* name, int32 index, const BMessage* msg) -{ - ssize_t size = msg->FlattenedSize(); - char* buffer = new(nothrow) char[size]; - if (buffer == NULL) - return B_NO_MEMORY; - - status_t err = msg->Flatten(buffer, size); - if (err >= B_OK) { - BDataBuffer dataBuffer((void*)buffer, size); - err = fBody->ReplaceData(name, index, dataBuffer, B_MESSAGE_TYPE); - } else - delete[] buffer; - - return err; -} - - -status_t -BMessage::ReplaceFlat(const char* name, BFlattenable* object) -{ - return ReplaceFlat(name, 0, object); -} - - -status_t -BMessage::ReplaceFlat(const char* name, int32 index, BFlattenable* object) -{ - ssize_t size = object->FlattenedSize(); - char* buffer = new(nothrow) char[size]; - if (buffer == NULL) - return B_NO_MEMORY; - - status_t err = object->Flatten(buffer, size); - if (err >= B_OK) { - BDataBuffer dataBuffer((void*)buffer, size); - err = fBody->ReplaceData(name, index, dataBuffer, object->TypeCode()); - } else - delete[] buffer; - - return err; -} - - -status_t -BMessage::ReplaceData(const char* name, type_code type, - const void* data, ssize_t data_size) -{ - return ReplaceData(name, type, 0, data, data_size); -} - - -status_t -BMessage::ReplaceData(const char* name, type_code type, int32 index, - const void* data, ssize_t data_size) -{ - BDataBuffer databuffer((void*)data, data_size, true); - return fBody->ReplaceData(name, index, databuffer, type); -} - - -void* -BMessage::operator new(size_t size) -{ - if (!sMsgCache) - sMsgCache = new BBlockCache(10, size, B_OBJECT_CACHE); - - return sMsgCache->Get(size); -} - - -void* -BMessage::operator new(size_t, void* p) -{ - return p; -} - - -void -BMessage::operator delete(void* ptr, size_t size) -{ - sMsgCache->Save(ptr, size); -} - - -bool -BMessage::HasFlat(const char* name, const BFlattenable* flat) const -{ - return HasFlat(name, 0, flat); -} - - -bool -BMessage::HasFlat(const char* name, int32 n, const BFlattenable* flat) const -{ - return fBody->HasData(name, flat->TypeCode(), n); -} - - -bool -BMessage::HasData(const char* name, type_code t, int32 n) const -{ - return fBody->HasData(name, t, n); -} - - -BRect -BMessage::FindRect(const char* name, int32 n) const -{ - BRect r(0, 0, -1, -1); - FindRect(name, n, &r); - return r; -} - - -BPoint -BMessage::FindPoint(const char* name, int32 n) const -{ - BPoint p(0, 0); - FindPoint(name, n, &p); - return p; -} - - -status_t -BMessage::real_flatten(char* result, ssize_t size) const -{ - BMemoryIO stream((void*)result, size); - return real_flatten(&stream); -} - - -status_t -BMessage::real_flatten(BDataIO* stream) const -{ - Header header(*this); - - status_t err = header.WriteTo(*stream); - - if (!err) - err = fBody->Flatten(stream); - - return err; -} - - -char* -BMessage::stack_flatten(char* stack_ptr, ssize_t stack_size, - bool /*incl_reply*/, ssize_t* size) const -{ - const ssize_t calcd_size = calc_hdr_size(0) + fBody->FlattenedSize(); - char* new_ptr = NULL; - if (calcd_size > stack_size) { - stack_ptr = new char[calcd_size]; - new_ptr = stack_ptr; - } - - real_flatten(stack_ptr, calcd_size); - if (size) - *size = calcd_size; - - return new_ptr; -} - - -status_t -BMessage::_UnflattenKMessage(const char *buffer) -{ - // init a real KMessage - KMessage message; - status_t error = message.SetTo(buffer, ((KMessage::Header*)buffer)->size); - if (error != B_OK) - return error; - - // let convert_message() do the real job - return convert_message(&message, this); -} - - -ssize_t -BMessage::calc_hdr_size(uchar flags) const -{ - ssize_t size = min_hdr_size(); - - if (fTarget != B_NULL_TOKEN) - size += sizeof (fTarget); - - if (fReplyTo.port >= 0 - && fReplyTo.target != B_NULL_TOKEN - && fReplyTo.team >= 0) { - size += sizeof (fReplyTo.port); - size += sizeof (fReplyTo.target); - size += sizeof (fReplyTo.team); - - size += 4; // For the "big" flags - } - - return size; -} - - -status_t -BMessage::_send_(port_id port, int32 token, bigtime_t timeout, - bool reply_required, BMessenger& reply_to) const -{ - PRINT(("BMessage::_send_(port: %ld, token: %ld): " - "what: %lx (%.4s)\n", port, token, what, (char*)&what)); - - bool oldPreferred = fPreferred; - int32 oldTarget = fTarget; - reply_to_info oldReplyTo = fReplyTo; - - if (!reply_to.IsValid()) { - BMessenger::Private(reply_to).SetTo(fReplyTo.team, - fReplyTo.port, fReplyTo.target); - if (!reply_to.IsValid()) - reply_to = be_app_messenger; - } - - BMessage* self = const_cast(this); - BMessenger::Private replyToPrivate(reply_to); - self->fPreferred = token == B_PREFERRED_TOKEN; - self->fTarget = token; - self->fReplyRequired = reply_required; - self->fReplyTo.team = replyToPrivate.Team(); - self->fReplyTo.port = replyToPrivate.Port(); - self->fReplyTo.target = (replyToPrivate.IsPreferredTarget() - ? B_PREFERRED_TOKEN : replyToPrivate.Token()); - self->fReplyTo.preferred = replyToPrivate.IsPreferredTarget(); - - char tmp[0x800]; - ssize_t size; - char* p = stack_flatten(tmp, sizeof(tmp), true /* include reply */, &size); - char* pMem = p ? p : tmp; - status_t err; - do { - err = write_port_etc(port, 'pjpp', pMem, size, B_RELATIVE_TIMEOUT, timeout); - } while (err == B_INTERRUPTED); - if (p) - delete[] p; - - self->fPreferred = oldPreferred; - self->fTarget = oldTarget; - self->fReplyRequired = false; // To this copy, no reply is required. - // Only relevant when forwarding anyway. - self->fReplyTo = oldReplyTo; - - PRINT(("BMessage::_send_() done: %lx\n", err)); - return err; -} - - -status_t -BMessage::send_message(port_id port, team_id port_owner, int32 token, - BMessage* reply, bigtime_t send_timeout, - bigtime_t reply_timeout) const -{ - const int32 cached_reply_port = sGetCachedReplyPort(); - port_id reply_port; - status_t err; - if (cached_reply_port == -1) { - // All the cached reply ports are in use; create a new one - reply_port = create_port(1 /* for one message */, "tmp_reply_port"); - if (reply_port < 0) - return reply_port; - } else { - assert(cached_reply_port < sNumReplyPorts); - reply_port = sReplyPorts[cached_reply_port]; - } - - team_id team = B_BAD_TEAM_ID; - if (be_app != NULL) - team = be_app->Team(); - else { - port_info pi; - err = get_port_info(reply_port, &pi); - if (err) - goto error; - - team = pi.team; - } - - err = set_port_owner(reply_port, port_owner); - if (err) - goto error; - - { - BMessenger messenger; - BMessenger::Private(messenger).SetTo(team, reply_port, - B_PREFERRED_TOKEN); - err = _send_(port, token, send_timeout, true, messenger); - } - if (err) - goto error; - - int32 code; - err = handle_reply(reply_port, &code, reply_timeout, reply); - if (err && cached_reply_port >= 0) { - delete_port(reply_port); - sReplyPorts[cached_reply_port] = create_port(1, "tmp_rport"); - } - -error: - if (cached_reply_port >= 0) { - // Reclaim ownership of cached port - set_port_owner(reply_port, team); - // Flag as available - atomic_add(&sReplyPortInUse[cached_reply_port], -1); - return err; - } - delete_port(reply_port); - return err; -} - - -// Note, that in case of a flattened BMessage setting the target token will -// change the header size, if no token was set when the message was flattened. -// Hence the message would need to unflattened and flattened again before it -// can be sent. -status_t -BMessage::_SendFlattenedMessage(void *data, int32 size, port_id port, - int32 token, bigtime_t timeout) -{ - if (!data) - return B_BAD_VALUE; - - uint32 magic = *(uint32*)data; - - // prepare flattened fields - if (((KMessage::Header*)data)->magic == KMessage::kMessageHeaderMagic) { - // a KMessage - KMessage::Header *header = (KMessage::Header*)data; - header->targetToken = token; - } else if (magic == kMessageMagic || magic == kMessageMagicSwapped) { - // get the header - BMemoryIO stream(data, size); - - stream.Read(&magic, sizeof(uint32)); - // "discard" the magic (we already know it anyway) - - Header header; - status_t error = header.SetMagic(magic); - if (error != B_OK) - return error; - - error = header.ReadFrom(stream); - if (error != B_OK) - return error; - - if (!header.HasTarget()) { - // fallback implementation -- the header size would change by - // setting the token - - // unflatten the message - BMessage message; - error = message.Unflatten((const char*)data); - if (error != B_OK) - return error; - - // send the message - BMessenger messenger; - return message._send_(port, token, timeout, false, - messenger); - } - - // set the target token and replace the header - header.SetTarget(token); - stream.Seek(0LL, SEEK_SET); - error = header.WriteTo(stream); - if (error != B_OK) - return error; - } else { - return B_NOT_A_MESSAGE; - } - - // send the message - status_t error; - do { - error = write_port_etc(port, 'pjpp', data, size, B_RELATIVE_TIMEOUT, - timeout); - } while (error == B_INTERRUPTED); - - return error; -} - - -void -BMessage::_StaticCacheCleanup() -{ - delete sMsgCache; - sMsgCache = NULL; -} - - -void -BMessage::_StaticInit() -{ - sReplyPorts[0] = create_port(1, "tmp_rport0"); - sReplyPorts[1] = create_port(1, "tmp_rport1"); - sReplyPorts[2] = create_port(1, "tmp_rport2"); - - sReplyPortInUse[0] = 0; - sReplyPortInUse[1] = 0; - sReplyPortInUse[2] = 0; -} - - -void -BMessage::_StaticCleanup() -{ - delete_port(sReplyPorts[0]); - sReplyPorts[0] = -1; - delete_port(sReplyPorts[1]); - sReplyPorts[1] = -1; - delete_port(sReplyPorts[2]); - sReplyPorts[2] = -1; -} - - -int32 -BMessage::sGetCachedReplyPort() -{ - int index = -1; - for (int32 i = 0; i < sNumReplyPorts; i++) - { - int32 old = atomic_add(&(sReplyPortInUse[i]), 1); - if (old == 0) - { - // This entry is free - index = i; - break; - } - else - { - // This entry is being used. - atomic_add(&(sReplyPortInUse[i]), -1); - } - } - - return index; -} - - -static status_t -handle_reply(port_id reply_port, int32* pCode, - bigtime_t timeout, BMessage* reply) -{ - PRINT(("handle_reply(port: %ld)\n", reply_port)); - - status_t err; - do { - err = port_buffer_size_etc(reply_port, 8, timeout); - } while (err == B_INTERRUPTED); - - if (err < 0) { - PRINT(("handle_reply() error 1: %lx\n", err)); - return err; - } - - // The API lied. It really isn't an error code, but the message size... - char* pAllocd = NULL; - char* pMem = NULL; - char tmp[0x800]; - if (err < 0x800) - pMem = tmp; - else { - pAllocd = new char[err]; - pMem = pAllocd; - } - - do { - err = read_port(reply_port, pCode, pMem, err); - } while (err == B_INTERRUPTED); - - if (err < 0) { - PRINT(("handle_reply() error 2: %lx\n", err)); - return err; - } - - if (*pCode == 'PUSH') { - PRINT(("handle_reply() error 3: %x\n", B_ERROR)); - return B_ERROR; - } - if (*pCode != 'pjpp') { - PRINT(("handle_reply() error 4: port message code not 'pjpp' but " - "'%lx'\n", *pCode)); - return B_ERROR; - } - - err = reply->Unflatten(pMem); - - // There seems to be a bug in the original Be implementation. - // It never free'd pAllocd ! - if (pAllocd) - delete[] pAllocd; - - PRINT(("handle_reply() done: %lx\n", err)); - return err; -} - - -// convert_message -static status_t -convert_message(const KMessage *fromMessage, BMessage *toMessage) -{ - if (!fromMessage || !toMessage) - return B_BAD_VALUE; - - // make empty and init the header of the target message - toMessage->MakeEmpty(); - toMessage->what = fromMessage->What(); - - BMessage::Private toPrivate(toMessage); - toPrivate.SetTarget(fromMessage->TargetToken()); - toPrivate.SetReply(B_SYSTEM_TEAM, fromMessage->ReplyPort(), - fromMessage->ReplyToken()); - - // iterate through the fields and import them in the target message - KMessageField field; - while (fromMessage->GetNextField(&field) == B_OK) { - int32 elementCount = field.CountElements(); - if (elementCount > 0) { - for (int32 i = 0; i < elementCount; i++) { - int32 size; - const void *data = field.ElementAt(i, &size); - status_t error; - if (field.TypeCode() == B_MESSAGE_TYPE) { - // message type: if it's a KMessage, convert it - KMessage message; - if (message.SetTo(data, size) == B_OK) { - BMessage bMessage; - error = convert_message(&message, &bMessage); - if (error != B_OK) - return error; - error = toMessage->AddMessage(field.Name(), &bMessage); - } else { - // just add it - error = toMessage->AddData(field.Name(), - field.TypeCode(), data, size, - field.HasFixedElementSize(), 1); - } - } else { - error = toMessage->AddData(field.Name(), field.TypeCode(), - data, size, field.HasFixedElementSize(), 1); - } - - if (error != B_OK) - return error; - } - } - } - return B_OK; -} - - -static ssize_t -min_hdr_size() -{ - ssize_t size = 0; - - size += 4; // version - size += 4; // checksum - size += 4; // flattened size - size += 4; // 'what' - size += 1; // flags - - return size; -} - -#endif // USING_MESSAGE4 diff --git a/src/kits/app/MessageBody.cpp b/src/kits/app/MessageBody.cpp deleted file mode 100644 index 400ce1ff6a..0000000000 --- a/src/kits/app/MessageBody.cpp +++ /dev/null @@ -1,400 +0,0 @@ -//------------------------------------------------------------------------------ -// Copyright (c) 2001-2002, OpenBeOS -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// File Name: MessageBody.cpp -// Author(s): Erik Jaesler (erik@cgsoftware.com) -// Description: BMessageBody handles data storage and retrieval for -// BMessage. -//------------------------------------------------------------------------------ - -#ifndef USING_MESSAGE4 - -// Standard Includes ----------------------------------------------------------- -#include - -// System Includes ------------------------------------------------------------- -#include - -// Project Includes ------------------------------------------------------------ -#include - -// Local Includes -------------------------------------------------------------- - -// Local Defines --------------------------------------------------------------- - -// Globals --------------------------------------------------------------------- - -namespace BPrivate { - -//------------------------------------------------------------------------------ -BMessageBody::BMessageBody() - : fFlattenedSize(0) -{ -} -//------------------------------------------------------------------------------ -BMessageBody::BMessageBody(const BMessageBody &rhs) -{ - *this = rhs; -} -//------------------------------------------------------------------------------ -BMessageBody::~BMessageBody() -{ - MakeEmpty(); -} -//------------------------------------------------------------------------------ -BMessageBody& BMessageBody::operator=(const BMessageBody &rhs) -{ - if (this != &rhs) - { - MakeEmpty(); - for (TMsgDataMap::const_iterator i = rhs.fData.begin(); - i != rhs.fData.end(); - ++i) - { - BMessageField* BMF = i->second; - fData[BMF->Name()] = BMF->Clone(); - } - fFlattenedSize = rhs.fFlattenedSize; - } - - return *this; -} -//------------------------------------------------------------------------------ -status_t BMessageBody::GetInfo(type_code typeRequested, int32 which, - char** name, type_code* typeReturned, - int32* count) const -{ - TMsgDataMap::const_iterator i = fData.begin(); - int32 index = 0; - for (index = 0; i != fData.end(); ++i) - { - if (B_ANY_TYPE == typeRequested || i->second->Type() == typeRequested) - { - if (index == which) - { - break; - } - ++index; - } - } - - // We couldn't find any appropriate data - if (i == fData.end()) - { - // TODO: research - // Which gets returned on an empty message with - // typeRequested == B_ANY_TYPE? - if (index) - { - // TODO: research - // Is B_NAME_NOT_FOUND ever really returned from this function, as - // the BeBook claims? - return B_BAD_INDEX; - } - else - { - if (count) *count = 0; - return B_BAD_TYPE; - } - } - - // TODO: BC Break - // Change 'name' parameter to const char* - *name = const_cast(i->first.c_str()); - *typeReturned = i->second->Type(); - if (count) *count = i->second->CountItems(); - - return B_OK; -} -//------------------------------------------------------------------------------ -status_t BMessageBody::GetInfo(const char* name, type_code* type, - int32* c) const -{ - status_t err; - BMessageField* BMF = FindData(name, B_ANY_TYPE, err); - if (BMF) { - if (type) - *type = BMF->Type(); - if (c) - *c = BMF->CountItems(); - } else if (c) - *c = 0; - - return err; -} -//------------------------------------------------------------------------------ -status_t BMessageBody::GetInfo(const char* name, type_code* type, - bool* fixed_size) const -{ - status_t err; - BMessageField* BMF = FindData(name, B_ANY_TYPE, err); - if (BMF) - { - *type = BMF->Type(); - *fixed_size = BMF->FixedSize(); - } - - return err; -} -//------------------------------------------------------------------------------ -int32 BMessageBody::CountNames(type_code type) const -{ - if (type == B_ANY_TYPE) - { - return fData.size(); - } - - int32 count = 0; - for (TMsgDataMap::const_iterator i = fData.begin(); i != fData.end(); ++i) - { - if (type == B_ANY_TYPE || i->second->Type() == type) - { - ++count; - } - } - - return count; -} -//------------------------------------------------------------------------------ -bool BMessageBody::IsEmpty() const -{ - return fData.empty(); -} -//------------------------------------------------------------------------------ -void BMessageBody::PrintToStream() const -{ - // TODO: test - for (TMsgDataMap::const_iterator i = fData.begin(); i != fData.end(); ++i) - { - i->second->PrintToStream(i->first.c_str()); - printf("\n"); - } -} -//------------------------------------------------------------------------------ -status_t BMessageBody::Rename(const char* old_entry, const char* new_entry) -{ - TMsgDataMap::iterator i = fData.find(old_entry); - if (i == fData.end()) - { - return B_NAME_NOT_FOUND; - } - BMessageField* BMF = i->second; - RemoveName(new_entry); - fData[new_entry] = BMF; - fData.erase(old_entry); - - return B_OK; -} -//------------------------------------------------------------------------------ -ssize_t BMessageBody::FlattenedSize() const -{ - ssize_t size = 1; // For MSG_LAST_ENTRY - - for (TMsgDataMap::const_iterator i = fData.begin(); i != fData.end(); ++i) - { - BMessageField* BMF = i->second; - size += BMF->FlattenedSize(); - } - - return size; -} -//------------------------------------------------------------------------------ -status_t BMessageBody::Flatten(BDataIO* stream) const -{ - status_t err = B_OK; - - for (TMsgDataMap::const_iterator i = fData.begin(); - i != fData.end() && !err; - ++i) - { - BMessageField* BMF = i->second; - err = BMF->Flatten(*stream); - } - - if (!err) - { - err = stream->Write("", 1); // For MSG_LAST_ENTRY - if (err >= 0) - err = B_OK; - } - - return err; -} -//------------------------------------------------------------------------------ -status_t BMessageBody::AddData(const char* name, type_code type, - const void* data, ssize_t numBytes, - bool is_fixed_size, int32 /* count */) -{ -/** - @note The same logic applies here are in AddFlat(): is_fixed_size and - count aren't useful to us because dynamically adding items isn't - an issue. Nevertheless, we keep is_fixed_size to set flags - appropriately when flattening the message. - */ - - // TODO: test - // In particular, we want to see what happens if is_fixed_size == true and - // the user attempts to add something bigger or smaller. We may need to - // enforce the size thing. - return B_ERROR; -} -//------------------------------------------------------------------------------ -status_t BMessageBody::RemoveData(const char* name, int32 index) -{ - if (index < 0) - { - return B_BAD_VALUE; - } - - status_t err = B_OK; - BMessageField* BMF = FindData(name, B_ANY_TYPE, err); - if (BMF) - { - if (index < BMF->CountItems()) - { - BMF->RemoveItem(index); - if (!BMF->CountItems()) - { - RemoveName(name); - } - } - else - { - err = B_BAD_INDEX; - } - } - - return err; -} -//------------------------------------------------------------------------------ -status_t BMessageBody::RemoveName(const char* name) -{ - TMsgDataMap::iterator i = fData.find(name); - if (i == fData.end()) - { - return B_NAME_NOT_FOUND; - } - - delete i->second; - fData.erase(i); - - return B_OK; -} -//------------------------------------------------------------------------------ -status_t BMessageBody::MakeEmpty() -{ - for (TMsgDataMap::iterator i = fData.begin(); - i != fData.end(); - ++i) - { - delete i->second; - } - - fData.clear(); - return B_OK; -} -//------------------------------------------------------------------------------ -#if 0 -void* BMessageBody::operator new(size_t size) -{ - return ::new BMessageBody; -} -//------------------------------------------------------------------------------ -void BMessageBody::operator delete(void* ptr, size_t size) -{ - ::delete(ptr); -} -#endif -//------------------------------------------------------------------------------ -bool BMessageBody::HasData(const char* name, type_code t, int32 n) const -{ - if (!name || n < 0) - { - return false; - } - - status_t err; - BMessageField* BMF = FindData(name, t, err); - if (!BMF) - { - return false; - } - - if (n >= BMF->CountItems()) - { - return false; - } - - return true; -} -//------------------------------------------------------------------------------ -status_t BMessageBody::FindData(const char *name, type_code type, int32 index, - const void **data, ssize_t *numBytes) const -{ - status_t err; - *data = NULL; - BMessageField* Field = FindData(name, type, err); - if (!err) - { - *data = Field->DataAt(index, numBytes); - // TODO: verify - if (!*data) - { - err = B_BAD_INDEX; - } - } - - return err; -} -//------------------------------------------------------------------------------ -BMessageField* BMessageBody::FindData(const char* name, type_code type, - status_t& err) const -{ - BMessageField* Item = NULL; - if (!name) - { - err = B_BAD_VALUE; - return Item; - } - - err = B_OK; - TMsgDataMap::const_iterator i = fData.find(name); - if (i == fData.end()) - { - err = B_NAME_NOT_FOUND; - } - else - { - Item = i->second; - if (type != B_ANY_TYPE && Item->Type() != type) - { - err = B_BAD_TYPE; - Item = NULL; - } - } - - return Item; -} -//------------------------------------------------------------------------------ - -} // namespace BPrivate - -#endif // USING_MESSAGE4 diff --git a/src/kits/app/MessageField.cpp b/src/kits/app/MessageField.cpp deleted file mode 100644 index ce5bb1b80f..0000000000 --- a/src/kits/app/MessageField.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef USING_MESSAGE4 -//------------------------------------------------------------------------------ -// MessageField.cpp -// -//------------------------------------------------------------------------------ - -// Standard Includes ----------------------------------------------------------- - -// System Includes ------------------------------------------------------------- -#include - -// Project Includes ------------------------------------------------------------ -#include "MessageField.h" - -// Local Includes -------------------------------------------------------------- - -// Local Defines --------------------------------------------------------------- - -// Globals --------------------------------------------------------------------- - -namespace BPrivate { - -const char* BMessageField::sNullData = "\0\0\0\0\0\0\0\0"; - -//------------------------------------------------------------------------------ -void BMessageField::PrintToStream(const char* name) const -{ - int32 type = B_BENDIAN_TO_HOST_INT32(Type()); - printf(" entry %14s, type='%.4s', c=%2ld, ", - name, (char*)&type, CountItems()); - - for (int32 i = 0; i < CountItems(); ++i) - { - if (i) - { - printf(" "); - } - PrintDataItem(i); - } -} -//------------------------------------------------------------------------------ - -} // namespace BPrivate - -#endif // USING_MESSAGE4 diff --git a/src/kits/app/MessageUtils.cpp b/src/kits/app/MessageUtils.cpp deleted file mode 100644 index 8adb9fd387..0000000000 --- a/src/kits/app/MessageUtils.cpp +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Copyright 2001-2005, Haiku. - * Distributed under the terms of the MIT License. - * - * Authors: - * Erik Jaesler (erik@cgsoftware.com) - */ - -#ifdef USING_MESSAGE4 -# include "MessageUtils4.cpp" -#else - -/** Extra messaging utility functions */ - -#include -#include - -#include - - -uint32 -_checksum_(const uchar* buf, int32 size) -{ - uint32 sum = 0; - uint32 temp = 0; - - while (size > 3) { -#if defined(__INTEL__) - sum += B_SWAP_INT32(*(int*)buf); -#else - sum += *(int*)buf; -#endif - - buf += 4; - size -= 4; - } - - while (size > 0) { - temp = (temp << 8) + *buf++; - size -= 1; - } - - return sum + temp; -} - - -namespace BPrivate { // Only putting these here because Be did - -status_t -entry_ref_flatten(char* buffer, size_t* size, const entry_ref* ref) -{ - memcpy((void*)buffer, (const void*)&ref->device, sizeof (ref->device)); - buffer += sizeof (ref->device); - memcpy((void*)buffer, (const void*)&ref->directory, sizeof (ref->directory)); - buffer += sizeof (ref->directory); - - size_t len = 0; - if (ref->name) { - len = strlen(ref->name) + 1; // extra for NULL terminator - memcpy((void*)buffer, (const void*)ref->name, len); - } - - *size = sizeof (ref->device) + sizeof (ref->directory) + len; - return B_OK; -} - - -status_t -entry_ref_unflatten(entry_ref* ref, const char* buffer, size_t size) -{ - if (size < (sizeof (ref->device) + sizeof (ref->directory))) { - *ref = entry_ref(); - return B_BAD_VALUE; - } - - memcpy((void*)&ref->device, (const void*)buffer, sizeof (ref->device)); - buffer += sizeof (ref->device); - memcpy((void*)&ref->directory, (const void*)buffer, - sizeof (ref->directory)); - buffer += sizeof (ref->directory); - - if (ref->device != -1 - && size > (sizeof (ref->device) + sizeof (ref->directory))) { - ref->set_name(buffer); - if (ref->name == NULL) { - *ref = entry_ref(); - return B_NO_MEMORY; - } - } else - ref->set_name(NULL); - - return B_OK; -} - - -status_t -entry_ref_swap(char* buffer, size_t size) -{ - if (size < (sizeof (dev_t) + sizeof (ino_t))) - return B_BAD_DATA; - - dev_t* dev = (dev_t*)buffer; - *dev = B_SWAP_INT32(*dev); - buffer += sizeof (dev_t); - - ino_t* ino = (ino_t*)buffer; - *ino = B_SWAP_INT64(*ino); - - return B_OK; -} - - -size_t -calc_padding(size_t size, size_t boundary) -{ - size_t pad = size % boundary; - if (pad) - pad = boundary - pad; - - return pad; -} - -} // namespace BPrivate - - -// #pragma mark - - - -int32 -TChecksumHelper::CheckSum() -{ - return _checksum_(fBuffer, fBufPtr - fBuffer); -} - -#endif // USING_MESSAGE4