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.523 by root, Sat Apr 17 02:39:46 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
… …
1674 \@logins 1695 \@logins
1675} 1696}
1676 1697
1677=item $player->maps 1698=item $player->maps
1678 1699
1700=item cf::player::maps $login
1701
1679Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1680player. May block. 1703player. May block.
1681 1704
1682=cut 1705=cut
1683 1706
… …
1744 1767
1745=cut 1768=cut
1746 1769
1747sub find_by_path($) { 1770sub find_by_path($) {
1748 my ($path) = @_; 1771 my ($path) = @_;
1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1749 1774
1750 my ($match, $specificity); 1775 my ($match, $specificity);
1751 1776
1752 for my $region (list) { 1777 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
… …
2198 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2199 2224
2200 () 2225 ()
2201} 2226}
2202 2227
2228# common code, used by both ->save and ->swapout
2203sub save { 2229sub _save {
2204 my ($self) = @_; 2230 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2231
2208 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2209 2233
2210 return unless $self->dirty; 2234 return unless $self->dirty;
2211 2235
… …
2231 } else { 2255 } else {
2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2256 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2233 } 2257 }
2234} 2258}
2235 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2236sub swap_out { 2268sub swap_out {
2237 my ($self) = @_; 2269 my ($self) = @_;
2238 2270
2239 # save first because save cedes
2240 $self->save;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243 2272
2244 return if $self->players;
2245 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2246 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2247 2276
2248 $self->in_memory (cf::MAP_SWAPPED); 2277 # first deactivate the map and "unlink" it from the core
2249
2250 $self->deactivate; 2278 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP; 2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2252 $self->clear; 2286 $self->clear;
2253} 2287}
2254 2288
2255sub reset_at { 2289sub reset_at {
2256 my ($self) = @_; 2290 my ($self) = @_;
… …
2585 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2586 2620
2587 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2588 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2589 2623
2590 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2591} 2625}
2592 2626
2593sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2594 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2595 2629
… …
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533 3567
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 3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540 3569
3541 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3542 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
3543 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3572 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
… …
3548 }; 3577 };
3549 3578
3550 evthread_start IO::AIO::poll_fileno; 3579 evthread_start IO::AIO::poll_fileno;
3551 3580
3552 cf::sync_job { 3581 cf::sync_job {
3582 cf::init_experience;
3583 cf::init_anim;
3584 cf::init_attackmess;
3585 cf::init_dynamic;
3586
3553 cf::load_settings; 3587 cf::load_settings;
3554 cf::load_materials; 3588 cf::load_materials;
3555 3589
3556 reload_resources; 3590 reload_resources;
3557 reload_config; 3591 reload_config;
… …
3573 use POSIX (); 3607 use POSIX ();
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575 3609
3576 (pop @POST_INIT)->(0) while @POST_INIT; 3610 (pop @POST_INIT)->(0) while @POST_INIT;
3577 }; 3611 };
3612
3613 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n";
3578 3615
3579 main_loop; 3616 main_loop;
3580} 3617}
3581 3618
3582############################################################################# 3619#############################################################################
… …
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) { 3797 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"}; 3798 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 } 3800 }
3764 warn "cleared package $pkg\n";#d#
3765} 3801}
3766 3802
3767sub do_reload_perl() { 3803sub do_reload_perl() {
3768 # can/must only be called in main 3804 # can/must only be called in main
3769 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3770 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3771 return; 3807 return;
3772 } 3808 }
3773 3809
3774 return if $RELOAD++; 3810 return if $RELOAD++;

Diff Legend

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