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.339 by root, Fri Aug 24 00:26:10 2007 UTC vs.
Revision 1.347 by root, Thu Aug 30 05:16:09 2007 UTC

… …
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util (); 24use Coro::Util ();
25 25
26use JSON::XS 1.4 (); 26use JSON::XS ();
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
… …
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);
… …
1948 1952
1949sub do_load_sync { 1953sub do_load_sync {
1950 my ($map) = @_; 1954 my ($map) = @_;
1951 1955
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current != $Coro::main; 1957 if $Coro::current == $Coro::main;
1954 1958
1955 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1956} 1960}
1957 1961
1958our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
… …
1962 my ($path, $origin, $load) = @_; 1966 my ($path, $origin, $load) = @_;
1963 1967
1964 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1965 1969
1966 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1967 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1968 } 1972 }
1969 1973
1970 $MAP_PREFETCH{$path} |= $load; 1974 $MAP_PREFETCH{$path} |= $load;
1971 1975
1972 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
… …
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
… …
2558=cut 2562=cut
2559 2563
2560sub cf::client::ext_msg($$@) { 2564sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_; 2565 my ($self, $type, @msg) = @_;
2562 2566
2563 my $extcmd = $self->extcmd;
2564
2565 if ($extcmd == 2) { 2567 if ($self->extcmd == 2) {
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2567 } elsif ($extcmd == 1) { # TODO: remove 2569 } elsif ($self->extcmd == 1) { # TODO: remove
2568 push @msg, msgtype => "event_$type"; 2570 push @msg, msgtype => "event_$type";
2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2571 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2570 } 2572 }
2571} 2573}
2572 2574
… …
2579sub cf::client::ext_reply($$@) { 2581sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_; 2582 my ($self, $id, @msg) = @_;
2581 2583
2582 if ($self->extcmd == 2) { 2584 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2585 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) { 2586 } elsif ($self->extcmd == 1) {
2585 #TODO: version 1, remove 2587 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id; 2588 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2589 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 } 2590 }
2589} 2591}
… …
2732 2734
2733The following functions and methods are available within a safe environment: 2735The following functions and methods are available within a safe environment:
2734 2736
2735 cf::object 2737 cf::object
2736 contr pay_amount pay_player map x y force_find force_add 2738 contr pay_amount pay_player map x y force_find force_add
2737 insert remove name archname title slaying race 2739 insert remove name archname title slaying race decrease_ob_nr
2738 2740
2739 cf::object::player 2741 cf::object::player
2740 player 2742 player
2741 2743
2742 cf::player 2744 cf::player
… …
2747 2749
2748=cut 2750=cut
2749 2751
2750for ( 2752for (
2751 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2753 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2752 insert remove inv name archname title slaying race)], 2754 insert remove inv name archname title slaying race
2755 decrease_ob_nr)],
2753 ["cf::object::player" => qw(player)], 2756 ["cf::object::player" => qw(player)],
2754 ["cf::player" => qw(peaceful)], 2757 ["cf::player" => qw(peaceful)],
2755 ["cf::map" => qw(trigger)], 2758 ["cf::map" => qw(trigger)],
2756) { 2759) {
2757 no strict 'refs'; 2760 no strict 'refs';
… …
2833# the server's init and main functions 2836# the server's init and main functions
2834 2837
2835sub load_facedata($) { 2838sub load_facedata($) {
2836 my ($path) = @_; 2839 my ($path) = @_;
2837 2840
2838 my $enc = JSON::XS->new->utf8->canonical; 2841 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839 2842
2840 warn "loading facedata from $path\n"; 2843 warn "loading facedata from $path\n";
2841 2844
2842 my $facedata; 2845 my $facedata;
2843 0 < aio_load $path, $facedata 2846 0 < aio_load $path, $facedata
… …
2998 3001
2999sub init { 3002sub init {
3000 reload_resources; 3003 reload_resources;
3001} 3004}
3002 3005
3003sub cfg_load { 3006sub reload_config {
3004 open my $fh, "<:utf8", "$CONFDIR/config" 3007 open my $fh, "<:utf8", "$CONFDIR/config"
3005 or return; 3008 or return;
3006 3009
3007 local $/; 3010 local $/;
3008 *CFG = YAML::Syck::Load <$fh>; 3011 *CFG = YAML::Syck::Load <$fh>;
… …
3028 (async { 3031 (async {
3029 Event::one_event; 3032 Event::one_event;
3030 })->prio (Coro::PRIO_MAX); 3033 })->prio (Coro::PRIO_MAX);
3031 }; 3034 };
3032 3035
3033 cfg_load; 3036 reload_config;
3034 db_init; 3037 db_init;
3035 load_extensions; 3038 load_extensions;
3036 3039
3037 $TICK_WATCHER->start; 3040 $TICK_WATCHER->start;
3038 Event::loop; 3041 Event::loop;
… …
3231 warn "reloading cf.pm"; 3234 warn "reloading cf.pm";
3232 require cf; 3235 require cf;
3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3236 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3234 3237
3235 warn "loading config and database again"; 3238 warn "loading config and database again";
3236 cf::cfg_load; 3239 cf::reload_config;
3237 3240
3238 warn "loading extensions"; 3241 warn "loading extensions";
3239 cf::load_extensions; 3242 cf::load_extensions;
3240 3243
3241 warn "reattaching attachments to objects/players"; 3244 warn "reattaching attachments to objects/players";

Diff Legend

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