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.512 by root, Sun Apr 11 04:52:07 2010 UTC vs.
Revision 1.522 by root, Sat Apr 17 02:22:14 2010 UTC

… …
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE;
112 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 118our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 119our $USE_FSYNC = 1; # use fsync to write maps - default on
117 120
… …
162 165
163our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
164 167
165sub cf::map::normalise; 168sub cf::map::normalise;
166 169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
167############################################################################# 174#############################################################################
168 175
169%REFLECT = (); 176%REFLECT = ();
170for (@REFLECT) { 177for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 178 my $reflect = JSON::XS::decode_json $_;
… …
258$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
260 267
261 warn Carp::longmess $_[0]; 268 warn Carp::longmess $_[0];
262 269
263 if ($Coro::current == $Coro::main) {#d# 270 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 272 return;#d#
266 }#d# 273 }#d#
267 274
268 # kill coroutine otherwise 275 # kill coroutine otherwise
… …
396} 403}
397 404
398=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
399 406
400Like EV::periodic, but randomly selects a starting point so that the actions 407Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 408get spread over time.
402 409
403=cut 410=cut
404 411
405sub periodic($$) { 412sub periodic($$) {
406 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
… …
584 reset_signals; 591 reset_signals;
585 &$cb 592 &$cb
586 }, @args; 593 }, @args;
587 594
588 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
589} 607}
590 608
591=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
592 610
593=cut 611=cut
… …
1422 if (length $@) { 1440 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1441 warn "$v->{path}: $@\n";
1424 1442
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1444 if exists $v->{meta}{mandatory};
1445
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1447 delete $todo{$k};
1427 } else { 1448 } else {
1428 $done{$k} = delete $todo{$k}; 1449 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1450 push @EXTS, $v->{pkg};
1430 $progress = 1; 1451 $progress = 1;
1431 1452
… …
2198 $MAP_PREFETCHER->prio (6); 2219 $MAP_PREFETCHER->prio (6);
2199 2220
2200 () 2221 ()
2201} 2222}
2202 2223
2224# common code, used by both ->save and ->swapout
2203sub save { 2225sub _save {
2204 my ($self) = @_; 2226 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2227
2208 $self->{last_save} = $cf::RUNTIME; 2228 $self->{last_save} = $cf::RUNTIME;
2209 2229
2210 return unless $self->dirty; 2230 return unless $self->dirty;
2211 2231
… …
2231 } else { 2251 } else {
2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2252 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2233 } 2253 }
2234} 2254}
2235 2255
2256sub save {
2257 my ($self) = @_;
2258
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
2261 $self->_save;
2262}
2263
2236sub swap_out { 2264sub swap_out {
2237 my ($self) = @_; 2265 my ($self) = @_;
2238 2266
2239 # save first because save cedes
2240 $self->save;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2267 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243 2268
2244 return if $self->players;
2245 return if $self->in_memory != cf::MAP_ACTIVE; 2269 return if $self->in_memory != cf::MAP_ACTIVE;
2246 return if $self->{deny_save}; 2270 return if $self->{deny_save};
2271 return if $self->players;
2247 2272
2248 $self->in_memory (cf::MAP_SWAPPED); 2273 # first deactivate the map and "unlink" it from the core
2249
2250 $self->deactivate; 2274 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP; 2275 $_->clear_links_to ($self) for values %cf::MAP;
2276 $self->in_memory (cf::MAP_SWAPPED);
2277
2278 # then atomically save
2279 $self->_save;
2280
2281 # then free the map
2252 $self->clear; 2282 $self->clear;
2253} 2283}
2254 2284
2255sub reset_at { 2285sub reset_at {
2256 my ($self) = @_; 2286 my ($self) = @_;
… …
2585 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2615 return if UNIVERSAL::isa $self->map, "ext::map_link";
2586 2616
2587 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2617 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2588 if $self->map && $self->map->{path} ne "{link}"; 2618 if $self->map && $self->map->{path} ne "{link}";
2589 2619
2590 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2620 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2591} 2621}
2592 2622
2593sub cf::object::player::leave_link { 2623sub cf::object::player::leave_link {
2594 my ($self, $map, $x, $y) = @_; 2624 my ($self, $map, $x, $y) = @_;
2595 2625
… …
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3559 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3560 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3561 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3562 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533 3563
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3564 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540 3565
3541 # we must not ever block the main coroutine 3566 # we must not ever block the main coroutine
3542 local $Coro::idle = sub { 3567 local $Coro::idle = sub {
3543 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3568 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
… …
3548 }; 3573 };
3549 3574
3550 evthread_start IO::AIO::poll_fileno; 3575 evthread_start IO::AIO::poll_fileno;
3551 3576
3552 cf::sync_job { 3577 cf::sync_job {
3578 cf::init_experience;
3579 cf::init_anim;
3580 cf::init_attackmess;
3581 cf::init_dynamic;
3582
3553 cf::load_settings; 3583 cf::load_settings;
3554 cf::load_materials; 3584 cf::load_materials;
3555 3585
3556 reload_resources; 3586 reload_resources;
3557 reload_config; 3587 reload_config;
… …
3573 use POSIX (); 3603 use POSIX ();
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3604 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575 3605
3576 (pop @POST_INIT)->(0) while @POST_INIT; 3606 (pop @POST_INIT)->(0) while @POST_INIT;
3577 }; 3607 };
3608
3609 cf::object::thawer::errors_are_fatal 0;
3610 warn "parse errors in files are no longer fatal from this point on.\n";
3578 3611
3579 main_loop; 3612 main_loop;
3580} 3613}
3581 3614
3582############################################################################# 3615#############################################################################
… …
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3792 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) { 3793 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"}; 3794 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3795# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 } 3796 }
3764 warn "cleared package $pkg\n";#d#
3765} 3797}
3766 3798
3767sub do_reload_perl() { 3799sub do_reload_perl() {
3768 # can/must only be called in main 3800 # can/must only be called in main
3769 if ($Coro::current != $Coro::main) { 3801 if (in_main) {
3770 warn "can only reload from main coroutine"; 3802 warn "can only reload from main coroutine";
3771 return; 3803 return;
3772 } 3804 }
3773 3805
3774 return if $RELOAD++; 3806 return if $RELOAD++;

Diff Legend

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