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.377 by root, Thu Oct 4 11:36:38 2007 UTC vs.
Revision 1.444 by root, Mon Sep 8 11:27:25 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.64 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
24use Coro::Util (); 49use Coro::Util ();
25 50
26use JSON::XS (); 51use JSON::XS 2.01 ();
27use BDB (); 52use BDB ();
28use Data::Dumper; 53use Data::Dumper;
29use Digest::MD5; 54use Digest::MD5;
30use Fcntl; 55use Fcntl;
31use YAML::Syck (); 56use YAML ();
32use IO::AIO 2.32 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 69
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 71
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 73
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
75 98
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 101our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
83 103
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 107our $DB_ENV;
89 108
90our %CFG; 109our %CFG;
91 110
92our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 112our $RUNTIME;
113our $NOW;
94 114
95our (%PLAYER, %PLAYER_LOADING); # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 116our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
98 118
99# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 121
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
105 126
106binmode STDOUT; 127binmode STDOUT;
107binmode STDERR; 128binmode STDERR;
108 129
109# read virtual server time, if available 130# read virtual server time, if available
162 183
163The raw value load value from the last tick. 184The raw value load value from the last tick.
164 185
165=item %cf::CFG 186=item %cf::CFG
166 187
167Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 189from wherever your confdir points to.
169 190
170=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
171 192
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 193These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 215
195 LOG llevError, $msg; 216 LOG llevError, $msg;
196 }; 217 };
197} 218}
219
220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
198 234
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 245for my $pkg (qw(
210 cf::global cf::attachable 246 cf::global cf::attachable
211 cf::object cf::object::player 247 cf::object cf::object::player
212 cf::client cf::player 248 cf::client cf::player
213 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
214 cf::map cf::party cf::region 251 cf::party cf::region
215)) { 252)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 254}
219 255
220$Event::DIED = sub { 256$EV::DIED = sub {
221 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
222}; 258};
223 259
224############################################################################# 260#############################################################################
225 261
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 284 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 285 $d
250 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
251} 287}
252 288
253=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
254 290
255Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
256 292
257=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
258 294
259Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
260 296
261=cut 297=cut
262 298
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 300
265sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
267 303
268=item cf::lock_wait $string 304=item cf::lock_wait $string
269 305
270Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
271 307
327 363
328 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
329} 365}
330 366
331sub freeze_mainloop { 367sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
333 369
334 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 371}
336 }; 372
337 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
338 $guard 374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
339} 386}
340 387
341=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
342 389
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
373 } 420 }
374 } 421 }
375 } 422 }
376 423
377 if (@SLOT_QUEUE) { 424 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 426 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 427 $signal->wait;
381 } else { 428 } else {
382 Coro::schedule; 429 Coro::schedule;
383 } 430 }
384 } 431 }
385}; 432};
386 433
387sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
388 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
389 438
390 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
392 441
406 455
407BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
408 457
409=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
410 459
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 463acceptable.
415 464
416If it must be done, put the blocking parts into C<sync_job>. This will run 465If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
422 471
423sub sync_job(&) { 472sub sync_job(&) {
424 my ($job) = @_; 473 my ($job) = @_;
425 474
426 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 476 my $time = EV::time;
428 477
429 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
431 480
432 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
433 # (but this is cancel-safe) 482
434 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
435 484
436 my $busy = 1; 485 my $busy = 1;
437 my @res; 486 my @res;
438 487
442 warn $@ if $@; 491 warn $@ if $@;
443 undef $busy; 492 undef $busy;
444 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
445 494
446 while ($busy) { 495 while ($busy) {
447 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
448 } 500 }
501 }
449 502
450 $time = Event::time - $time; 503 my $time = EV::time - $time;
451 504
452 LOG llevError | logBacktrace, Carp::longmess "long sync job"
453 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
454
455 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
456 506
457 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
458 } else { 508 } else {
459 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
460 510
485=item fork_call { }, $args 535=item fork_call { }, $args
486 536
487Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
488process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
489Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
490never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
491 541
492=cut 542=cut
493 543
494sub fork_call(&@) { 544sub fork_call(&@) {
495 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
502 reset_signals; 552 reset_signals;
503 &$cb 553 &$cb
504 }, @args; 554 }, @args;
505 555
506 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
557}
558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
507} 584}
508 585
509=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
510 587
511Returns a single value from the environment database. 588Returns a single value from the environment database.
656attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
657to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
658 735
659In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
660C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
661Crossfire TRT). 738Deliantra).
662 739
663=over 4 740=over 4
664 741
665=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
666 743
948 } 1025 }
949 1026
950 0 1027 0
951} 1028}
952 1029
953=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
954 1031
955=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
956 1033
957Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
958 1035
964 1041
965=cut 1042=cut
966 1043
967############################################################################# 1044#############################################################################
968# object support 1045# object support
969#
970 1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
971sub _can_merge { 1080sub _can_merge {
972 my ($ob1, $ob2) = @_; 1081 my ($ob1, $ob2) = @_;
973 1082
974 local $Storable::canonical = 1; 1083 ++$SLOW_MERGES;#d#
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977 1084
978 $fob1 eq $fob2 1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
979} 1087}
980 1088
981sub reattach { 1089sub reattach {
982 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
983 my ($obj) = @_; 1091 my ($obj) = @_;
984 1092
1093 # no longer needed after getting rid of delete_package?
985 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
986 1095
987 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
988 1097
989 @$registry = (); 1098 @$registry = ();
990 1099
1005cf::attachable->attach ( 1114cf::attachable->attach (
1006 prio => -1000000, 1115 prio => -1000000,
1007 on_instantiate => sub { 1116 on_instantiate => sub {
1008 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
1009 1118
1010 $data = from_json $data; 1119 $data = decode_json $data;
1011 1120
1012 for (@$data) { 1121 for (@$data) {
1013 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
1014 1123
1015 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
1036 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1037 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1038 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1039 1148
1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1041 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1043 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1044 close $fh; 1153 aio_close $fh;
1045 1154
1046 if (@$objs) { 1155 if (@$objs) {
1047 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1048 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1049 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1050 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1051 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1052 close $fh; 1161 aio_close $fh;
1053 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1054 } 1163 }
1055 } else { 1164 } else {
1056 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1057 } 1166 }
1085 1194
1086 unless (aio_stat "$filename.pst") { 1195 unless (aio_stat "$filename.pst") {
1087 (aio_load "$filename.pst", $av) >= 0 1196 (aio_load "$filename.pst", $av) >= 0
1088 or return; 1197 or return;
1089 1198
1090 $av = eval { (Storable::thaw $av)->{objs} }; 1199 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs};
1091 } 1201 }
1092 1202
1093 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1094 warn sprintf "loading %s (%d,%d)\n", 1204 warn sprintf "loading %s (%d,%d)\n",
1095 $decname, length $data, scalar @{$av || []}; 1205 $decname, length $data, scalar @{$av || []};
1225 1335
1226 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1227 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1228 1338
1229 $ext{source} = 1339 $ext{source} =
1230 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1231 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1232 . $source 1342 . $source
1233 . "\n};\n1"; 1343 . "\n};\n1";
1234 1344
1235 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
1251 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1252 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1253 1363
1254 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1255 warn $msg; 1365 warn $msg;
1256 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1257 exit 1;
1258 } 1367 }
1259 1368
1260 warn $msg; 1369 warn $msg;
1261 } 1370 }
1262 1371
1351 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1352 or return; 1461 or return;
1353 1462
1354 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1355 or return; 1464 or return;
1465
1356 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1358 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1359 } 1469 }
1360 } 1470 }
1370 1480
1371 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1372 1482
1373 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1374 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1375 1487
1376 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1377 cf::cede_to_tick; 1489 cf::cede_to_tick;
1378} 1490}
1379 1491
1411 my ($pl) = @_; 1523 my ($pl) = @_;
1412 1524
1413 my $name = $pl->ob->name; 1525 my $name = $pl->ob->name;
1414 1526
1415 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1416 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1417 1529
1418 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1419 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1420 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1421 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1422 1536
1423 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1424 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1463 1577
1464 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1465 my $path = path $login; 1579 my $path = path $login;
1466 1580
1467 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1470 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1471 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 } 1587 }
1473 1588
1508 1623
1509=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1510 1625
1511Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1512 1627
1513=cut
1514
1515sub expand_cfpod {
1516 ((my $self), (local $_)) = @_;
1517
1518 # escape & and <
1519 s/&/&amp;/g;
1520 s/(?<![BIUGHT])</&lt;/g;
1521
1522 # this is buggy, it needs to properly take care of nested <'s
1523
1524 1 while
1525 # replace B<>, I<>, U<> etc.
1526 s/B<([^\>]*)>/<b>$1<\/b>/
1527 || s/I<([^\>]*)>/<i>$1<\/i>/
1528 || s/U<([^\>]*)>/<u>$1<\/u>/
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1530 # replace G<male|female> tags
1531 || s{G<([^>|]*)\|([^>]*)>}{
1532 $self->gender ? $2 : $1
1533 }ge
1534 # replace H<hint text>
1535 || s{H<([^\>]*)>}
1536 {
1537 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1538 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1539 "")
1540 [$self->{hintmode}]
1541 }ge;
1542
1543 # create single paragraphs (very hackish)
1544 s/(?<=\S)\n(?=\w)/ /g;
1545
1546 # compress some whitespace
1547 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines
1551
1552 $_
1553}
1554
1555sub hintmode {
1556 $_[0]{hintmode} = $_[1] if @_ > 1;
1557 $_[0]{hintmode}
1558}
1559
1560=item $player->ext_reply ($msgid, @msg) 1628=item $player->ext_reply ($msgid, @msg)
1561 1629
1562Sends an ext reply to the player. 1630Sends an ext reply to the player.
1563 1631
1564=cut 1632=cut
1630our $MAX_RESET = 3600; 1698our $MAX_RESET = 3600;
1631our $DEFAULT_RESET = 3000; 1699our $DEFAULT_RESET = 3000;
1632 1700
1633sub generate_random_map { 1701sub generate_random_map {
1634 my ($self, $rmp) = @_; 1702 my ($self, $rmp) = @_;
1703
1704 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1705
1635 # mit "rum" bekleckern, nicht 1706 # mit "rum" bekleckern, nicht
1636 $self->_create_random_map ( 1707 $self->_create_random_map (
1637 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1708 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1638 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1709 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1639 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1710 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 1832
1762# the temporary/swap location 1833# the temporary/swap location
1763sub save_path { 1834sub save_path {
1764 my ($self) = @_; 1835 my ($self) = @_;
1765 1836
1766 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1837 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1767 "$TMPDIR/$path.map" 1838 "$TMPDIR/$path.map"
1768} 1839}
1769 1840
1770# the unique path, undef == no special unique path 1841# the unique path, undef == no special unique path
1771sub uniq_path { 1842sub uniq_path {
1772 my ($self) = @_; 1843 my ($self) = @_;
1773 1844
1774 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1845 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1775 "$UNIQUEDIR/$path" 1846 "$UNIQUEDIR/$path"
1776} 1847}
1777 1848
1778# and all this just because we cannot iterate over 1849# and all this just because we cannot iterate over
1779# all maps in C++... 1850# all maps in C++...
1877 1948
1878 cf::lock_wait "map_data:$path";#d#remove 1949 cf::lock_wait "map_data:$path";#d#remove
1879 cf::lock_wait "map_find:$path"; 1950 cf::lock_wait "map_find:$path";
1880 1951
1881 $cf::MAP{$path} || do { 1952 $cf::MAP{$path} || do {
1882 my $guard1 = cf::lock_acquire "map_find:$path";
1883 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1953 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1954 my $guard2 = cf::lock_acquire "map_find:$path";
1884 1955
1885 my $map = new_from_path cf::map $path 1956 my $map = new_from_path cf::map $path
1886 or return; 1957 or return;
1887 1958
1888 $map->{last_save} = $cf::RUNTIME; 1959 $map->{last_save} = $cf::RUNTIME;
1891 or return; 1962 or return;
1892 1963
1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1964 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1894 # doing this can freeze the server in a sync job, obviously 1965 # doing this can freeze the server in a sync job, obviously
1895 #$cf::WAIT_FOR_TICK->wait; 1966 #$cf::WAIT_FOR_TICK->wait;
1967 undef $guard2;
1896 undef $guard1; 1968 undef $guard1;
1897 undef $guard2;
1898 $map->reset; 1969 $map->reset;
1899 return find $path; 1970 return find $path;
1900 } 1971 }
1901 1972
1902 $cf::MAP{$path} = $map 1973 $cf::MAP{$path} = $map
1929 my $f = new_from_file cf::object::thawer $self->{load_path}; 2000 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block; 2001 $f->skip_block;
1931 $self->_load_objects ($f) 2002 $self->_load_objects ($f)
1932 or return; 2003 or return;
1933 2004
1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2005 $self->post_load_original
1935 if delete $self->{load_original}; 2006 if delete $self->{load_original};
1936 2007
1937 if (my $uniq = $self->uniq_path) { 2008 if (my $uniq = $self->uniq_path) {
1938 utf8::encode $uniq; 2009 utf8::encode $uniq;
1939 unless (aio_stat $uniq) { 2010 unless (aio_stat $uniq) {
1965 } 2036 }
1966 2037
1967 $self->{last_save} = $cf::RUNTIME; 2038 $self->{last_save} = $cf::RUNTIME;
1968 $self->last_access ($cf::RUNTIME); 2039 $self->last_access ($cf::RUNTIME);
1969 2040
1970 $self->in_memory (cf::MAP_IN_MEMORY); 2041 $self->in_memory (cf::MAP_ACTIVE);
1971 } 2042 }
1972 2043
1973 $self->post_load; 2044 $self->post_load;
1974} 2045}
1975 2046
2033 my ($path, $origin, $load) = @_; 2104 my ($path, $origin, $load) = @_;
2034 2105
2035 $path = normalise $path, $origin && $origin->{path}; 2106 $path = normalise $path, $origin && $origin->{path};
2036 2107
2037 if (my $map = $cf::MAP{$path}) { 2108 if (my $map = $cf::MAP{$path}) {
2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2109 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2039 } 2110 }
2040 2111
2041 $MAP_PREFETCH{$path} |= $load; 2112 $MAP_PREFETCH{$path} |= $load;
2042 2113
2043 $MAP_PREFETCHER ||= cf::async { 2114 $MAP_PREFETCHER ||= cf::async {
2080 cf::async { 2151 cf::async {
2081 $Coro::current->{desc} = "map player save"; 2152 $Coro::current->{desc} = "map player save";
2082 $_->contr->save for $self->players; 2153 $_->contr->save for $self->players;
2083 }; 2154 };
2084 2155
2156 cf::get_slot 0.02;
2157
2085 if ($uniq) { 2158 if ($uniq) {
2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2159 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2087 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2160 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2088 } else { 2161 } else {
2089 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2162 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2097 $self->save; 2170 $self->save;
2098 2171
2099 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2100 2173
2101 return if $self->players; 2174 return if $self->players;
2102 return if $self->in_memory != cf::MAP_IN_MEMORY; 2175 return if $self->in_memory != cf::MAP_ACTIVE;
2103 return if $self->{deny_save}; 2176 return if $self->{deny_save};
2104 2177
2105 $self->in_memory (cf::MAP_SWAPPED); 2178 $self->in_memory (cf::MAP_SWAPPED);
2106 2179
2107 $self->deactivate; 2180 $self->deactivate;
2225 2298
2226sub unique_maps() { 2299sub unique_maps() {
2227 [ 2300 [
2228 map { 2301 map {
2229 utf8::decode $_; 2302 utf8::decode $_;
2230 /\.map$/ 2303 s/\.map$//; # TODO future compatibility hack
2304 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2305 ? ()
2231 ? normalise $_ 2306 : normalise $_
2232 : ()
2233 } @{ aio_readdir $UNIQUEDIR or [] } 2307 } @{ aio_readdir $UNIQUEDIR or [] }
2234 ] 2308 ]
2235} 2309}
2236 2310
2237package cf;
2238
2239=back 2311=back
2240 2312
2241=head3 cf::object 2313=head3 cf::object
2242 2314
2243=cut 2315=cut
2246 2318
2247=over 4 2319=over 4
2248 2320
2249=item $ob->inv_recursive 2321=item $ob->inv_recursive
2250 2322
2251Returns the inventory of the object _and_ their inventories, recursively. 2323Returns the inventory of the object I<and> their inventories, recursively,
2324but I<not> the object itself.
2252 2325
2253=cut 2326=cut
2254 2327
2255sub inv_recursive_; 2328sub inv_recursive_;
2256sub inv_recursive_ { 2329sub inv_recursive_ {
2261 inv_recursive_ inv $_[0] 2334 inv_recursive_ inv $_[0]
2262} 2335}
2263 2336
2264=item $ref = $ob->ref 2337=item $ref = $ob->ref
2265 2338
2266creates and returns a persistent reference to an objetc that can be stored as a string. 2339Creates and returns a persistent reference to an object that can be stored as a string.
2267 2340
2268=item $ob = cf::object::deref ($refstring) 2341=item $ob = cf::object::deref ($refstring)
2269 2342
2270returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2343returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2271even if the object actually exists. May block. 2344even if the object actually exists. May block.
2272 2345
2273=cut 2346=cut
2274 2347
2275sub deref { 2348sub deref {
2276 my ($ref) = @_; 2349 my ($ref) = @_;
2277
2278 # temporary compatibility#TODO#remove
2279 $ref =~ s{^<}{player/<};
2280 2350
2281 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) { 2351 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2282 my ($uuid, $name) = ($1, $2); 2352 my ($uuid, $name) = ($1, $2);
2283 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2353 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2284 or return; 2354 or return;
2306can be C<undef>. Does the right thing when the player is currently in a 2376can be C<undef>. Does the right thing when the player is currently in a
2307dialogue with the given NPC character. 2377dialogue with the given NPC character.
2308 2378
2309=cut 2379=cut
2310 2380
2381our $SAY_CHANNEL = {
2382 id => "say",
2383 title => "Map",
2384 reply => "say ",
2385 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2386};
2387
2388our $CHAT_CHANNEL = {
2389 id => "chat",
2390 title => "Chat",
2391 reply => "chat ",
2392 tooltip => "Player chat and shouts, global to the server.",
2393};
2394
2311# rough implementation of a future "reply" method that works 2395# rough implementation of a future "reply" method that works
2312# with dialog boxes. 2396# with dialog boxes.
2313#TODO: the first argument must go, split into a $npc->reply_to ( method 2397#TODO: the first argument must go, split into a $npc->reply_to ( method
2314sub cf::object::player::reply($$$;$) { 2398sub cf::object::player::reply($$$;$) {
2315 my ($self, $npc, $msg, $flags) = @_; 2399 my ($self, $npc, $msg, $flags) = @_;
2326 my $dialog = $pl->{npc_dialog}; 2410 my $dialog = $pl->{npc_dialog};
2327 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2411 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2328 2412
2329 } else { 2413 } else {
2330 $msg = $npc->name . " says: $msg" if $npc; 2414 $msg = $npc->name . " says: $msg" if $npc;
2331 $self->message ($msg, $flags); 2415 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2332 } 2416 }
2333 } 2417 }
2334} 2418}
2335 2419
2336=item $object->send_msg ($channel, $msg, $color, [extra...]) 2420=item $object->send_msg ($channel, $msg, $color, [extra...])
2443Moves the player to the given map-path and coordinates by first freezing 2527Moves the player to the given map-path and coordinates by first freezing
2444her, loading and preparing them map, calling the provided $check callback 2528her, loading and preparing them map, calling the provided $check callback
2445that has to return the map if sucecssful, and then unfreezes the player on 2529that has to return the map if sucecssful, and then unfreezes the player on
2446the new (success) or old (failed) map position. In either case, $done will 2530the new (success) or old (failed) map position. In either case, $done will
2447be called at the end of this process. 2531be called at the end of this process.
2532
2533Note that $check will be called with a potentially non-loaded map, so if
2534it needs a loaded map it has to call C<< ->load >>.
2448 2535
2449=cut 2536=cut
2450 2537
2451our $GOTOGEN; 2538our $GOTOGEN;
2452 2539
2531} 2618}
2532 2619
2533sub prepare_random_map { 2620sub prepare_random_map {
2534 my ($exit) = @_; 2621 my ($exit) = @_;
2535 2622
2536 my $guard = cf::lock_acquire "exit_prepare:$exit";
2537
2538 # all this does is basically replace the /! path by 2623 # all this does is basically replace the /! path by
2539 # a new random map path (?random/...) with a seed 2624 # a new random map path (?random/...) with a seed
2540 # that depends on the exit object 2625 # that depends on the exit object
2541 2626
2542 my $rmp = parse_random_map_params $exit->msg; 2627 my $rmp = parse_random_map_params $exit->msg;
2544 if ($exit->map) { 2629 if ($exit->map) {
2545 $rmp->{region} = $exit->region->name; 2630 $rmp->{region} = $exit->region->name;
2546 $rmp->{origin_map} = $exit->map->path; 2631 $rmp->{origin_map} = $exit->map->path;
2547 $rmp->{origin_x} = $exit->x; 2632 $rmp->{origin_x} = $exit->x;
2548 $rmp->{origin_y} = $exit->y; 2633 $rmp->{origin_y} = $exit->y;
2634
2635 $exit->map->touch;
2549 } 2636 }
2550 2637
2551 $rmp->{random_seed} ||= $exit->random_seed; 2638 $rmp->{random_seed} ||= $exit->random_seed;
2552 2639
2553 my $data = cf::to_json $rmp; 2640 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2554 my $md5 = Digest::MD5::md5_hex $data; 2641 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2642 my $meta = "$RANDOMDIR/$md5.meta";
2556 2643
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2644 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2645 aio_write $fh, 0, (length $data), $data, 0;
2559 undef $fh; 2646 undef $fh;
2560 aio_rename "$meta~", $meta; 2647 aio_rename "$meta~", $meta;
2561 2648
2649 my $slaying = "?random/$md5";
2650
2651 if ($exit->valid) {
2562 $exit->slaying ("?random/$md5"); 2652 $exit->slaying ("?random/$md5");
2563 $exit->msg (undef); 2653 $exit->msg (undef);
2654 }
2564 } 2655 }
2565} 2656}
2566 2657
2567sub cf::object::player::enter_exit { 2658sub cf::object::player::enter_exit {
2568 my ($self, $exit) = @_; 2659 my ($self, $exit) = @_;
2569 2660
2570 return unless $self->type == cf::PLAYER; 2661 return unless $self->type == cf::PLAYER;
2571 2662
2572 if ($exit->slaying eq "/!") {
2573 #TODO: this should de-fi-ni-te-ly not be a sync-job
2574 # the problem is that $exit might not survive long enough
2575 # so it needs to be done right now, right here
2576 cf::sync_job { prepare_random_map $exit };
2577 }
2578
2579 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2580 my $hp = $exit->stats->hp;
2581 my $sp = $exit->stats->sp;
2582
2583 $self->enter_link; 2663 $self->enter_link;
2584 2664
2585 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED);
2588
2589 (async { 2665 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2666 $Coro::current->{desc} = "enter_exit";
2591 2667
2592 $self->deactivate_recursive; # just to be sure
2593 unless (eval { 2668 unless (eval {
2669 $self->deactivate_recursive; # just to be sure
2670
2671 # random map handling
2672 {
2673 my $guard = cf::lock_acquire "exit_prepare:$exit";
2674
2675 prepare_random_map $exit
2676 if $exit->slaying eq "/!";
2677 }
2678
2679 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2680 my $x = $exit->stats->hp;
2681 my $y = $exit->stats->sp;
2682
2594 $self->goto ($slaying, $hp, $sp); 2683 $self->goto ($map, $x, $y);
2595 2684
2685 # if exit is damned, update players death & WoR home-position
2686 $self->contr->savebed ($map, $x, $y)
2687 if $exit->flag (cf::FLAG_DAMNED);
2688
2596 1; 2689 1
2597 }) { 2690 }) {
2598 $self->message ("Something went wrong deep within the crossfire server. " 2691 $self->message ("Something went wrong deep within the crossfire server. "
2599 . "I'll try to bring you back to the map you were before. " 2692 . "I'll try to bring you back to the map you were before. "
2600 . "Please report this to the dungeon master!", 2693 . "Please report this to the dungeon master!",
2601 cf::NDI_UNIQUE | cf::NDI_RED); 2694 cf::NDI_UNIQUE | cf::NDI_RED);
2631the message, with C<log> being the default. If C<$color> is negative, suppress 2724the message, with C<log> being the default. If C<$color> is negative, suppress
2632the message unless the client supports the msg packet. 2725the message unless the client supports the msg packet.
2633 2726
2634=cut 2727=cut
2635 2728
2729# non-persistent channels (usually the info channel)
2636our %CHANNEL = ( 2730our %CHANNEL = (
2637 "c/identify" => { 2731 "c/identify" => {
2638 id => "infobox", 2732 id => "infobox",
2639 title => "Identify", 2733 title => "Identify",
2640 reply => undef, 2734 reply => undef,
2644 id => "infobox", 2738 id => "infobox",
2645 title => "Examine", 2739 title => "Examine",
2646 reply => undef, 2740 reply => undef,
2647 tooltip => "Signs and other items you examined", 2741 tooltip => "Signs and other items you examined",
2648 }, 2742 },
2743 "c/book" => {
2744 id => "infobox",
2745 title => "Book",
2746 reply => undef,
2747 tooltip => "The contents of a note or book",
2748 },
2649 "c/lookat" => { 2749 "c/lookat" => {
2650 id => "infobox", 2750 id => "infobox",
2651 title => "Look", 2751 title => "Look",
2652 reply => undef, 2752 reply => undef,
2653 tooltip => "What you saw there", 2753 tooltip => "What you saw there",
2654 }, 2754 },
2755 "c/who" => {
2756 id => "infobox",
2757 title => "Players",
2758 reply => undef,
2759 tooltip => "Shows players who are currently online",
2760 },
2761 "c/body" => {
2762 id => "infobox",
2763 title => "Body Parts",
2764 reply => undef,
2765 tooltip => "Shows which body parts you posess and are available",
2766 },
2767 "c/uptime" => {
2768 id => "infobox",
2769 title => "Uptime",
2770 reply => undef,
2771 tooltip => "How long the server has been running since last restart",
2772 },
2773 "c/mapinfo" => {
2774 id => "infobox",
2775 title => "Map Info",
2776 reply => undef,
2777 tooltip => "Information related to the maps",
2778 },
2779 "c/party" => {
2780 id => "party",
2781 title => "Party",
2782 reply => "gsay ",
2783 tooltip => "Messages and chat related to your party",
2784 },
2655); 2785);
2656 2786
2657sub cf::client::send_msg { 2787sub cf::client::send_msg {
2658 my ($self, $channel, $msg, $color, @extra) = @_; 2788 my ($self, $channel, $msg, $color, @extra) = @_;
2659 2789
2686 if ($self->can_msg) { 2816 if ($self->can_msg) {
2687 # default colour, mask it out 2817 # default colour, mask it out
2688 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2818 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2689 if $color & cf::NDI_DEF; 2819 if $color & cf::NDI_DEF;
2690 2820
2691 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2821 my $pkt = "msg "
2822 . $self->{json_coder}->encode (
2692 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2823 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2824 );
2825
2826 # try lzf for large packets
2827 $pkt = "lzf " . Compress::LZF::compress $pkt
2828 if 1024 <= length $pkt and $self->{can_lzf};
2829
2830 # split very large packets
2831 if (8192 < length $pkt and $self->{can_lzf}) {
2832 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2833 $pkt = "frag";
2834 }
2835
2836 $self->send_packet ($pkt);
2693 } else { 2837 } else {
2694 if ($color >= 0) { 2838 if ($color >= 0) {
2695 # replace some tags by gcfclient-compatible ones 2839 # replace some tags by gcfclient-compatible ones
2696 for ($msg) { 2840 for ($msg) {
2697 1 while 2841 1 while
2895=pod 3039=pod
2896 3040
2897The following functions and methods are available within a safe environment: 3041The following functions and methods are available within a safe environment:
2898 3042
2899 cf::object 3043 cf::object
2900 contr pay_amount pay_player map x y force_find force_add 3044 contr pay_amount pay_player map x y force_find force_add destroy
2901 insert remove name archname title slaying race decrease_ob_nr 3045 insert remove name archname title slaying race decrease split
2902 3046
2903 cf::object::player 3047 cf::object::player
2904 player 3048 player
2905 3049
2906 cf::player 3050 cf::player
2911 3055
2912=cut 3056=cut
2913 3057
2914for ( 3058for (
2915 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3059 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2916 insert remove inv name archname title slaying race 3060 insert remove inv nrof name archname title slaying race
2917 decrease_ob_nr)], 3061 decrease split destroy change_exp)],
2918 ["cf::object::player" => qw(player)], 3062 ["cf::object::player" => qw(player)],
2919 ["cf::player" => qw(peaceful)], 3063 ["cf::player" => qw(peaceful)],
2920 ["cf::map" => qw(trigger)], 3064 ["cf::map" => qw(trigger)],
2921) { 3065) {
2922 no strict 'refs'; 3066 no strict 'refs';
3027 { 3171 {
3028 my $faces = $facedata->{faceinfo}; 3172 my $faces = $facedata->{faceinfo};
3029 3173
3030 while (my ($face, $info) = each %$faces) { 3174 while (my ($face, $info) = each %$faces) {
3031 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3175 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3176
3032 cf::face::set_visibility $idx, $info->{visibility}; 3177 cf::face::set_visibility $idx, $info->{visibility};
3033 cf::face::set_magicmap $idx, $info->{magicmap}; 3178 cf::face::set_magicmap $idx, $info->{magicmap};
3034 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3179 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3035 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3180 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3036 3181
3037 cf::cede_to_tick; 3182 cf::cede_to_tick;
3038 } 3183 }
3039 3184
3040 while (my ($face, $info) = each %$faces) { 3185 while (my ($face, $info) = each %$faces) {
3041 next unless $info->{smooth}; 3186 next unless $info->{smooth};
3187
3042 my $idx = cf::face::find $face 3188 my $idx = cf::face::find $face
3043 or next; 3189 or next;
3190
3044 if (my $smooth = cf::face::find $info->{smooth}) { 3191 if (my $smooth = cf::face::find $info->{smooth}) {
3045 cf::face::set_smooth $idx, $smooth; 3192 cf::face::set_smooth $idx, $smooth;
3046 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3193 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3047 } else { 3194 } else {
3048 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3195 warn "smooth face '$info->{smooth}' not found for face '$face'";
3066 { 3213 {
3067 # TODO: for gcfclient pleasure, we should give resources 3214 # TODO: for gcfclient pleasure, we should give resources
3068 # that gcfclient doesn't grok a >10000 face index. 3215 # that gcfclient doesn't grok a >10000 face index.
3069 my $res = $facedata->{resource}; 3216 my $res = $facedata->{resource};
3070 3217
3071 my $soundconf = delete $res->{"res/sound.conf"};
3072
3073 while (my ($name, $info) = each %$res) { 3218 while (my ($name, $info) = each %$res) {
3219 if (defined $info->{type}) {
3074 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3220 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3075 my $data; 3221 my $data;
3076 3222
3077 if ($info->{type} & 1) { 3223 if ($info->{type} & 1) {
3078 # prepend meta info 3224 # prepend meta info
3079 3225
3080 my $meta = $enc->encode ({ 3226 my $meta = $enc->encode ({
3081 name => $name, 3227 name => $name,
3082 %{ $info->{meta} || {} }, 3228 %{ $info->{meta} || {} },
3083 }); 3229 });
3084 3230
3085 $data = pack "(w/a*)*", $meta, $info->{data}; 3231 $data = pack "(w/a*)*", $meta, $info->{data};
3232 } else {
3233 $data = $info->{data};
3234 }
3235
3236 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3237 cf::face::set_type $idx, $info->{type};
3086 } else { 3238 } else {
3087 $data = $info->{data}; 3239 $RESOURCE{$name} = $info;
3088 } 3240 }
3089 3241
3090 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3091 cf::face::set_type $idx, $info->{type};
3092
3093 cf::cede_to_tick; 3242 cf::cede_to_tick;
3094 } 3243 }
3095
3096 if ($soundconf) {
3097 $soundconf = $enc->decode (delete $soundconf->{data});
3098
3099 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3100 my $sound = $soundconf->{compat}[$_]
3101 or next;
3102
3103 my $face = cf::face::find "sound/$sound->[1]";
3104 cf::sound::set $sound->[0] => $face;
3105 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3106 }
3107
3108 while (my ($k, $v) = each %{$soundconf->{event}}) {
3109 my $face = cf::face::find "sound/$v";
3110 cf::sound::set $k => $face;
3111 }
3112 }
3113 } 3244 }
3245
3246 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3114 3247
3115 1 3248 1
3116} 3249}
3250
3251cf::global->attach (on_resource_update => sub {
3252 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3253 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3254
3255 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3256 my $sound = $soundconf->{compat}[$_]
3257 or next;
3258
3259 my $face = cf::face::find "sound/$sound->[1]";
3260 cf::sound::set $sound->[0] => $face;
3261 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3262 }
3263
3264 while (my ($k, $v) = each %{$soundconf->{event}}) {
3265 my $face = cf::face::find "sound/$v";
3266 cf::sound::set $k => $face;
3267 }
3268 }
3269});
3117 3270
3118register_exticmd fx_want => sub { 3271register_exticmd fx_want => sub {
3119 my ($ns, $want) = @_; 3272 my ($ns, $want) = @_;
3120 3273
3121 while (my ($k, $v) = each %$want) { 3274 while (my ($k, $v) = each %$want) {
3122 $ns->fx_want ($k, $v); 3275 $ns->fx_want ($k, $v);
3123 } 3276 }
3124}; 3277};
3278
3279sub load_resource_file($) {
3280 my $guard = lock_acquire "load_resource_file";
3281
3282 my $status = load_resource_file_ $_[0];
3283 get_slot 0.1, 100;
3284 cf::arch::commit_load;
3285
3286 $status
3287}
3125 3288
3126sub reload_regions { 3289sub reload_regions {
3127 # HACK to clear player env face cache, we need some signal framework 3290 # HACK to clear player env face cache, we need some signal framework
3128 # for this (global event?) 3291 # for this (global event?)
3129 %ext::player_env::MUSIC_FACE_CACHE = (); 3292 %ext::player_env::MUSIC_FACE_CACHE = ();
3143} 3306}
3144 3307
3145sub reload_archetypes { 3308sub reload_archetypes {
3146 load_resource_file "$DATADIR/archetypes" 3309 load_resource_file "$DATADIR/archetypes"
3147 or die "unable to load archetypes\n"; 3310 or die "unable to load archetypes\n";
3148 #d# NEED to laod twice to resolve forward references
3149 # this really needs to be done in an extra post-pass
3150 # (which needs to be synchronous, so solve it differently)
3151 load_resource_file "$DATADIR/archetypes"
3152 or die "unable to load archetypes\n";
3153} 3311}
3154 3312
3155sub reload_treasures { 3313sub reload_treasures {
3156 load_resource_file "$DATADIR/treasures" 3314 load_resource_file "$DATADIR/treasures"
3157 or die "unable to load treasurelists\n"; 3315 or die "unable to load treasurelists\n";
3158} 3316}
3159 3317
3160sub reload_resources { 3318sub reload_resources {
3161 warn "reloading resource files...\n"; 3319 warn "reloading resource files...\n";
3162 3320
3321 reload_facedata;
3322 reload_archetypes;
3163 reload_regions; 3323 reload_regions;
3164 reload_facedata;
3165 #reload_archetypes;#d#
3166 reload_archetypes;
3167 reload_treasures; 3324 reload_treasures;
3168 3325
3169 warn "finished reloading resource files\n"; 3326 warn "finished reloading resource files\n";
3170} 3327}
3171 3328
3172sub init { 3329sub init {
3330 my $guard = freeze_mainloop;
3331
3332 evthread_start IO::AIO::poll_fileno;
3333
3173 reload_resources; 3334 reload_resources;
3174} 3335}
3175 3336
3176sub reload_config { 3337sub reload_config {
3177 open my $fh, "<:utf8", "$CONFDIR/config" 3338 open my $fh, "<:utf8", "$CONFDIR/config"
3178 or return; 3339 or return;
3179 3340
3180 local $/; 3341 local $/;
3181 *CFG = YAML::Syck::Load <$fh>; 3342 *CFG = YAML::Load <$fh>;
3182 3343
3183 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3344 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3184 3345
3185 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3346 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3186 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3347 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3198 # we must not ever block the main coroutine 3359 # we must not ever block the main coroutine
3199 local $Coro::idle = sub { 3360 local $Coro::idle = sub {
3200 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3361 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3201 (async { 3362 (async {
3202 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3363 $Coro::current->{desc} = "IDLE BUG HANDLER";
3203 Event::one_event; 3364 EV::loop EV::LOOP_ONESHOT;
3204 })->prio (Coro::PRIO_MAX); 3365 })->prio (Coro::PRIO_MAX);
3205 }; 3366 };
3206 3367
3368 {
3369 my $guard = freeze_mainloop;
3207 reload_config; 3370 reload_config;
3208 db_init; 3371 db_init;
3209 load_extensions; 3372 load_extensions;
3210 3373
3211 $TICK_WATCHER->start; 3374 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3375 }
3376
3212 Event::loop; 3377 EV::loop;
3213} 3378}
3214 3379
3215############################################################################# 3380#############################################################################
3216# initialisation and cleanup 3381# initialisation and cleanup
3217 3382
3218# install some emergency cleanup handlers 3383# install some emergency cleanup handlers
3219BEGIN { 3384BEGIN {
3385 our %SIGWATCHER = ();
3220 for my $signal (qw(INT HUP TERM)) { 3386 for my $signal (qw(INT HUP TERM)) {
3221 Event->signal ( 3387 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3222 reentrant => 0,
3223 data => WF_AUTOCANCEL,
3224 signal => $signal,
3225 prio => 0,
3226 cb => sub {
3227 cf::cleanup "SIG$signal"; 3388 cf::cleanup "SIG$signal";
3228 },
3229 ); 3389 };
3230 } 3390 }
3231} 3391}
3232 3392
3233sub write_runtime { 3393sub write_runtime_sync {
3234 my $runtime = "$LOCALDIR/runtime"; 3394 my $runtime = "$LOCALDIR/runtime";
3235 3395
3236 # first touch the runtime file to show we are still running: 3396 # first touch the runtime file to show we are still running:
3237 # the fsync below can take a very very long time. 3397 # the fsync below can take a very very long time.
3238 3398
3264 and return; 3424 and return;
3265 3425
3266 warn "runtime file written.\n"; 3426 warn "runtime file written.\n";
3267 3427
3268 1 3428 1
3429}
3430
3431our $uuid_lock;
3432our $uuid_skip;
3433
3434sub write_uuid_sync($) {
3435 $uuid_skip ||= $_[0];
3436
3437 return if $uuid_lock;
3438 local $uuid_lock = 1;
3439
3440 my $uuid = "$LOCALDIR/uuid";
3441
3442 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3443 or return;
3444
3445 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3446 $uuid_skip = 0;
3447
3448 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3449 and return;
3450
3451 # always fsync - this file is important
3452 aio_fsync $fh
3453 and return;
3454
3455 close $fh
3456 or return;
3457
3458 aio_rename "$uuid~", $uuid
3459 and return;
3460
3461 warn "uuid file written ($value).\n";
3462
3463 1
3464
3465}
3466
3467sub write_uuid($$) {
3468 my ($skip, $sync) = @_;
3469
3470 $sync ? write_uuid_sync $skip
3471 : async { write_uuid_sync $skip };
3269} 3472}
3270 3473
3271sub emergency_save() { 3474sub emergency_save() {
3272 my $freeze_guard = cf::freeze_mainloop; 3475 my $freeze_guard = cf::freeze_mainloop;
3273 3476
3279 # and maps saved/destroyed asynchronously. 3482 # and maps saved/destroyed asynchronously.
3280 warn "begin emergency player save\n"; 3483 warn "begin emergency player save\n";
3281 for my $login (keys %cf::PLAYER) { 3484 for my $login (keys %cf::PLAYER) {
3282 my $pl = $cf::PLAYER{$login} or next; 3485 my $pl = $cf::PLAYER{$login} or next;
3283 $pl->valid or next; 3486 $pl->valid or next;
3487 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3284 $pl->save; 3488 $pl->save;
3285 } 3489 }
3286 warn "end emergency player save\n"; 3490 warn "end emergency player save\n";
3287 3491
3288 warn "begin emergency map save\n"; 3492 warn "begin emergency map save\n";
3294 warn "end emergency map save\n"; 3498 warn "end emergency map save\n";
3295 3499
3296 warn "begin emergency database checkpoint\n"; 3500 warn "begin emergency database checkpoint\n";
3297 BDB::db_env_txn_checkpoint $DB_ENV; 3501 BDB::db_env_txn_checkpoint $DB_ENV;
3298 warn "end emergency database checkpoint\n"; 3502 warn "end emergency database checkpoint\n";
3503
3504 warn "begin write uuid\n";
3505 write_uuid_sync 1;
3506 warn "end write uuid\n";
3299 }; 3507 };
3300 3508
3301 warn "leave emergency perl save\n"; 3509 warn "leave emergency perl save\n";
3302} 3510}
3303 3511
3305 my ($make_core) = @_; 3513 my ($make_core) = @_;
3306 3514
3307 warn Carp::longmess "post_cleanup backtrace" 3515 warn Carp::longmess "post_cleanup backtrace"
3308 if $make_core; 3516 if $make_core;
3309} 3517}
3518
3519# a safer delete_package, copied from Symbol
3520sub clear_package($) {
3521 my $pkg = shift;
3522
3523 # expand to full symbol table name if needed
3524 unless ($pkg =~ /^main::.*::$/) {
3525 $pkg = "main$pkg" if $pkg =~ /^::/;
3526 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3527 $pkg .= '::' unless $pkg =~ /::$/;
3528 }
3529
3530 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3531 my $stem_symtab = *{$stem}{HASH};
3532
3533 defined $stem_symtab and exists $stem_symtab->{$leaf}
3534 or return;
3535
3536 # clear all symbols
3537 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3538 for my $name (keys %$leaf_symtab) {
3539 _gv_clear *{"$pkg$name"};
3540# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3541 }
3542 warn "cleared package #$pkg\n";#d#
3543}
3544
3545our $RELOAD; # how many times to reload
3310 3546
3311sub do_reload_perl() { 3547sub do_reload_perl() {
3312 # can/must only be called in main 3548 # can/must only be called in main
3313 if ($Coro::current != $Coro::main) { 3549 if ($Coro::current != $Coro::main) {
3314 warn "can only reload from main coroutine"; 3550 warn "can only reload from main coroutine";
3315 return; 3551 return;
3316 } 3552 }
3317 3553
3554 return if $RELOAD++;
3555
3556 while ($RELOAD) {
3318 warn "reloading..."; 3557 warn "reloading...";
3319 3558
3320 warn "entering sync_job"; 3559 warn "entering sync_job";
3321 3560
3322 cf::sync_job { 3561 cf::sync_job {
3323 cf::write_runtime; # external watchdog should not bark 3562 cf::write_runtime_sync; # external watchdog should not bark
3324 cf::emergency_save; 3563 cf::emergency_save;
3325 cf::write_runtime; # external watchdog should not bark 3564 cf::write_runtime_sync; # external watchdog should not bark
3326 3565
3327 warn "syncing database to disk"; 3566 warn "syncing database to disk";
3328 BDB::db_env_txn_checkpoint $DB_ENV; 3567 BDB::db_env_txn_checkpoint $DB_ENV;
3329 3568
3330 # if anything goes wrong in here, we should simply crash as we already saved 3569 # if anything goes wrong in here, we should simply crash as we already saved
3331 3570
3332 warn "cancelling all WF_AUTOCANCEL watchers";
3333 for (Event::all_watchers) {
3334 $_->cancel if $_->data & WF_AUTOCANCEL;
3335 }
3336
3337 warn "flushing outstanding aio requests"; 3571 warn "flushing outstanding aio requests";
3338 for (;;) {
3339 BDB::flush;
3340 IO::AIO::flush;
3341 Coro::cede;
3342 last unless IO::AIO::nreqs || BDB::nreqs; 3572 while (IO::AIO::nreqs || BDB::nreqs) {
3343 warn "iterate..."; 3573 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3344 }
3345
3346 ++$RELOAD;
3347
3348 warn "cancelling all extension coros";
3349 $_->cancel for values %EXT_CORO;
3350 %EXT_CORO = ();
3351
3352 warn "removing commands";
3353 %COMMAND = ();
3354
3355 warn "removing ext/exti commands";
3356 %EXTCMD = ();
3357 %EXTICMD = ();
3358
3359 warn "unloading/nuking all extensions";
3360 for my $pkg (@EXTS) {
3361 warn "... unloading $pkg";
3362
3363 if (my $cb = $pkg->can ("unload")) {
3364 eval {
3365 $cb->($pkg);
3366 1
3367 } or warn "$pkg unloaded, but with errors: $@";
3368 } 3574 }
3369 3575
3370 warn "... nuking $pkg"; 3576 warn "cancelling all extension coros";
3371 Symbol::delete_package $pkg; 3577 $_->cancel for values %EXT_CORO;
3372 } 3578 %EXT_CORO = ();
3373 3579
3374 warn "unloading all perl modules loaded from $LIBDIR"; 3580 warn "removing commands";
3375 while (my ($k, $v) = each %INC) { 3581 %COMMAND = ();
3376 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3377 3582
3583 warn "removing ext/exti commands";
3584 %EXTCMD = ();
3585 %EXTICMD = ();
3586
3587 warn "unloading/nuking all extensions";
3588 for my $pkg (@EXTS) {
3378 warn "... unloading $k"; 3589 warn "... unloading $pkg";
3379 delete $INC{$k};
3380 3590
3381 $k =~ s/\.pm$//;
3382 $k =~ s/\//::/g;
3383
3384 if (my $cb = $k->can ("unload_module")) { 3591 if (my $cb = $pkg->can ("unload")) {
3592 eval {
3385 $cb->(); 3593 $cb->($pkg);
3594 1
3595 } or warn "$pkg unloaded, but with errors: $@";
3596 }
3597
3598 warn "... clearing $pkg";
3599 clear_package $pkg;
3386 } 3600 }
3387 3601
3388 Symbol::delete_package $k; 3602 warn "unloading all perl modules loaded from $LIBDIR";
3603 while (my ($k, $v) = each %INC) {
3604 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3605
3606 warn "... unloading $k";
3607 delete $INC{$k};
3608
3609 $k =~ s/\.pm$//;
3610 $k =~ s/\//::/g;
3611
3612 if (my $cb = $k->can ("unload_module")) {
3613 $cb->();
3614 }
3615
3616 clear_package $k;
3389 } 3617 }
3390 3618
3391 warn "getting rid of safe::, as good as possible"; 3619 warn "getting rid of safe::, as good as possible";
3392 Symbol::delete_package "safe::$_" 3620 clear_package "safe::$_"
3393 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3621 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3394 3622
3395 warn "unloading cf.pm \"a bit\""; 3623 warn "unloading cf.pm \"a bit\"";
3396 delete $INC{"cf.pm"}; 3624 delete $INC{"cf.pm"};
3397 delete $INC{"cf/pod.pm"}; 3625 delete $INC{"cf/pod.pm"};
3398 3626
3399 # don't, removes xs symbols, too, 3627 # don't, removes xs symbols, too,
3400 # and global variables created in xs 3628 # and global variables created in xs
3401 #Symbol::delete_package __PACKAGE__; 3629 #clear_package __PACKAGE__;
3402 3630
3403 warn "unload completed, starting to reload now"; 3631 warn "unload completed, starting to reload now";
3404 3632
3405 warn "reloading cf.pm"; 3633 warn "reloading cf.pm";
3406 require cf; 3634 require cf;
3407 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3635 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3408 3636
3409 warn "loading config and database again"; 3637 warn "loading config and database again";
3410 cf::reload_config; 3638 cf::reload_config;
3411 3639
3412 warn "loading extensions"; 3640 warn "loading extensions";
3413 cf::load_extensions; 3641 cf::load_extensions;
3414 3642
3415 warn "reattaching attachments to objects/players"; 3643 warn "reattaching attachments to objects/players";
3416 _global_reattach; # objects, sockets 3644 _global_reattach; # objects, sockets
3417 warn "reattaching attachments to maps"; 3645 warn "reattaching attachments to maps";
3418 reattach $_ for values %MAP; 3646 reattach $_ for values %MAP;
3419 warn "reattaching attachments to players"; 3647 warn "reattaching attachments to players";
3420 reattach $_ for values %PLAYER; 3648 reattach $_ for values %PLAYER;
3421 3649
3422 warn "leaving sync_job"; 3650 warn "leaving sync_job";
3423 3651
3424 1 3652 1
3425 } or do { 3653 } or do {
3426 warn $@; 3654 warn $@;
3427 warn "error while reloading, exiting."; 3655 cf::cleanup "error while reloading, exiting.";
3428 exit 1;
3429 }; 3656 };
3430 3657
3431 warn "reloaded"; 3658 warn "reloaded";
3659 --$RELOAD;
3660 }
3432}; 3661};
3433 3662
3434our $RELOAD_WATCHER; # used only during reload 3663our $RELOAD_WATCHER; # used only during reload
3435 3664
3436sub reload_perl() { 3665sub reload_perl() {
3437 # doing reload synchronously and two reloads happen back-to-back, 3666 # doing reload synchronously and two reloads happen back-to-back,
3438 # coro crashes during coro_state_free->destroy here. 3667 # coro crashes during coro_state_free->destroy here.
3439 3668
3440 $RELOAD_WATCHER ||= Event->timer ( 3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3441 reentrant => 0,
3442 after => 0,
3443 data => WF_AUTOCANCEL,
3444 cb => sub {
3445 do_reload_perl; 3670 do_reload_perl;
3446 undef $RELOAD_WATCHER; 3671 undef $RELOAD_WATCHER;
3447 },
3448 ); 3672 };
3449} 3673}
3450 3674
3451register_command "reload" => sub { 3675register_command "reload" => sub {
3452 my ($who, $arg) = @_; 3676 my ($who, $arg) = @_;
3453 3677
3466 3690
3467our @WAIT_FOR_TICK; 3691our @WAIT_FOR_TICK;
3468our @WAIT_FOR_TICK_BEGIN; 3692our @WAIT_FOR_TICK_BEGIN;
3469 3693
3470sub wait_for_tick { 3694sub wait_for_tick {
3471 return unless $TICK_WATCHER->is_active;
3472 return if $Coro::current == $Coro::main; 3695 return if tick_inhibit || $Coro::current == $Coro::main;
3473 3696
3474 my $signal = new Coro::Signal; 3697 my $signal = new Coro::Signal;
3475 push @WAIT_FOR_TICK, $signal; 3698 push @WAIT_FOR_TICK, $signal;
3476 $signal->wait; 3699 $signal->wait;
3477} 3700}
3478 3701
3479sub wait_for_tick_begin { 3702sub wait_for_tick_begin {
3480 return unless $TICK_WATCHER->is_active;
3481 return if $Coro::current == $Coro::main; 3703 return if tick_inhibit || $Coro::current == $Coro::main;
3482 3704
3483 my $signal = new Coro::Signal; 3705 my $signal = new Coro::Signal;
3484 push @WAIT_FOR_TICK_BEGIN, $signal; 3706 push @WAIT_FOR_TICK_BEGIN, $signal;
3485 $signal->wait; 3707 $signal->wait;
3486} 3708}
3487 3709
3488$TICK_WATCHER = Event->timer ( 3710sub tick {
3489 reentrant => 0,
3490 parked => 1,
3491 prio => 0,
3492 at => $NEXT_TICK || $TICK,
3493 data => WF_AUTOCANCEL,
3494 cb => sub {
3495 if ($Coro::current != $Coro::main) { 3711 if ($Coro::current != $Coro::main) {
3496 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3712 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3497 unless ++$bug_warning > 10; 3713 unless ++$bug_warning > 10;
3498 return; 3714 return;
3499 } 3715 }
3500 3716
3501 $NOW = $tick_start = Event::time;
3502
3503 cf::server_tick; # one server iteration 3717 cf::server_tick; # one server iteration
3504 3718
3505 $RUNTIME += $TICK;
3506 $NEXT_TICK += $TICK;
3507
3508 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3719 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3509 $NEXT_RUNTIME_WRITE = $NOW + 10; 3720 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3510 Coro::async_pool { 3721 Coro::async_pool {
3511 $Coro::current->{desc} = "runtime saver"; 3722 $Coro::current->{desc} = "runtime saver";
3512 write_runtime 3723 write_runtime_sync
3513 or warn "ERROR: unable to write runtime file: $!"; 3724 or warn "ERROR: unable to write runtime file: $!";
3514 };
3515 } 3725 };
3726 }
3516 3727
3517 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3728 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3518 $sig->send; 3729 $sig->send;
3519 } 3730 }
3520 while (my $sig = shift @WAIT_FOR_TICK) { 3731 while (my $sig = shift @WAIT_FOR_TICK) {
3521 $sig->send; 3732 $sig->send;
3522 } 3733 }
3523 3734
3524 $NOW = Event::time; 3735 $LOAD = ($NOW - $TICK_START) / $TICK;
3525
3526 # if we are delayed by four ticks or more, skip them all
3527 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3528
3529 $TICK_WATCHER->at ($NEXT_TICK);
3530 $TICK_WATCHER->start;
3531
3532 $LOAD = ($NOW - $tick_start) / $TICK;
3533 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3736 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3534 3737
3535 _post_tick; 3738 if (0) {
3739 if ($NEXT_TICK) {
3740 my $jitter = $TICK_START - $NEXT_TICK;
3741 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3742 warn "jitter $JITTER\n";#d#
3743 }
3536 }, 3744 }
3537); 3745}
3538 3746
3539{ 3747{
3748 # configure BDB
3749
3540 BDB::min_parallel 8; 3750 BDB::min_parallel 8;
3541 BDB::max_poll_time $TICK * 0.1; 3751 BDB::max_poll_reqs $TICK * 0.1;
3542 $BDB_POLL_WATCHER = Event->io ( 3752 $AnyEvent::BDB::WATCHER->priority (1);
3543 reentrant => 0,
3544 fd => BDB::poll_fileno,
3545 poll => 'r',
3546 prio => 0,
3547 data => WF_AUTOCANCEL,
3548 cb => \&BDB::poll_cb,
3549 );
3550
3551 BDB::set_sync_prepare {
3552 my $status;
3553 my $current = $Coro::current;
3554 (
3555 sub {
3556 $status = $!;
3557 $current->ready; undef $current;
3558 },
3559 sub {
3560 Coro::schedule while defined $current;
3561 $! = $status;
3562 },
3563 )
3564 };
3565 3753
3566 unless ($DB_ENV) { 3754 unless ($DB_ENV) {
3567 $DB_ENV = BDB::db_env_create; 3755 $DB_ENV = BDB::db_env_create;
3568 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3756 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3569 | BDB::LOG_AUTOREMOVE, 1); 3757 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3758 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3570 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3759 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3571 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3760 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3572 3761
3573 cf::sync_job { 3762 cf::sync_job {
3574 eval { 3763 eval {
3584 3773
3585 cf::cleanup "db_env_open(db): $@" if $@; 3774 cf::cleanup "db_env_open(db): $@" if $@;
3586 }; 3775 };
3587 } 3776 }
3588 3777
3589 $BDB_DEADLOCK_WATCHER = Event->timer ( 3778 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3590 after => 3,
3591 interval => 1,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3779 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3597 },
3598 ); 3780 };
3599 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3781 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3600 after => 11,
3601 interval => 60,
3602 hard => 1,
3603 prio => 0,
3604 data => WF_AUTOCANCEL,
3605 cb => sub {
3606 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3782 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3607 },
3608 ); 3783 };
3609 $BDB_TRICKLE_WATCHER = Event->timer ( 3784 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3610 after => 5,
3611 interval => 10,
3612 hard => 1,
3613 prio => 0,
3614 data => WF_AUTOCANCEL,
3615 cb => sub {
3616 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3785 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3617 },
3618 ); 3786 };
3619} 3787}
3620 3788
3621{ 3789{
3790 # configure IO::AIO
3791
3622 IO::AIO::min_parallel 8; 3792 IO::AIO::min_parallel 8;
3623
3624 undef $Coro::AIO::WATCHER;
3625 IO::AIO::max_poll_time $TICK * 0.1; 3793 IO::AIO::max_poll_time $TICK * 0.1;
3626 $AIO_POLL_WATCHER = Event->io ( 3794 undef $AnyEvent::AIO::WATCHER;
3627 reentrant => 0,
3628 data => WF_AUTOCANCEL,
3629 fd => IO::AIO::poll_fileno,
3630 poll => 'r',
3631 prio => 0,
3632 cb => \&IO::AIO::poll_cb,
3633 );
3634} 3795}
3635 3796
3636my $_log_backtrace; 3797my $_log_backtrace;
3637 3798
3638sub _log_backtrace { 3799sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines