ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.344 by root, Mon Aug 27 02:43:38 2007 UTC vs.
Revision 1.347 by root, Thu Aug 30 05:16:09 2007 UTC

… …
272Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
275returned. 275returned.
276 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
277Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
279 282
280=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
281 284
… …
575 if (1) { 578 if (1) {
576 $md5 = 579 $md5 =
577 join "\x00", 580 join "\x00",
578 $processversion, 581 $processversion,
579 map { 582 map {
580 Coro::cede; 583 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 585 } 0.. $#$src;
583 586
584 587
585 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
1322 1325
1323 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1325 1328
1326 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1327 Coro::cede; 1330 cf::cede_to_tick;
1328} 1331}
1329 1332
1330sub new($) { 1333sub new($) {
1331 my ($login) = @_; 1334 my ($login) = @_;
1332 1335
… …
1849 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1850 1853
1851 my $path = $self->{path}; 1854 my $path = $self->{path};
1852 1855
1853 { 1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1854 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1855 1859
1856 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1857 1861
1858 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1859 1863
1860 $self->alloc; 1864 $self->alloc;
1861 1865
1862 $self->pre_load; 1866 $self->pre_load;
1863 Coro::cede; 1867 cf::cede_to_tick;
1864 1868
1865 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1866 or return; 1870 or return;
1867 1871
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1874 $self->clear_unique_items; 1878 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1876 } 1880 }
1877 } 1881 }
1878 1882
1879 Coro::cede; 1883 cf::cede_to_tick;
1880 # now do the right thing for maps 1884 # now do the right thing for maps
1881 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 1887 unless $self->difficulty;
1884 Coro::cede; 1888 cf::cede_to_tick;
1885 1889
1886 unless ($self->{deny_activate}) { 1890 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 1891 $self->decay_objects;
1888 $self->fix_auto_apply; 1892 $self->fix_auto_apply;
1889 $self->update_buttons; 1893 $self->update_buttons;
1890 Coro::cede; 1894 cf::cede_to_tick;
1891 $self->set_darkness_map; 1895 $self->set_darkness_map;
1892 Coro::cede; 1896 cf::cede_to_tick;
1893 $self->activate; 1897 $self->activate;
1894 } 1898 }
1895 1899
1896 $self->{last_save} = $cf::RUNTIME; 1900 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 1901 $self->last_access ($cf::RUNTIME);
… …
1987} 1991}
1988 1992
1989sub save { 1993sub save {
1990 my ($self) = @_; 1994 my ($self) = @_;
1991 1995
1992 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 1997
1994 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1995 1999
1996 return unless $self->dirty; 2000 return unless $self->dirty;
1997 2001
… …
2020 my ($self) = @_; 2024 my ($self) = @_;
2021 2025
2022 # save first because save cedes 2026 # save first because save cedes
2023 $self->save; 2027 $self->save;
2024 2028
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2030
2027 return if $self->players; 2031 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
2029 return if $self->{deny_save}; 2033 return if $self->{deny_save};
2030 2034
… …
2997 3001
2998sub init { 3002sub init {
2999 reload_resources; 3003 reload_resources;
3000} 3004}
3001 3005
3002sub cfg_load { 3006sub reload_config {
3003 open my $fh, "<:utf8", "$CONFDIR/config" 3007 open my $fh, "<:utf8", "$CONFDIR/config"
3004 or return; 3008 or return;
3005 3009
3006 local $/; 3010 local $/;
3007 *CFG = YAML::Syck::Load <$fh>; 3011 *CFG = YAML::Syck::Load <$fh>;
… …
3027 (async { 3031 (async {
3028 Event::one_event; 3032 Event::one_event;
3029 })->prio (Coro::PRIO_MAX); 3033 })->prio (Coro::PRIO_MAX);
3030 }; 3034 };
3031 3035
3032 cfg_load; 3036 reload_config;
3033 db_init; 3037 db_init;
3034 load_extensions; 3038 load_extensions;
3035 3039
3036 $TICK_WATCHER->start; 3040 $TICK_WATCHER->start;
3037 Event::loop; 3041 Event::loop;
… …
3230 warn "reloading cf.pm"; 3234 warn "reloading cf.pm";
3231 require cf; 3235 require cf;
3232 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3236 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3233 3237
3234 warn "loading config and database again"; 3238 warn "loading config and database again";
3235 cf::cfg_load; 3239 cf::reload_config;
3236 3240
3237 warn "loading extensions"; 3241 warn "loading extensions";
3238 cf::load_extensions; 3242 cf::load_extensions;
3239 3243
3240 warn "reattaching attachments to objects/players"; 3244 warn "reattaching attachments to objects/players";

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines