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

Build registrar for x86_64.

Browse Source
This commit is contained in:
Alex Smith
2012-08-02 10:45:42 +01:00
parent d93ed09564
commit 50cedfd5b0
12 changed files with 50 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/Haiku64Image
+9 -9
View File
@@ -46,7 +46,7 @@ SYSTEM_LIBS = libbe.so libroot.so libroot-addon-icu.so
PRIVATE_SYSTEM_LIBS = ; PRIVATE_SYSTEM_LIBS = ;
SYSTEM_SERVERS = ; SYSTEM_SERVERS = registrar ;
SYSTEM_ADD_ONS_BUS_MANAGERS = $(ATA_ONLY)ata pci ps2 isa scsi config_manager ; SYSTEM_ADD_ONS_BUS_MANAGERS = $(ATA_ONLY)ata pci ps2 isa scsi config_manager ;
SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs iso9660 attribute_overlay write_overlay ; SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs iso9660 attribute_overlay write_overlay ;
@@ -97,14 +97,14 @@ AddFilesToHaikuImage system preferences : $(SYSTEM_PREFERENCES) ;
AddFilesToHaikuImage system demos : $(SYSTEM_DEMOS) ; AddFilesToHaikuImage system demos : $(SYSTEM_DEMOS) ;
AddSymlinkToHaikuImage system bin : bash : sh ; AddSymlinkToHaikuImage system bin : bash : sh ;
#AddSymlinkToHaikuImage system bin : less : more ; AddSymlinkToHaikuImage system bin : less : more ;
#AddSymlinkToHaikuImage system bin : gzip : gunzip ; AddSymlinkToHaikuImage system bin : gzip : gunzip ;
#AddSymlinkToHaikuImage system bin : gzip : zcat ; AddSymlinkToHaikuImage system bin : gzip : zcat ;
#AddSymlinkToHaikuImage system bin : zdiff : zcmp ; AddSymlinkToHaikuImage system bin : zdiff : zcmp ;
#AddSymlinkToHaikuImage system bin : unzip : zipinfo ; AddSymlinkToHaikuImage system bin : unzip : zipinfo ;
#AddSymlinkToHaikuImage system bin : gawk : awk ; AddSymlinkToHaikuImage system bin : gawk : awk ;
#AddSymlinkToHaikuImage system bin : grep : egrep ; AddSymlinkToHaikuImage system bin : grep : egrep ;
#AddSymlinkToHaikuImage system bin : grep : fgrep ; AddSymlinkToHaikuImage system bin : grep : fgrep ;
# scripts and data files # scripts and data files
data/system/boot/Bootscript
+3 -3
View File
@@ -93,15 +93,15 @@ fi
# Launch servers # Launch servers
# We must wait for the app_server and registrar to be ready
launch $SERVERS/registrar _roster_thread_ # launch registrar
# If app_server doesn't exist, just run consoled. # If app_server doesn't exist, just run consoled.
if [ ! -f "/boot/$SERVERS/app_server" ]; then if [ ! -f "/boot/$SERVERS/app_server" ]; then
/bin/consoled /bin/consoled
exit exit
fi fi
# We must wait for the app_server and registrar to be ready
launch $SERVERS/registrar _roster_thread_ # launch registrar
launch $SERVERS/debug_server # launch debug_server launch $SERVERS/debug_server # launch debug_server
# Init Network # Init Network
src/servers/registrar/AuthenticationManager.cpp
+2 -1
View File
@@ -975,7 +975,8 @@ AuthenticationManager::_RequestThread()
debug_printf("B_REG_UPDATE_GROUP done: currently unsupported!\n"); debug_printf("B_REG_UPDATE_GROUP done: currently unsupported!\n");
break; break;
default: default:
debug_printf("REG: invalid message: %lu\n", message.What()); debug_printf("REG: invalid message: %" B_PRIu32 "\n",
message.What());
} }
} }
src/servers/registrar/EventQueue.cpp
+2 -2
View File
@@ -114,7 +114,7 @@ EventQueue::EventQueue(const char *name)
EventQueue::~EventQueue() EventQueue::~EventQueue()
{ {
Die(); Die();
while (Event *event = (Event*)fEvents.RemoveItem(0L)) { while (Event *event = (Event*)fEvents.RemoveItem((int32)0)) {
if (event->IsAutoDelete()) if (event->IsAutoDelete())
delete event; delete event;
} }
@@ -347,7 +347,7 @@ EventQueue::_EventLooper()
// do events, that are supposed to go off // do events, that are supposed to go off
while (!fTerminating && Lock() && !fEvents.IsEmpty() while (!fTerminating && Lock() && !fEvents.IsEmpty()
&& system_time() >= _EventAt(0)->Time()) { && system_time() >= _EventAt(0)->Time()) {
Event *event = (Event*)fEvents.RemoveItem(0L); Event *event = (Event*)fEvents.RemoveItem((int32)0);
Unlock(); Unlock();
bool autoDeleteEvent = event->IsAutoDelete(); bool autoDeleteEvent = event->IsAutoDelete();
bool deleteEvent = event->Do(this) || autoDeleteEvent; bool deleteEvent = event->Do(this) || autoDeleteEvent;
src/servers/registrar/MIMEManager.cpp
+3 -3
View File
@@ -181,7 +181,7 @@ MIMEManager::MessageReceived(BMessage *message)
err = fDatabase.GuessMimeType(&ref, &str); err = fDatabase.GuessMimeType(&ref, &str);
else if (err == B_NAME_NOT_FOUND) { else if (err == B_NAME_NOT_FOUND) {
const void *data; const void *data;
int32 dataSize; ssize_t dataSize;
err = message->FindData("data", B_RAW_TYPE, &data, err = message->FindData("data", B_RAW_TYPE, &data,
&dataSize); &dataSize);
if (!err) if (!err)
@@ -290,8 +290,8 @@ MIMEManager::MessageReceived(BMessage *message)
} }
default: default:
printf("MIMEMan: msg->what == %lx (%.4s)\n", message->what, printf("MIMEMan: msg->what == %" B_PRIx32 " (%.4s)\n",
(char*)&(message->what)); message->what, (char*)&(message->what));
BLooper::MessageReceived(message); BLooper::MessageReceived(message);
break; break;
} }
src/servers/registrar/MessagingService.cpp
+7 -6
View File
@@ -408,12 +408,13 @@ MessagingService::_CommandProcessor()
const messaging_command *command = area->PopCommand(); const messaging_command *command = area->PopCommand();
if (!command) { if (!command) {
// something's seriously wrong // something's seriously wrong
ERROR("MessagingService::_CommandProcessor(): area %p (%ld) " ERROR("MessagingService::_CommandProcessor(): area %p (%"
"has command count %ld, but doesn't return any more " B_PRId32 ") has command count %" B_PRId32 ", but doesn't "
"commands.", area, area->ID(), area->CountCommands()); "return any more commands.", area, area->ID(),
area->CountCommands());
break; break;
} }
PRINT("MessagingService::_CommandProcessor(): got command %lu\n", PRINT("MessagingService::_CommandProcessor(): got command %" B_PRIu32 "\n",
command->command); command->command);
// dispatch the command // dispatch the command
@@ -424,7 +425,7 @@ command->command);
command->size - sizeof(messaging_command)); command->size - sizeof(messaging_command));
} else { } else {
WARNING("MessagingService::_CommandProcessor(): No handler " WARNING("MessagingService::_CommandProcessor(): No handler "
"found for command %lu\n", command->command); "found for command %" B_PRIu32 "\n", command->command);
} }
} }
@@ -440,7 +441,7 @@ command->command);
} else { } else {
// Bad, but what can we do? // Bad, but what can we do?
ERROR("MessagingService::_CommandProcessor(): Failed to clone " ERROR("MessagingService::_CommandProcessor(): Failed to clone "
"kernel area %ld: %s\n", area->NextKernelAreaID(), "kernel area %" B_PRId32 ": %s\n", area->NextKernelAreaID(),
strerror(error)); strerror(error));
} }
src/servers/registrar/RecentEntries.cpp
+8 -7
View File
@@ -245,10 +245,10 @@ RecentEntries::Print()
std::list<recent_entry*>::iterator item; std::list<recent_entry*>::iterator item;
int counter = 1; int counter = 1;
for (item = fEntryList.begin(); item != fEntryList.end(); item++) { for (item = fEntryList.begin(); item != fEntryList.end(); item++) {
printf("%d: device == '%ld', dir == '%lld', name == '%s', app == '%s', " printf("%d: device == '%" B_PRIdDEV "', dir == '%" B_PRIdINO "', "
"index == %ld\n", counter++, (*item)->ref.device, "name == '%s', app == '%s', index == %" B_PRId32 "\n", counter++,
(*item)->ref.directory, (*item)->ref.name, (*item)->sig.c_str(), (*item)->ref.device, (*item)->ref.directory, (*item)->ref.name,
(*item)->index); (*item)->sig.c_str(), (*item)->index);
} }
return B_OK; return B_OK;
} }
@@ -308,9 +308,10 @@ RecentEntries::Save(FILE* file, const char *description, const char *tag)
for (std::list<recent_entry*>::iterator item = list.begin(); for (std::list<recent_entry*>::iterator item = list.begin();
item != list.end(); i++, item++) { item != list.end(); i++, item++) {
recent_entry *entry = *item; recent_entry *entry = *item;
if (entry) if (entry) {
fprintf(file, " \"%s\" %ld", entry->sig.c_str(), entry->index); fprintf(file, " \"%s\" %" B_PRId32, entry->sig.c_str(),
else { entry->index);
} else {
D(PRINT("WARNING: RecentEntries::Save(): The entry %ld " D(PRINT("WARNING: RecentEntries::Save(): The entry %ld "
"entries from the front of the compiled recent_entry* " "entries from the front of the compiled recent_entry* "
"list for the entry ref (%ld, %lld, '%s') was found to " "list for the entry ref (%ld, %lld, '%s') was found to "
src/servers/registrar/mime/AssociatedTypes.cpp
+3 -2
View File
@@ -398,9 +398,10 @@ AssociatedTypes::BuildAssociatedTypesTable()
if (!err) { if (!err) {
fHaveDoneFullBuild = true; fHaveDoneFullBuild = true;
// PrintToStream(); // PrintToStream();
} else {
DBG(OUT("Mime::AssociatedTypes::BuildAssociatedTypesTable() failed, "
"error code == 0x%" B_PRIx32 "\n", err));
} }
else
DBG(OUT("Mime::AssociatedTypes::BuildAssociatedTypesTable() failed, error code == 0x%lx\n", err));
return err; return err;
} }
src/servers/registrar/mime/InstalledTypes.cpp
+4 -2
View File
@@ -406,7 +406,8 @@ InstalledTypes::_BuildInstalledTypesList()
// Add this supertype // Add this supertype
std::map<std::string, Supertype>::iterator i; std::map<std::string, Supertype>::iterator i;
if (_AddSupertype(supertype, i) != B_OK) if (_AddSupertype(supertype, i) != B_OK)
DBG(OUT("Mime::InstalledTypes::BuildInstalledTypesList() -- Error adding supertype '%s': 0x%lx\n", DBG(OUT("Mime::InstalledTypes::BuildInstalledTypesList()"
" -- Error adding supertype '%s': 0x%" B_PRIx32 "\n",
supertype, err)); supertype, err));
Supertype &supertypeRef = fSupertypes[supertype]; Supertype &supertypeRef = fSupertypes[supertype];
@@ -435,7 +436,8 @@ InstalledTypes::_BuildInstalledTypesList()
// Add the subtype // Add the subtype
if (_AddSubtype(supertypeRef, type.String() if (_AddSubtype(supertypeRef, type.String()
+ subStart + 1) != B_OK) { + subStart + 1) != B_OK) {
DBG(OUT("Mime::InstalledTypes::BuildInstalledTypesList() -- Error adding subtype '%s/%s': 0x%lx\n", DBG(OUT("Mime::InstalledTypes::BuildInstalledTypesList()"
" -- Error adding subtype '%s/%s': 0x%" B_PRIx32 "\n",
supertype, type.String() + subStart + 1, err)); supertype, type.String() + subStart + 1, err));
} }
} }
src/servers/registrar/mime/MimeUpdateThread.cpp
+2 -2
View File
@@ -125,9 +125,9 @@ MimeUpdateThread::ThreadFunction()
status_t error = fManagerMessenger.SendMessage(&msg, (BHandler*)NULL, 500000); status_t error = fManagerMessenger.SendMessage(&msg, (BHandler*)NULL, 500000);
if (error) if (error)
OUT("WARNING: ThreadManager::ThreadEntryFunction(): Termination notification " OUT("WARNING: ThreadManager::ThreadEntryFunction(): Termination notification "
"failed with error 0x%lx\n", error); "failed with error 0x%" B_PRIx32 "\n", error);
} }
DBG(OUT("(id: %ld) exiting mime update thread with result 0x%lx\n", DBG(OUT("(id: %ld) exiting mime update thread with result 0x%" B_PRIx32 "\n",
find_thread(NULL), err)); find_thread(NULL), err));
return err; return err;
} }
src/servers/registrar/mime/RegistrarThreadManager.cpp
+3 -2
View File
@@ -199,8 +199,9 @@ RegistrarThreadManager::KillThreads()
(*i)->Id())); (*i)->Id()));
status_t err = kill_thread((*i)->Id()); status_t err = kill_thread((*i)->Id());
if (err) if (err)
OUT("WARNING: RegistrarThreadManager::KillThreads(): kill_thread(%ld) failed with " OUT("WARNING: RegistrarThreadManager::KillThreads(): kill_thread(%"
"error code 0x%lx\n", (*i)->Id(), err); B_PRId32 ") failed with error code 0x%" B_PRIx32 "\n",
(*i)->Id(), err);
} }
DBG(OUT("RegistrarThreadManager::KillThreads(): Cleaning up thread %ld\n", DBG(OUT("RegistrarThreadManager::KillThreads(): Cleaning up thread %ld\n",
(*i)->Id())); (*i)->Id()));
src/servers/registrar/mime/SnifferRules.cpp
+4 -2
View File
@@ -408,8 +408,10 @@ SnifferRules::BuildRuleList()
fMaxBytesNeeded = maxBytesNeeded; fMaxBytesNeeded = maxBytesNeeded;
fHaveDoneFullBuild = true; fHaveDoneFullBuild = true;
// PrintToStream(); // PrintToStream();
} else } else {
DBG(OUT("Mime::SnifferRules::BuildRuleList() failed, error code == 0x%lx\n", err)); DBG(OUT("Mime::SnifferRules::BuildRuleList() failed, error code == 0x%"
B_PRIx32 "\n", err));
}
return err; return err;
} }