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.342 by root, Sun Aug 26 15:31:02 2007 UTC vs.
Revision 1.345 by root, Tue Aug 28 19:30:11 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 ();
… …
1849 local $self->{deny_reset} = 1; # loading can take a long time 1849 local $self->{deny_reset} = 1; # loading can take a long time
1850 1850
1851 my $path = $self->{path}; 1851 my $path = $self->{path};
1852 1852
1853 { 1853 {
1854 my $guard1 = cf::lock_acquire "map_data:$path";
1854 my $guard = cf::lock_acquire "map_load:$path"; 1855 my $guard2 = cf::lock_acquire "map_load:$path";
1855 1856
1856 return if $self->in_memory != cf::MAP_SWAPPED; 1857 return if $self->in_memory != cf::MAP_SWAPPED;
1857 1858
1858 $self->in_memory (cf::MAP_LOADING); 1859 $self->in_memory (cf::MAP_LOADING);
1859 1860
… …
1987} 1988}
1988 1989
1989sub save { 1990sub save {
1990 my ($self) = @_; 1991 my ($self) = @_;
1991 1992
1992 my $lock = cf::lock_acquire "map_data:" . $self->path; 1993 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 1994
1994 $self->{last_save} = $cf::RUNTIME; 1995 $self->{last_save} = $cf::RUNTIME;
1995 1996
1996 return unless $self->dirty; 1997 return unless $self->dirty;
1997 1998
… …
2020 my ($self) = @_; 2021 my ($self) = @_;
2021 2022
2022 # save first because save cedes 2023 # save first because save cedes
2023 $self->save; 2024 $self->save;
2024 2025
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2026 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2027
2027 return if $self->players; 2028 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY; 2029 return if $self->in_memory != cf::MAP_IN_MEMORY;
2029 return if $self->{deny_save}; 2030 return if $self->{deny_save};
2030 2031
… …
2558=cut 2559=cut
2559 2560
2560sub cf::client::ext_msg($$@) { 2561sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_; 2562 my ($self, $type, @msg) = @_;
2562 2563
2563 my $extcmd = $self->extcmd;
2564
2565 if ($extcmd == 2) { 2564 if ($self->extcmd == 2) {
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2567 } elsif ($extcmd == 1) { # TODO: remove 2566 } elsif ($self->extcmd == 1) { # TODO: remove
2568 push @msg, msgtype => "event_$type"; 2567 push @msg, msgtype => "event_$type";
2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2570 } 2569 }
2571} 2570}
2572 2571
… …
2579sub cf::client::ext_reply($$@) { 2578sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_; 2579 my ($self, $id, @msg) = @_;
2581 2580
2582 if ($self->extcmd == 2) { 2581 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2582 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) { 2583 } elsif ($self->extcmd == 1) {
2585 #TODO: version 1, remove 2584 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id; 2585 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2586 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 } 2587 }
2589} 2588}
… …
2834# the server's init and main functions 2833# the server's init and main functions
2835 2834
2836sub load_facedata($) { 2835sub load_facedata($) {
2837 my ($path) = @_; 2836 my ($path) = @_;
2838 2837
2839 my $enc = JSON::XS->new->utf8->canonical; 2838 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2840 2839
2841 warn "loading facedata from $path\n"; 2840 warn "loading facedata from $path\n";
2842 2841
2843 my $facedata; 2842 my $facedata;
2844 0 < aio_load $path, $facedata 2843 0 < aio_load $path, $facedata
… …
2999 2998
3000sub init { 2999sub init {
3001 reload_resources; 3000 reload_resources;
3002} 3001}
3003 3002
3004sub cfg_load { 3003sub reload_config {
3005 open my $fh, "<:utf8", "$CONFDIR/config" 3004 open my $fh, "<:utf8", "$CONFDIR/config"
3006 or return; 3005 or return;
3007 3006
3008 local $/; 3007 local $/;
3009 *CFG = YAML::Syck::Load <$fh>; 3008 *CFG = YAML::Syck::Load <$fh>;
… …
3029 (async { 3028 (async {
3030 Event::one_event; 3029 Event::one_event;
3031 })->prio (Coro::PRIO_MAX); 3030 })->prio (Coro::PRIO_MAX);
3032 }; 3031 };
3033 3032
3034 cfg_load; 3033 reload_config;
3035 db_init; 3034 db_init;
3036 load_extensions; 3035 load_extensions;
3037 3036
3038 $TICK_WATCHER->start; 3037 $TICK_WATCHER->start;
3039 Event::loop; 3038 Event::loop;
… …
3232 warn "reloading cf.pm"; 3231 warn "reloading cf.pm";
3233 require cf; 3232 require cf;
3234 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3235 3234
3236 warn "loading config and database again"; 3235 warn "loading config and database again";
3237 cf::cfg_load; 3236 cf::reload_config;
3238 3237
3239 warn "loading extensions"; 3238 warn "loading extensions";
3240 cf::load_extensions; 3239 cf::load_extensions;
3241 3240
3242 warn "reattaching attachments to objects/players"; 3241 warn "reattaching attachments to objects/players";

Diff Legend

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