Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Add locking system to BCountry to avoid problems with the formatters being deleted while you use them, or created multiple times.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37716 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adrien Destugues 2010-07-23 11:38:37 +00:00
parent 2d95bec958
commit 6c178e1e73
2 changed files with 110 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
headers/os/locale/Country.h
View File

@ -4,6 +4,7 @@
#include <SupportDefs.h>
#include <LocaleStrings.h>
#include <Locker.h>
#include <String.h>
@ -114,14 +115,21 @@ class BCountry {
status_t GetTimeZones(BMessage* timezones);
private:
icu_44::DateFormat* DateFormatter(bool longFormat);
icu_44::DateFormat* TimeFormatter(bool longFormat);
icu_44::DateFormat* LockDateFormatter(bool longFormat);
icu_44::DateFormat* LockTimeFormatter(bool longFormat);
void UnlockDateFormatter(bool longFormat);
void UnlockTimeFormatter(bool longFormat);
icu_44::DateFormat* fICULongDateFormatter;
icu_44::DateFormat* fICUShortDateFormatter;
icu_44::DateFormat* fICULongTimeFormatter;
icu_44::DateFormat* fICUShortTimeFormatter;
icu_44::Locale* fICULocale;
BLocker fLongDateLock;
BLocker fShortDateLock;
BLocker fLongTimeLock;
BLocker fShortTimeLock;
};
#endif /* _COUNTRY_H_ */

127
src/kits/locale/Country.cpp
View File

@ -100,6 +100,11 @@ BCountry::operator=(const BCountry& other)
if (this == &other)
return *this;
fLongDateLock.Lock();
fShortDateLock.Lock();
fLongTimeLock.Lock();
fShortTimeLock.Lock();
delete fICULongTimeFormatter;
delete fICUShortTimeFormatter;
delete fICULongDateFormatter;
@ -115,6 +120,11 @@ BCountry::operator=(const BCountry& other)
fICULongTimeFormatter = NULL;
fICUShortTimeFormatter = NULL;
fShortTimeLock.Unlock();
fLongTimeLock.Unlock();
fShortDateLock.Unlock();
fLongDateLock.Unlock();
return *this;
}
@ -185,17 +195,19 @@ BCountry::GetIcon(BBitmap* result)
DateFormat*
BCountry::DateFormatter(bool longFormat)
BCountry::LockDateFormatter(bool longFormat)
{
// TODO: ICU allows for 4 different levels of expansion :
// short, medium, long, and full. Our bool parameter is not enough...
if (longFormat) {
fLongDateLock.Lock();
if (fICULongDateFormatter == NULL) {
fICULongDateFormatter = DateFormat::createDateInstance(
DateFormat::FULL, *fICULocale);
}
return fICULongDateFormatter;
} else {
fShortDateLock.Lock();
if (fICUShortDateFormatter == NULL) {
fICUShortDateFormatter = DateFormat::createDateInstance(
DateFormat::SHORT, *fICULocale);
@ -205,18 +217,31 @@ BCountry::DateFormatter(bool longFormat)
}
void
BCountry::UnlockDateFormatter(bool longFormat)
{
if (longFormat) {
fLongDateLock.Unlock();
} else {
fShortDateLock.Unlock();
}
}
DateFormat*
BCountry::TimeFormatter(bool longFormat)
BCountry::LockTimeFormatter(bool longFormat)
{
// TODO: ICU allows for 4 different levels of expansion :
// short, medium, long, and full. Our bool parameter is not enough...
if (longFormat) {
fLongTimeLock.Lock();
if (fICULongTimeFormatter == NULL) {
fICULongTimeFormatter = DateFormat::createTimeInstance(
DateFormat::MEDIUM, *fICULocale);
}
return fICULongTimeFormatter;
} else {
fShortTimeLock.Lock();
if (fICUShortTimeFormatter == NULL) {
fICUShortTimeFormatter = DateFormat::createTimeInstance(
DateFormat::SHORT, *fICULocale);
@ -226,16 +251,31 @@ BCountry::TimeFormatter(bool longFormat)
}
void
BCountry::UnlockTimeFormatter(bool longFormat)
{
if (longFormat) {
fLongTimeLock.Unlock();
} else {
fShortTimeLock.Unlock();
}
}
status_t
BCountry::FormatDate(char* string, size_t maxSize, time_t time, bool longFormat)
{
ICU_VERSION::DateFormat* dateFormatter = DateFormatter(longFormat);
if (dateFormatter == NULL)
ICU_VERSION::DateFormat* dateFormatter = LockDateFormatter(longFormat);
if (dateFormatter == NULL) {
UnlockDateFormatter(longFormat);
return B_NO_MEMORY;
}
UnicodeString ICUString;
ICUString = dateFormatter->format((UDate)time * 1000, ICUString);
UnlockDateFormatter(longFormat);
CheckedArrayByteSink stringConverter(string, maxSize);
ICUString.toUTF8(stringConverter);
@ -253,12 +293,15 @@ BCountry::FormatDate(BString *string, time_t time, bool longFormat)
string->Truncate(0);
// We make the string empty, this way even in cases where ICU fail we at
// least return something sane
ICU_VERSION::DateFormat* dateFormatter = DateFormatter(longFormat);
if (dateFormatter == NULL)
ICU_VERSION::DateFormat* dateFormatter = LockDateFormatter(longFormat);
if (dateFormatter == NULL) {
UnlockDateFormatter(longFormat);
return B_NO_MEMORY;
}
UnicodeString ICUString;
ICUString = dateFormatter->format((UDate)time * 1000, ICUString);
UnlockDateFormatter(longFormat);
BStringByteSink stringConverter(string);
@ -274,16 +317,19 @@ BCountry::FormatDate(BString* string, int*& fieldPositions, int& fieldCount,
{
string->Truncate(0);
ICU_VERSION::DateFormat* dateFormatter = DateFormatter(longFormat);
if (dateFormatter == NULL)
ICU_VERSION::DateFormat* dateFormatter = LockDateFormatter(longFormat);
if (dateFormatter == NULL) {
UnlockDateFormatter(longFormat);
return B_NO_MEMORY;
}
fieldPositions = NULL;
UErrorCode error = U_ZERO_ERROR;
ICU_VERSION::FieldPositionIterator positionIterator;
UnicodeString ICUString;
ICUString = DateFormatter(longFormat)->format((UDate)time * 1000, ICUString,
ICUString = dateFormatter->format((UDate)time * 1000, ICUString,
&positionIterator, error);
UnlockDateFormatter(longFormat);
if (error != U_ZERO_ERROR)
return B_ERROR;
@ -315,15 +361,18 @@ BCountry::DateFormat(BString& format, bool longFormat)
{
format.Truncate(0);
ICU_VERSION::DateFormat* dateFormatter = DateFormatter(longFormat);
if (dateFormatter == NULL)
ICU_VERSION::DateFormat* dateFormatter = LockDateFormatter(longFormat);
if (dateFormatter == NULL) {
UnlockDateFormatter(longFormat);
return B_NO_MEMORY;
}
SimpleDateFormat* dateFormatterImpl
= static_cast<SimpleDateFormat*>(dateFormatter);
UnicodeString ICUString;
ICUString = dateFormatterImpl->toPattern(ICUString);
UnlockDateFormatter(longFormat);
BStringByteSink stringConverter(&format);
@ -336,15 +385,18 @@ BCountry::DateFormat(BString& format, bool longFormat)
status_t
BCountry::SetDateFormat(const char* formatString, bool longFormat)
{
ICU_VERSION::DateFormat* dateFormatter = DateFormatter(longFormat);
if (dateFormatter == NULL)
ICU_VERSION::DateFormat* dateFormatter = LockDateFormatter(longFormat);
if (dateFormatter == NULL) {
UnlockDateFormatter(longFormat);
return B_NO_MEMORY;
}
SimpleDateFormat* dateFormatterImpl
= static_cast<SimpleDateFormat*>(dateFormatter);
UnicodeString pattern(formatString);
dateFormatterImpl->applyPattern(pattern);
UnlockDateFormatter(longFormat);
return B_OK;
}
@ -353,9 +405,11 @@ BCountry::SetDateFormat(const char* formatString, bool longFormat)
status_t
BCountry::DateFields(BDateElement*& fields, int& fieldCount, bool longFormat)
{
ICU_VERSION::DateFormat* dateFormatter = DateFormatter(longFormat);
if (dateFormatter == NULL)
ICU_VERSION::DateFormat* dateFormatter = LockDateFormatter(longFormat);
if (dateFormatter == NULL) {
UnlockDateFormatter(longFormat);
return B_NO_MEMORY;
}
fields = NULL;
UErrorCode error = U_ZERO_ERROR;
@ -364,6 +418,7 @@ BCountry::DateFields(BDateElement*& fields, int& fieldCount, bool longFormat)
time_t now;
ICUString = dateFormatter->format((UDate)time(&now) * 1000, ICUString,
&positionIterator, error);
UnlockDateFormatter(longFormat);
if (error != U_ZERO_ERROR)
return B_ERROR;
@ -422,12 +477,15 @@ BCountry::StartOfWeek()
status_t
BCountry::FormatTime(char* string, size_t maxSize, time_t time, bool longFormat)
{
ICU_VERSION::DateFormat* timeFormatter = TimeFormatter(longFormat);
if (timeFormatter == NULL)
ICU_VERSION::DateFormat* timeFormatter = LockTimeFormatter(longFormat);
if (timeFormatter == NULL) {
UnlockTimeFormatter(longFormat);
return B_NO_MEMORY;
}
UnicodeString ICUString;
ICUString = timeFormatter->format((UDate)time * 1000, ICUString);
UnlockTimeFormatter(longFormat);
CheckedArrayByteSink stringConverter(string, maxSize);
@ -445,12 +503,15 @@ BCountry::FormatTime(BString* string, time_t time, bool longFormat)
{
string->Truncate(0);
ICU_VERSION::DateFormat* timeFormatter = TimeFormatter(longFormat);
if (timeFormatter == NULL)
ICU_VERSION::DateFormat* timeFormatter = LockTimeFormatter(longFormat);
if (timeFormatter == NULL) {
UnlockTimeFormatter(longFormat);
return B_NO_MEMORY;
}
UnicodeString ICUString;
ICUString = timeFormatter->format((UDate)time * 1000, ICUString);
UnlockTimeFormatter(longFormat);
BStringByteSink stringConverter(string);
@ -466,9 +527,11 @@ BCountry::FormatTime(BString* string, int*& fieldPositions, int& fieldCount,
{
string->Truncate(0);
ICU_VERSION::DateFormat* timeFormatter = TimeFormatter(longFormat);
if (timeFormatter == NULL)
ICU_VERSION::DateFormat* timeFormatter = LockTimeFormatter(longFormat);
if (timeFormatter == NULL) {
UnlockTimeFormatter(longFormat);
return B_NO_MEMORY;
}
fieldPositions = NULL;
UErrorCode error = U_ZERO_ERROR;
@ -476,6 +539,7 @@ BCountry::FormatTime(BString* string, int*& fieldPositions, int& fieldCount,
UnicodeString ICUString;
ICUString = timeFormatter->format((UDate)time * 1000, ICUString,
&positionIterator, error);
UnlockTimeFormatter(longFormat);
if (error != U_ZERO_ERROR)
return B_ERROR;
@ -505,9 +569,11 @@ BCountry::FormatTime(BString* string, int*& fieldPositions, int& fieldCount,
status_t
BCountry::TimeFields(BDateElement*& fields, int& fieldCount, bool longFormat)
{
ICU_VERSION::DateFormat* timeFormatter = TimeFormatter(longFormat);
if (timeFormatter == NULL)
ICU_VERSION::DateFormat* timeFormatter = LockTimeFormatter(longFormat);
if (timeFormatter == NULL) {
UnlockTimeFormatter(longFormat);
return B_NO_MEMORY;
}
fields = NULL;
UErrorCode error = U_ZERO_ERROR;
@ -516,6 +582,7 @@ BCountry::TimeFields(BDateElement*& fields, int& fieldCount, bool longFormat)
time_t now;
ICUString = timeFormatter->format((UDate)time(&now) * 1000, ICUString,
&positionIterator, error);
UnlockTimeFormatter(longFormat);
if (error != U_ZERO_ERROR)
return B_ERROR;
@ -560,15 +627,18 @@ BCountry::TimeFields(BDateElement*& fields, int& fieldCount, bool longFormat)
status_t
BCountry::SetTimeFormat(const char* formatString, bool longFormat)
{
ICU_VERSION::DateFormat* timeFormatter = TimeFormatter(longFormat);
if (timeFormatter == NULL)
ICU_VERSION::DateFormat* timeFormatter = LockTimeFormatter(longFormat);
if (timeFormatter == NULL) {
UnlockTimeFormatter(longFormat);
return B_NO_MEMORY;
}
SimpleDateFormat* dateFormatterImpl
= static_cast<SimpleDateFormat*>(timeFormatter);
UnicodeString pattern(formatString);
dateFormatterImpl->applyPattern(pattern);
UnlockTimeFormatter(longFormat);
return B_OK;
}
@ -577,15 +647,18 @@ BCountry::SetTimeFormat(const char* formatString, bool longFormat)
status_t
BCountry::TimeFormat(BString& format, bool longFormat)
{
ICU_VERSION::DateFormat* timeFormatter = TimeFormatter(longFormat);
if (timeFormatter == NULL)
ICU_VERSION::DateFormat* timeFormatter = LockTimeFormatter(longFormat);
if (timeFormatter == NULL) {
UnlockTimeFormatter(longFormat);
return B_NO_MEMORY;
}
SimpleDateFormat* dateFormatterImpl
= static_cast<SimpleDateFormat*>(timeFormatter);
UnicodeString ICUString;
ICUString = dateFormatterImpl->toPattern(ICUString);
UnlockTimeFormatter(longFormat);
BStringByteSink stringConverter(&format);