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.523 by root, Sat Apr 17 02:39:46 2010 UTC vs.
Revision 1.532 by root, Thu Apr 29 07:32:34 2010 UTC

… …
106our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE; # unused
112 112
113our $OUTPUT_RATE_MIN = 4000; 113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
115 118
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 121our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
249 252
250=back 253=back
251 254
252=cut 255=cut
253 256
257sub error(@) { LOG llevError, join "", @_ }
258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
254$Coro::State::WARNHOOK = sub { 263$Coro::State::WARNHOOK = sub {
255 my $msg = join "", @_; 264 my $msg = join "", @_;
256 265
257 $msg .= "\n" 266 $msg .= "\n"
258 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
259 268
260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
261 270
262 LOG llevError, $msg; 271 LOG llevWarn, $msg;
263}; 272};
264 273
265$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
267 276
268 warn Carp::longmess $_[0]; 277 error Carp::longmess $_[0];
269 278
270 if (in_main) {#d# 279 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d# 281 return;#d#
273 }#d# 282 }#d#
274 283
275 # kill coroutine otherwise 284 # kill coroutine otherwise
276 Coro::terminate 285 Coro::terminate
… …
525 my @res; 534 my @res;
526 535
527 (async { 536 (async {
528 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
529 @res = eval { $job->() }; 538 @res = eval { $job->() };
530 warn $@ if $@; 539 error $@ if $@;
531 undef $busy; 540 undef $busy;
532 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
533 542
534 while ($busy) { 543 while ($busy) {
535 if (Coro::nready) { 544 if (Coro::nready) {
… …
746 755
747 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
748 my $data = $process->(\@data); 757 my $data = $process->(\@data);
749 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
750 759
751 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752 761
753 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
754 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
755 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
756 765
… …
766 775
767=cut 776=cut
768 777
769sub datalog($@) { 778sub datalog($@) {
770 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
771 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772} 781}
773 782
774=back 783=back
775 784
776=cut 785=cut
… …
971 980
972 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
973 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974 983
975 } elsif (ref $type) { 984 } elsif (ref $type) {
976 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
977 986
978 } else { 987 } else {
979 shift @arg; 988 shift @arg;
980 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
981 } 990 }
982 } 991 }
983} 992}
984 993
985sub _object_attach { 994sub _object_attach {
… …
995 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
996 } 1005 }
997 1006
998 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
999 } else { 1008 } else {
1000 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
1001 } 1010 }
1002 1011
1003 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
1004} 1013}
1005 1014
… …
1064 1073
1065 for (@$callbacks) { 1074 for (@$callbacks) {
1066 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
1067 1076
1068 if ($@) { 1077 if ($@) {
1069 warn "$@";
1070 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071 override; 1079 override;
1072 } 1080 }
1073 1081
1074 return 1 if $override; 1082 return 1 if $override;
1075 } 1083 }
… …
1154 for (@$attach) { 1162 for (@$attach) {
1155 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
1156 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
1157 } 1165 }
1158 } else { 1166 } else {
1159 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
1160 } 1168 }
1161 } 1169 }
1162} 1170}
1163 1171
1164cf::attachable->attach ( 1172cf::attachable->attach (
… …
1191 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1192 1200
1193 sync_job { 1201 sync_job {
1194 if (length $$rdata) { 1202 if (length $$rdata) {
1195 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1196 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1197 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1198 1207
1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200 aio_chmod $fh, SAVE_MODE; 1209 aio_chmod $fh, SAVE_MODE;
1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202 if ($cf::USE_FSYNC) { 1211 if ($cf::USE_FSYNC) {
… …
1224 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1225 1234
1226 $filename =~ s%/[^/]+$%%; 1235 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC; 1236 aio_pathsync $filename if $cf::USE_FSYNC;
1228 } else { 1237 } else {
1229 warn "unable to save objects: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1230 } 1239 }
1231 } else { 1240 } else {
1232 aio_unlink $filename; 1241 aio_unlink $filename;
1233 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1234 } 1243 }
… …
1258 my $st = eval { Coro::Storable::thaw $av }; 1267 my $st = eval { Coro::Storable::thaw $av };
1259 $av = $st->{objs}; 1268 $av = $st->{objs};
1260 } 1269 }
1261 1270
1262 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1263 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1264 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1265 1275
1266 ($data, $av) 1276 ($data, $av)
1267} 1277}
1268 1278
1269=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
… …
1361 1371
1362 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1363 if $reply; 1373 if $reply;
1364 1374
1365 } else { 1375 } else {
1366 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367 } 1377 }
1368 1378
1369 cf::override; 1379 cf::override;
1370 }, 1380 },
1371); 1381);
… …
1382 1392
1383 $grp 1393 $grp
1384} 1394}
1385 1395
1386sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1387 cf::sync_job { 1399 cf::sync_job {
1388 my %todo; 1400 my %todo;
1389 1401
1390 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1391 next unless -r $path; 1403 next unless -r $path;
… …
1431 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1432 next ext 1444 next ext
1433 unless exists $done{$_}; 1445 unless exists $done{$_};
1434 } 1446 }
1435 1447
1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437 1449
1438 my $active = eval $v->{source}; 1450 my $active = eval $v->{source};
1439 1451
1440 if (length $@) { 1452 if (length $@) {
1441 warn "$v->{path}: $@\n"; 1453 error "$v->{path}: $@\n";
1442 1454
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1455 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444 if exists $v->{meta}{mandatory}; 1456 if exists $v->{meta}{mandatory};
1445 1457
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1458 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1448 } else { 1460 } else {
1449 $done{$k} = delete $todo{$k}; 1461 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg}; 1462 push @EXTS, $v->{pkg};
1451 $progress = 1; 1463 $progress = 1;
1452 1464
1453 warn "$v->{base}: extension inactive.\n" 1465 info "$v->{base}: extension inactive.\n"
1454 unless $active; 1466 unless $active;
1455 } 1467 }
1456 } 1468 }
1457 1469
1458 unless ($progress) { 1470 unless ($progress) {
… …
1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1642 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1631 1643
1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1644 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1633 $pl->deactivate; 1645 $pl->deactivate;
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1646 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1636 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1647 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1637 $pl->ns->destroy if $pl->ns; 1648 $pl->ns->destroy if $pl->ns;
1638 1649
1639 my $path = playerdir $pl; 1650 my $path = playerdir $pl;
1640 my $temp = "$path~$cf::RUNTIME~deleting~"; 1651 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1842 1853
1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844} 1855}
1845 1856
1846# also paths starting with '/' 1857# also paths starting with '/'
1847$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1848 1859
1849sub thawer_merge { 1860sub thawer_merge {
1850 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1851 1862
1852 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
… …
2162 or next; 2173 or next;
2163 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2164 or next; 2175 or next;
2165 $neigh->load; 2176 $neigh->load;
2166 2177
2178 # now find the diagonal neighbours
2167 push @neigh, 2179 push @neigh,
2168 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2169 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2170 } 2182 }
2171 2183
… …
2309 2321
2310 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311 2323
2312 return if $self->players; 2324 return if $self->players;
2313 2325
2314 warn "resetting map ", $self->path, "\n"; 2326 cf::trace "resetting map ", $self->path, "\n";
2315 2327
2316 $self->in_memory (cf::MAP_SWAPPED); 2328 $self->in_memory (cf::MAP_SWAPPED);
2317 2329
2318 # need to save uniques path 2330 # need to save uniques path
2319 unless ($self->{deny_save}) { 2331 unless ($self->{deny_save}) {
… …
2343 2355
2344 delete $cf::MAP{$self->path}; 2356 delete $cf::MAP{$self->path};
2345 2357
2346 $self->unlink_save; 2358 $self->unlink_save;
2347 2359
2348 bless $self, "cf::map"; 2360 bless $self, "cf::map::wrap";
2349 delete $self->{deny_reset}; 2361 delete $self->{deny_reset};
2350 $self->{deny_save} = 1; 2362 $self->{deny_save} = 1;
2351 $self->reset_timeout (1); 2363 $self->reset_timeout (1);
2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2364 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2353 2365
… …
2583 2595
2584Freezes the player and moves him/her to a special map (C<{link}>). 2596Freezes the player and moves him/her to a special map (C<{link}>).
2585 2597
2586The player should be reasonably safe there for short amounts of time (e.g. 2598The player should be reasonably safe there for short amounts of time (e.g.
2587for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2599for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link 2600though, as the player cannot control the character while it is on the link
2589map. 2601map.
2590 2602
2591Will never block. 2603Will never block.
2592 2604
2593=item $player_object->leave_link ($map, $x, $y) 2605=item $player_object->leave_link ($map, $x, $y)
… …
2614sub cf::object::player::enter_link { 2626sub cf::object::player::enter_link {
2615 my ($self) = @_; 2627 my ($self) = @_;
2616 2628
2617 $self->deactivate_recursive; 2629 $self->deactivate_recursive;
2618 2630
2631 ++$self->{_link_recursion};
2632
2619 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2633 return if UNIVERSAL::isa $self->map, "ext::map_link";
2620 2634
2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2635 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622 if $self->map && $self->map->{path} ne "{link}"; 2636 if $self->map && $self->map->{path} ne "{link}";
2623 2637
… …
2654 $map->load_neighbours; 2668 $map->load_neighbours;
2655 2669
2656 return unless $self->contr->active; 2670 return unless $self->contr->active;
2657 2671
2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2672 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659 $self->enter_map ($map, $x, $y); 2673 if ($self->enter_map ($map, $x, $y)) {
2660 2674 # entering was successful
2675 delete $self->{_link_recursion};
2661 # only activate afterwards, to support waiting in hooks 2676 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive; 2677 $self->activate_recursive;
2663} 2678 }
2664 2679
2680}
2681
2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2682=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2666 2683
2667Moves the player to the given map-path and coordinates by first freezing 2684Moves the player to the given map-path and coordinates by first freezing
2668her, loading and preparing them map, calling the provided $check callback 2685her, loading and preparing them map, calling the provided $check callback
2669that has to return the map if sucecssful, and then unfreezes the player on 2686that has to return the map if sucecssful, and then unfreezes the player on
2670the new (success) or old (failed) map position. In either case, $done will 2687the new (success) or old (failed) map position. In either case, $done will
… …
2677 2694
2678our $GOTOGEN; 2695our $GOTOGEN;
2679 2696
2680sub cf::object::player::goto { 2697sub cf::object::player::goto {
2681 my ($self, $path, $x, $y, $check, $done) = @_; 2698 my ($self, $path, $x, $y, $check, $done) = @_;
2699
2700 if ($self->{_link_recursion} >= $MAX_LINKS) {
2701 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2702 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2703 ($path, $x, $y) = @$EMERGENCY_POSITION;
2704 }
2682 2705
2683 # do generation counting so two concurrent goto's will be executed in-order 2706 # do generation counting so two concurrent goto's will be executed in-order
2684 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2707 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2685 2708
2686 $self->enter_link; 2709 $self->enter_link;
… …
2710 my $map = eval { 2733 my $map = eval {
2711 my $map = defined $path ? cf::map::find $path : undef; 2734 my $map = defined $path ? cf::map::find $path : undef;
2712 2735
2713 if ($map) { 2736 if ($map) {
2714 $map = $map->customise_for ($self); 2737 $map = $map->customise_for ($self);
2715 $map = $check->($map) if $check && $map; 2738 $map = $check->($map, $x, $y, $self) if $check && $map;
2716 } else { 2739 } else {
2717 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2740 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2718 } 2741 }
2719 2742
2720 $map 2743 $map
… …
2728 if ($gen == $self->{_goto_generation}) { 2751 if ($gen == $self->{_goto_generation}) {
2729 delete $self->{_goto_generation}; 2752 delete $self->{_goto_generation};
2730 $self->leave_link ($map, $x, $y); 2753 $self->leave_link ($map, $x, $y);
2731 } 2754 }
2732 2755
2733 $done->() if $done; 2756 $done->($self) if $done;
2734 })->prio (1); 2757 })->prio (1);
2735} 2758}
2736 2759
2737=item $player_object->enter_exit ($exit_object) 2760=item $player_object->enter_exit ($exit_object)
2738 2761
… …
2831 $self->message ("Something went wrong deep within the deliantra server. " 2854 $self->message ("Something went wrong deep within the deliantra server. "
2832 . "I'll try to bring you back to the map you were before. " 2855 . "I'll try to bring you back to the map you were before. "
2833 . "Please report this to the dungeon master!", 2856 . "Please report this to the dungeon master!",
2834 cf::NDI_UNIQUE | cf::NDI_RED); 2857 cf::NDI_UNIQUE | cf::NDI_RED);
2835 2858
2836 warn "ERROR in enter_exit: $@"; 2859 error "ERROR in enter_exit: $@";
2837 $self->leave_link; 2860 $self->leave_link;
2838 } 2861 }
2839 })->prio (1); 2862 })->prio (1);
2840} 2863}
2841 2864
… …
3154 3177
3155 $ns->ext_reply ($reply, @reply) 3178 $ns->ext_reply ($reply, @reply)
3156 if $reply; 3179 if $reply;
3157 3180
3158 } else { 3181 } else {
3159 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3182 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3160 } 3183 }
3161 3184
3162 cf::override; 3185 cf::override;
3163 }, 3186 },
3164); 3187);
… …
3294 local @cf::_safe_eval_args = values %vars; 3317 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval; 3318 @res = wantarray ? eval eval : scalar eval $eval;
3296 } 3319 }
3297 3320
3298 if ($@) { 3321 if ($@) {
3299 warn "$@"; 3322 warn "$@",
3300 warn "while executing safe code '$code'\n"; 3323 "while executing safe code '$code'\n",
3301 warn "with arguments " . (join " ", %vars) . "\n"; 3324 "with arguments " . (join " ", %vars) . "\n";
3302 } 3325 }
3303 3326
3304 wantarray ? @res : $res[0] 3327 wantarray ? @res : $res[0]
3305} 3328}
3306 3329
… …
3340 # for this (global event?) 3363 # for this (global event?)
3341 %ext::player_env::MUSIC_FACE_CACHE = (); 3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3342 3365
3343 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3366 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3344 3367
3345 warn "loading facedata from $path\n"; 3368 trace "loading facedata from $path\n";
3346 3369
3347 my $facedata; 3370 my $facedata;
3348 0 < aio_load $path, $facedata 3371 0 < aio_load $path, $facedata
3349 or die "$path: $!"; 3372 or die "$path: $!";
3350 3373
… …
3384 3407
3385 if (my $smooth = cf::face::find $info->{smooth}) { 3408 if (my $smooth = cf::face::find $info->{smooth}) {
3386 cf::face::set_smooth $idx, $smooth; 3409 cf::face::set_smooth $idx, $smooth;
3387 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3410 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3388 } else { 3411 } else {
3389 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3412 error "smooth face '$info->{smooth}' not found for face '$face'";
3390 } 3413 }
3391 3414
3392 cf::cede_to_tick; 3415 cf::cede_to_tick;
3393 } 3416 }
3394 } 3417 }
… …
3412 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3435 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3413 3436
3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3437 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3415 cf::face::set_type $idx, $info->{type}; 3438 cf::face::set_type $idx, $info->{type};
3416 } else { 3439 } else {
3417 $RESOURCE{$name} = $info; 3440 $RESOURCE{$name} = $info; # unused
3418 } 3441 }
3419 3442
3420 cf::cede_to_tick; 3443 cf::cede_to_tick;
3421 } 3444 }
3422 } 3445 }
3423 3446
3424 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3447 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3425 3448
3426 1 3449 1
3427} 3450}
3428
3429cf::global->attach (on_resource_update => sub {
3430 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3431 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3432
3433 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3434 my $sound = $soundconf->{compat}[$_]
3435 or next;
3436
3437 my $face = cf::face::find "sound/$sound->[1]";
3438 cf::sound::set $sound->[0] => $face;
3439 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3440 }
3441
3442 while (my ($k, $v) = each %{$soundconf->{event}}) {
3443 my $face = cf::face::find "sound/$v";
3444 cf::sound::set $k => $face;
3445 }
3446 }
3447});
3448 3451
3449register_exticmd fx_want => sub { 3452register_exticmd fx_want => sub {
3450 my ($ns, $want) = @_; 3453 my ($ns, $want) = @_;
3451 3454
3452 while (my ($k, $v) = each %$want) { 3455 while (my ($k, $v) = each %$want) {
… …
3491sub reload_treasures { 3494sub reload_treasures {
3492 load_resource_file "$DATADIR/treasures" 3495 load_resource_file "$DATADIR/treasures"
3493 or die "unable to load treasurelists\n"; 3496 or die "unable to load treasurelists\n";
3494} 3497}
3495 3498
3499sub reload_sound {
3500 trace "loading sound config from $DATADIR/sound\n";
3501
3502 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3503 or die "$DATADIR/sound $!";
3504
3505 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3506
3507 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3508 my $sound = $soundconf->{compat}[$_]
3509 or next;
3510
3511 my $face = cf::face::find "sound/$sound->[1]";
3512 cf::sound::set $sound->[0] => $face;
3513 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3514 }
3515
3516 while (my ($k, $v) = each %{$soundconf->{event}}) {
3517 my $face = cf::face::find "sound/$v";
3518 cf::sound::set $k => $face;
3519 }
3520}
3521
3496sub reload_resources { 3522sub reload_resources {
3497 warn "reloading resource files...\n"; 3523 trace "reloading resource files...\n";
3498 3524
3499 reload_facedata; 3525 reload_facedata;
3526 reload_sound;
3500 reload_archetypes; 3527 reload_archetypes;
3501 reload_regions; 3528 reload_regions;
3502 reload_treasures; 3529 reload_treasures;
3503 3530
3504 warn "finished reloading resource files\n"; 3531 trace "finished reloading resource files\n";
3505} 3532}
3506 3533
3507sub reload_config { 3534sub reload_config {
3508 warn "reloading config file...\n"; 3535 trace "reloading config file...\n";
3509 3536
3510 open my $fh, "<:utf8", "$CONFDIR/config" 3537 open my $fh, "<:utf8", "$CONFDIR/config"
3511 or return; 3538 or return;
3512 3539
3513 local $/; 3540 local $/;
3514 *CFG = YAML::XS::Load scalar <$fh>; 3541 *CFG = YAML::XS::Load scalar <$fh>;
3515 3542
3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3543 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3517 3544
3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3545 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3546 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3520 3547
3521 if (exists $CFG{mlockall}) { 3548 if (exists $CFG{mlockall}) {
… …
3524 and die "WARNING: m(un)lockall failed: $!\n"; 3551 and die "WARNING: m(un)lockall failed: $!\n";
3525 }; 3552 };
3526 warn $@ if $@; 3553 warn $@ if $@;
3527 } 3554 }
3528 3555
3529 warn "finished reloading resource files\n"; 3556 trace "finished reloading resource files\n";
3530} 3557}
3531 3558
3532sub pidfile() { 3559sub pidfile() {
3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3560 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534 or die "$PIDFILE: $!"; 3561 or die "$PIDFILE: $!";
… …
3547 seek $fh, 0, 0; 3574 seek $fh, 0, 0;
3548 print $fh $$; 3575 print $fh $$;
3549} 3576}
3550 3577
3551sub main_loop { 3578sub main_loop {
3552 warn "EV::loop starting\n"; 3579 trace "EV::loop starting\n";
3553 if (1) { 3580 if (1) {
3554 EV::loop; 3581 EV::loop;
3555 } 3582 }
3556 warn "EV::loop returned\n"; 3583 trace "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP; 3584 goto &main_loop unless $REALLY_UNLOOP;
3558} 3585}
3559 3586
3560sub main { 3587sub main {
3561 cf::init_globals; # initialise logging 3588 cf::init_globals; # initialise logging
… …
3609 3636
3610 (pop @POST_INIT)->(0) while @POST_INIT; 3637 (pop @POST_INIT)->(0) while @POST_INIT;
3611 }; 3638 };
3612 3639
3613 cf::object::thawer::errors_are_fatal 0; 3640 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n"; 3641 info "parse errors in files are no longer fatal from this point on.\n";
3615 3642
3616 main_loop; 3643 main_loop;
3617} 3644}
3618 3645
3619############################################################################# 3646#############################################################################
… …
3660 or return; 3687 or return;
3661 3688
3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3689 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3663 and return; 3690 and return;
3664 3691
3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3692 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3666 3693
3667 1 3694 1
3668} 3695}
3669 3696
3670our $uuid_lock; 3697our $uuid_lock;
… …
3682 or return; 3709 or return;
3683 3710
3684 my $value = uuid_seq uuid_cur; 3711 my $value = uuid_seq uuid_cur;
3685 3712
3686 unless ($value) { 3713 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n"; 3714 info "cowardly refusing to write zero uuid value!\n";
3688 return; 3715 return;
3689 } 3716 }
3690 3717
3691 my $value = uuid_str $value + $uuid_skip; 3718 my $value = uuid_str $value + $uuid_skip;
3692 $uuid_skip = 0; 3719 $uuid_skip = 0;
… …
3702 or return; 3729 or return;
3703 3730
3704 aio_rename "$uuid~", $uuid 3731 aio_rename "$uuid~", $uuid
3705 and return; 3732 and return;
3706 3733
3707 warn "uuid file written ($value).\n"; 3734 trace "uuid file written ($value).\n";
3708 3735
3709 1 3736 1
3710 3737
3711} 3738}
3712 3739
… …
3718} 3745}
3719 3746
3720sub emergency_save() { 3747sub emergency_save() {
3721 my $freeze_guard = cf::freeze_mainloop; 3748 my $freeze_guard = cf::freeze_mainloop;
3722 3749
3723 warn "emergency_perl_save: enter\n"; 3750 info "emergency_perl_save: enter\n";
3724 3751
3725 cf::sync_job { 3752 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so 3753 # this is a trade-off: we want to be very quick here, so
3727 # save all maps without fsync, and later call a global sync 3754 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow) 3755 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0; 3756 local $USE_FSYNC = 0;
3730 3757
3731 # use a peculiar iteration method to avoid tripping on perl 3758 # use a peculiar iteration method to avoid tripping on perl
3732 # refcount bugs in for. also avoids problems with players 3759 # refcount bugs in for. also avoids problems with players
3733 # and maps saved/destroyed asynchronously. 3760 # and maps saved/destroyed asynchronously.
3734 warn "emergency_perl_save: begin player save\n"; 3761 info "emergency_perl_save: begin player save\n";
3735 for my $login (keys %cf::PLAYER) { 3762 for my $login (keys %cf::PLAYER) {
3736 my $pl = $cf::PLAYER{$login} or next; 3763 my $pl = $cf::PLAYER{$login} or next;
3737 $pl->valid or next; 3764 $pl->valid or next;
3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3765 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3739 $pl->save; 3766 $pl->save;
3740 } 3767 }
3741 warn "emergency_perl_save: end player save\n"; 3768 info "emergency_perl_save: end player save\n";
3742 3769
3743 warn "emergency_perl_save: begin map save\n"; 3770 info "emergency_perl_save: begin map save\n";
3744 for my $path (keys %cf::MAP) { 3771 for my $path (keys %cf::MAP) {
3745 my $map = $cf::MAP{$path} or next; 3772 my $map = $cf::MAP{$path} or next;
3746 $map->valid or next; 3773 $map->valid or next;
3747 $map->save; 3774 $map->save;
3748 } 3775 }
3749 warn "emergency_perl_save: end map save\n"; 3776 info "emergency_perl_save: end map save\n";
3750 3777
3751 warn "emergency_perl_save: begin database checkpoint\n"; 3778 info "emergency_perl_save: begin database checkpoint\n";
3752 BDB::db_env_txn_checkpoint $DB_ENV; 3779 BDB::db_env_txn_checkpoint $DB_ENV;
3753 warn "emergency_perl_save: end database checkpoint\n"; 3780 info "emergency_perl_save: end database checkpoint\n";
3754 3781
3755 warn "emergency_perl_save: begin write uuid\n"; 3782 info "emergency_perl_save: begin write uuid\n";
3756 write_uuid_sync 1; 3783 write_uuid_sync 1;
3757 warn "emergency_perl_save: end write uuid\n"; 3784 info "emergency_perl_save: end write uuid\n";
3758 }; 3785 };
3759 3786
3760 warn "emergency_perl_save: starting sync()\n"; 3787 info "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub { 3788 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n"; 3789 info "emergency_perl_save: finished sync()\n";
3763 }; 3790 };
3764 3791
3765 warn "emergency_perl_save: leave\n"; 3792 info "emergency_perl_save: leave\n";
3766} 3793}
3767 3794
3768sub post_cleanup { 3795sub post_cleanup {
3769 my ($make_core) = @_; 3796 my ($make_core) = @_;
3770 3797
3771 warn Carp::longmess "post_cleanup backtrace" 3798 error Carp::longmess "post_cleanup backtrace"
3772 if $make_core; 3799 if $make_core;
3773 3800
3774 my $fh = pidfile; 3801 my $fh = pidfile;
3775 unlink $PIDFILE if <$fh> == $$; 3802 unlink $PIDFILE if <$fh> == $$;
3776} 3803}
… …
3801} 3828}
3802 3829
3803sub do_reload_perl() { 3830sub do_reload_perl() {
3804 # can/must only be called in main 3831 # can/must only be called in main
3805 if (in_main) { 3832 if (in_main) {
3806 warn "can only reload from main coroutine"; 3833 error "can only reload from main coroutine";
3807 return; 3834 return;
3808 } 3835 }
3809 3836
3810 return if $RELOAD++; 3837 return if $RELOAD++;
3811 3838
3812 my $t1 = AE::time; 3839 my $t1 = AE::time;
3813 3840
3814 while ($RELOAD) { 3841 while ($RELOAD) {
3815 warn "reloading..."; 3842 info "reloading...";
3816 3843
3817 warn "entering sync_job"; 3844 trace "entering sync_job";
3818 3845
3819 cf::sync_job { 3846 cf::sync_job {
3820 cf::write_runtime_sync; # external watchdog should not bark 3847 cf::write_runtime_sync; # external watchdog should not bark
3821 cf::emergency_save; 3848 cf::emergency_save;
3822 cf::write_runtime_sync; # external watchdog should not bark 3849 cf::write_runtime_sync; # external watchdog should not bark
3823 3850
3824 warn "syncing database to disk"; 3851 trace "syncing database to disk";
3825 BDB::db_env_txn_checkpoint $DB_ENV; 3852 BDB::db_env_txn_checkpoint $DB_ENV;
3826 3853
3827 # if anything goes wrong in here, we should simply crash as we already saved 3854 # if anything goes wrong in here, we should simply crash as we already saved
3828 3855
3829 warn "flushing outstanding aio requests"; 3856 trace "flushing outstanding aio requests";
3830 while (IO::AIO::nreqs || BDB::nreqs) { 3857 while (IO::AIO::nreqs || BDB::nreqs) {
3831 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3832 } 3859 }
3833 3860
3834 warn "cancelling all extension coros"; 3861 trace "cancelling all extension coros";
3835 $_->cancel for values %EXT_CORO; 3862 $_->cancel for values %EXT_CORO;
3836 %EXT_CORO = (); 3863 %EXT_CORO = ();
3837 3864
3838 warn "removing commands"; 3865 trace "removing commands";
3839 %COMMAND = (); 3866 %COMMAND = ();
3840 3867
3841 warn "removing ext/exti commands"; 3868 trace "removing ext/exti commands";
3842 %EXTCMD = (); 3869 %EXTCMD = ();
3843 %EXTICMD = (); 3870 %EXTICMD = ();
3844 3871
3845 warn "unloading/nuking all extensions"; 3872 trace "unloading/nuking all extensions";
3846 for my $pkg (@EXTS) { 3873 for my $pkg (@EXTS) {
3847 warn "... unloading $pkg"; 3874 trace "... unloading $pkg";
3848 3875
3849 if (my $cb = $pkg->can ("unload")) { 3876 if (my $cb = $pkg->can ("unload")) {
3850 eval { 3877 eval {
3851 $cb->($pkg); 3878 $cb->($pkg);
3852 1 3879 1
3853 } or warn "$pkg unloaded, but with errors: $@"; 3880 } or error "$pkg unloaded, but with errors: $@";
3854 } 3881 }
3855 3882
3856 warn "... clearing $pkg"; 3883 trace "... clearing $pkg";
3857 clear_package $pkg; 3884 clear_package $pkg;
3858 } 3885 }
3859 3886
3860 warn "unloading all perl modules loaded from $LIBDIR"; 3887 trace "unloading all perl modules loaded from $LIBDIR";
3861 while (my ($k, $v) = each %INC) { 3888 while (my ($k, $v) = each %INC) {
3862 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863 3890
3864 warn "... unloading $k"; 3891 trace "... unloading $k";
3865 delete $INC{$k}; 3892 delete $INC{$k};
3866 3893
3867 $k =~ s/\.pm$//; 3894 $k =~ s/\.pm$//;
3868 $k =~ s/\//::/g; 3895 $k =~ s/\//::/g;
3869 3896
… …
3872 } 3899 }
3873 3900
3874 clear_package $k; 3901 clear_package $k;
3875 } 3902 }
3876 3903
3877 warn "getting rid of safe::, as good as possible"; 3904 trace "getting rid of safe::, as good as possible";
3878 clear_package "safe::$_" 3905 clear_package "safe::$_"
3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3906 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3880 3907
3881 warn "unloading cf.pm \"a bit\""; 3908 trace "unloading cf.pm \"a bit\"";
3882 delete $INC{"cf.pm"}; 3909 delete $INC{"cf.pm"};
3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3910 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3884 3911
3885 # don't, removes xs symbols, too, 3912 # don't, removes xs symbols, too,
3886 # and global variables created in xs 3913 # and global variables created in xs
3887 #clear_package __PACKAGE__; 3914 #clear_package __PACKAGE__;
3888 3915
3889 warn "unload completed, starting to reload now"; 3916 info "unload completed, starting to reload now";
3890 3917
3891 warn "reloading cf.pm"; 3918 trace "reloading cf.pm";
3892 require cf; 3919 require cf;
3893 cf::_connect_to_perl_1; 3920 cf::_connect_to_perl_1;
3894 3921
3895 warn "loading config and database again"; 3922 trace "loading config and database again";
3896 cf::reload_config; 3923 cf::reload_config;
3897 3924
3898 warn "loading extensions"; 3925 trace "loading extensions";
3899 cf::load_extensions; 3926 cf::load_extensions;
3900 3927
3901 if ($REATTACH_ON_RELOAD) { 3928 if ($REATTACH_ON_RELOAD) {
3902 warn "reattaching attachments to objects/players"; 3929 trace "reattaching attachments to objects/players";
3903 _global_reattach; # objects, sockets 3930 _global_reattach; # objects, sockets
3904 warn "reattaching attachments to maps"; 3931 trace "reattaching attachments to maps";
3905 reattach $_ for values %MAP; 3932 reattach $_ for values %MAP;
3906 warn "reattaching attachments to players"; 3933 trace "reattaching attachments to players";
3907 reattach $_ for values %PLAYER; 3934 reattach $_ for values %PLAYER;
3908 } 3935 }
3909 3936
3910 warn "running post_init jobs"; 3937 trace "running post_init jobs";
3911 (pop @POST_INIT)->(1) while @POST_INIT; 3938 (pop @POST_INIT)->(1) while @POST_INIT;
3912 3939
3913 warn "leaving sync_job"; 3940 trace "leaving sync_job";
3914 3941
3915 1 3942 1
3916 } or do { 3943 } or do {
3917 warn $@; 3944 error $@;
3918 cf::cleanup "error while reloading, exiting."; 3945 cf::cleanup "error while reloading, exiting.";
3919 }; 3946 };
3920 3947
3921 warn "reloaded"; 3948 info "reloaded";
3922 --$RELOAD; 3949 --$RELOAD;
3923 } 3950 }
3924 3951
3925 $t1 = AE::time - $t1; 3952 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n"; 3953 info "reload completed in ${t1}s\n";
3927}; 3954};
3928 3955
3929our $RELOAD_WATCHER; # used only during reload 3956our $RELOAD_WATCHER; # used only during reload
3930 3957
3931sub reload_perl() { 3958sub reload_perl() {
… …
3991 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4018 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4019 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3993 Coro::async_pool { 4020 Coro::async_pool {
3994 $Coro::current->{desc} = "runtime saver"; 4021 $Coro::current->{desc} = "runtime saver";
3995 write_runtime_sync 4022 write_runtime_sync
3996 or warn "ERROR: unable to write runtime file: $!"; 4023 or error "ERROR: unable to write runtime file: $!";
3997 }; 4024 };
3998 } 4025 }
3999 4026
4000 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4027 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4001 $sig->send; 4028 $sig->send;
… …
4009 4036
4010 if (0) { 4037 if (0) {
4011 if ($NEXT_TICK) { 4038 if ($NEXT_TICK) {
4012 my $jitter = $TICK_START - $NEXT_TICK; 4039 my $jitter = $TICK_START - $NEXT_TICK;
4013 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4040 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4014 warn "jitter $JITTER\n";#d# 4041 debug "jitter $JITTER\n";#d#
4015 } 4042 }
4016 } 4043 }
4017} 4044}
4018 4045
4019{ 4046{

Diff Legend

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