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.186 by root, Sat Jan 20 01:12:39 2007 UTC vs.
Revision 1.275 by root, Thu Jun 7 19:12:22 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.4 (); 15use Coro 3.61 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
19 24
25use BDB ();
20use Data::Dumper; 26use Data::Dumper;
21use Digest::MD5; 27use Digest::MD5;
22use Fcntl; 28use Fcntl;
29use YAML::Syck ();
23use IO::AIO 2.32 (); 30use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 31use Time::HiRes;
32use Compress::LZF;
26 33
34# configure various modules to our taste
35#
36$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 40$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 41
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 43$YAML::Syck::ImplicitUnicode = 1;
33 44
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35 48
36our %COMMAND = (); 49our %COMMAND = ();
37our %COMMAND_TIME = (); 50our %COMMAND_TIME = ();
38 51
39our @EXTS = (); # list of extension package names 52our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 53our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
43 56
57our $RELOAD; # number of reloads so far
44our @EVENT; 58our @EVENT;
45our $LIBDIR = datadir . "/ext";
46 59
47our $TICK = MAX_TIME * 1e-6; 60our $CONFDIR = confdir;
61our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db";
71
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
48our $TICK_WATCHER; 73our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 76our $NEXT_TICK;
52our $NOW; 77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off
79
80our $BDB_POLL_WATCHER;
81our $DB_ENV;
53 82
54our %CFG; 83our %CFG;
55 84
56our $UPTIME; $UPTIME ||= time; 85our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 86our $RUNTIME;
58 87
59our %PLAYER; # all users 88our %PLAYER; # all users
60our %MAP; # all maps 89our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random";
63
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 91
67# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
69 94
95our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing
97our $tick_start; # for load detecting purposes
98
70binmode STDOUT; 99binmode STDOUT;
71binmode STDERR; 100binmode STDERR;
72 101
73# read virtual server time, if available 102# read virtual server time, if available
74unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
75 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
76 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
77 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
78} 107}
79 108
80mkdir cf::localdir; 109mkdir $_
81mkdir cf::localdir . "/" . cf::playerdir; 110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
82mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS;
85 111
86our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
113
114sub cf::map::normalise;
87 115
88############################################################################# 116#############################################################################
89 117
90=head2 GLOBAL VARIABLES 118=head2 GLOBAL VARIABLES
91 119
98=item $cf::RUNTIME 126=item $cf::RUNTIME
99 127
100The time this server has run, starts at 0 and is increased by $cf::TICK on 128The time this server has run, starts at 0 and is increased by $cf::TICK on
101every server tick. 129every server tick.
102 130
103=item $cf::LIBDIR 131=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
132$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
133$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
104 134
105The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
106be found. It will be added to C<@INC> automatically. 136directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
137unique-items directory, player file directory, random maps directory and
138database environment.
107 139
108=item $cf::NOW 140=item $cf::NOW
109 141
110The time of the last (current) server tick. 142The time of the last (current) server tick.
111 143
112=item $cf::TICK 144=item $cf::TICK
113 145
114The interval between server ticks, in seconds. 146The interval between server ticks, in seconds.
147
148=item $cf::LOADAVG
149
150The current CPU load on the server (alpha-smoothed), as a value between 0
151(none) and 1 (overloaded), indicating how much time is spent on processing
152objects per tick. Healthy values are < 0.5.
153
154=item $cf::LOAD
155
156The raw value load value from the last tick.
115 157
116=item %cf::CFG 158=item %cf::CFG
117 159
118Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
119from wherever your confdir points to. 161from wherever your confdir points to.
120 162
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 163=item cf::wait_for_tick, cf::wait_for_tick_begin
122 164
123These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
124or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 166returns directly I<after> the tick processing (and consequently, can only wake one process
125processing has been done. Call C<< ->wait >> on them to maximise the 167per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
126window of cpu time available, or simply to synchronise to the server tick.
127 168
128=back 169=back
129 170
130=cut 171=cut
131 172
132BEGIN { 173BEGIN {
133 *CORE::GLOBAL::warn = sub { 174 *CORE::GLOBAL::warn = sub {
134 my $msg = join "", @_; 175 my $msg = join "", @_;
135 utf8::encode $msg;
136 176
137 $msg .= "\n" 177 $msg .= "\n"
138 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
139 179
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181
182 utf8::encode $msg;
140 LOG llevError, $msg; 183 LOG llevError, $msg;
141 }; 184 };
142} 185}
143 186
144@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
145@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
146@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
147@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
148@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
192@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
149@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 193@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
150 194
151# we bless all objects into (empty) derived classes to force a method lookup 195# we bless all objects into (empty) derived classes to force a method lookup
152# within the Safe compartment. 196# within the Safe compartment.
153for my $pkg (qw( 197for my $pkg (qw(
154 cf::global cf::attachable 198 cf::global cf::attachable
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 234 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d 235 $d
192 } || "[unable to dump $_[0]: '$@']"; 236 } || "[unable to dump $_[0]: '$@']";
193} 237}
194 238
195use JSON::Syck (); # TODO# replace by JSON::PC once working 239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
196 240
197=item $ref = cf::from_json $json 241=item $ref = cf::from_json $json
198 242
199Converts a JSON string into the corresponding perl data structure. 243Converts a JSON string into the corresponding perl data structure.
200 244
201=cut
202
203sub from_json($) {
204 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
205 JSON::Syck::Load $_[0]
206}
207
208=item $json = cf::to_json $ref 245=item $json = cf::to_json $ref
209 246
210Converts a perl data structure into its JSON representation. 247Converts a perl data structure into its JSON representation.
211
212=cut
213
214sub to_json($) {
215 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
216 JSON::Syck::Dump $_[0]
217}
218 248
219=item cf::lock_wait $string 249=item cf::lock_wait $string
220 250
221Wait until the given lock is available. See cf::lock_acquire. 251Wait until the given lock is available. See cf::lock_acquire.
222 252
228returned. 258returned.
229 259
230Lock names should begin with a unique identifier (for example, cf::map::find 260Lock names should begin with a unique identifier (for example, cf::map::find
231uses map_find and cf::map::load uses map_load). 261uses map_find and cf::map::load uses map_load).
232 262
263=item $locked = cf::lock_active $string
264
265Return true if the lock is currently active, i.e. somebody has locked it.
266
233=cut 267=cut
234 268
235our %LOCK; 269our %LOCK;
236 270
237sub lock_wait($) { 271sub lock_wait($) {
256 # wake up all waiters, to be on the safe side 290 # wake up all waiters, to be on the safe side
257 $_->ready for @{ delete $LOCK{$key} }; 291 $_->ready for @{ delete $LOCK{$key} };
258 } 292 }
259} 293}
260 294
295sub lock_active($) {
296 my ($key) = @_;
297
298 ! ! $LOCK{$key}
299}
300
261sub freeze_mainloop { 301sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 302 return unless $TICK_WATCHER->is_active;
263 303
264 my $guard = Coro::guard { 304 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 305 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 306 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 307 $TICK_WATCHER->stop;
270 $guard 308 $guard
271} 309}
272 310
273=item cf::async { BLOCK } 311=item cf::async { BLOCK }
295 333
296sub sync_job(&) { 334sub sync_job(&) {
297 my ($job) = @_; 335 my ($job) = @_;
298 336
299 if ($Coro::current == $Coro::main) { 337 if ($Coro::current == $Coro::main) {
338 my $time = Event::time;
339
300 # this is the main coro, too bad, we have to block 340 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 341 # till the operation succeeds, freezing the server :/
302 342
303 # TODO: use suspend/resume instead 343 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 344 # (but this is cancel-safe)
315 355
316 while ($busy) { 356 while ($busy) {
317 Coro::cede or Event::one_event; 357 Coro::cede or Event::one_event;
318 } 358 }
319 359
360 $time = Event::time - $time;
361
362 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364
365 $tick_start += $time; # do not account sync jobs to server load
366
320 wantarray ? @res : $res[0] 367 wantarray ? @res : $res[0]
321 } else { 368 } else {
322 # we are in another coroutine, how wonderful, everything just works 369 # we are in another coroutine, how wonderful, everything just works
323 370
324 $job->() 371 $job->()
344 391
345 $coro 392 $coro
346} 393}
347 394
348sub write_runtime { 395sub write_runtime {
349 my $runtime = cf::localdir . "/runtime"; 396 my $runtime = "$LOCALDIR/runtime";
397
398 # first touch the runtime file to show we are still running:
399 # the fsync below can take a very very long time.
400
401 IO::AIO::aio_utime $runtime, undef, undef;
402
403 my $guard = cf::lock_acquire "write_runtime";
350 404
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 406 or return;
353 407
354 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
356 # 60 allows for the watchdog to kill the server. 410 # 60 allows for the watchdog to kill the server.
357 411
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 412 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 413 and return;
360 414
415 # always fsync - this file is important
361 aio_fsync $fh 416 aio_fsync $fh
362 and return; 417 and return;
363 418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
364 close $fh 422 close $fh
365 or return; 423 or return;
366 424
367 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
368 and return; 426 and return;
369 427
428 warn "runtime file written.\n";
429
370 1 430 1
431}
432
433=item cf::datalog type => key => value, ...
434
435Log a datalog packet of the given type with the given key-value pairs.
436
437=cut
438
439sub datalog($@) {
440 my ($type, %kv) = @_;
441 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
371} 442}
372 443
373=back 444=back
374 445
375=cut 446=cut
555 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
556 627
557 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
558 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
559 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
560 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
561 632
562 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
563 my $pkg = shift @arg; 634 my $pkg = shift @arg;
564 635
565 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
606 if (ref $_[0]) { 677 if (ref $_[0]) {
607 _object_attach @_; 678 _object_attach @_;
608 } else { 679 } else {
609 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
610 } 681 }
682 _recalc_want;
611}; 683};
612 684
613# all those should be optimised 685# all those should be optimised
614sub cf::attachable::detach { 686sub cf::attachable::detach {
615 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
618 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
619 reattach ($obj); 691 reattach ($obj);
620 } else { 692 } else {
621 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
622 } 694 }
695 _recalc_want;
623}; 696};
624 697
625sub cf::attachable::attached { 698sub cf::attachable::attached {
626 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
627 700
750 $filename, length $$rdata, scalar @$objs; 823 $filename, length $$rdata, scalar @$objs;
751 824
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 826 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 827 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 828 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 829 close $fh;
757 830
758 if (@$objs) { 831 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 832 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 833 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 834 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 835 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 836 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 837 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 838 aio_rename "$filename.pst~", "$filename.pst";
766 } 839 }
767 } else { 840 } else {
768 aio_unlink "$filename.pst"; 841 aio_unlink "$filename.pst";
800 or return; 873 or return;
801 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
802 } 875 }
803 876
804 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
805 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
806 return ($data, $av); 879 return ($data, $av);
807} 880}
808 881
809############################################################################# 882#############################################################################
810# command handling &c 883# command handling &c
937Returns the given player object, loading it if necessary (might block). 1010Returns the given player object, loading it if necessary (might block).
938 1011
939=cut 1012=cut
940 1013
941sub playerdir($) { 1014sub playerdir($) {
942 cf::localdir 1015 "$PLAYERDIR/"
943 . "/"
944 . cf::playerdir
945 . "/"
946 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1016 . (ref $_[0] ? $_[0]->ob->name : $_[0])
947} 1017}
948 1018
949sub path($) { 1019sub path($) {
950 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1020 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
951 1021
952 (playerdir $login) . "/$login.pl" 1022 (playerdir $login) . "/playerdata"
953} 1023}
954 1024
955sub find_active($) { 1025sub find_active($) {
956 $cf::PLAYER{$_[0]} 1026 $cf::PLAYER{$_[0]}
957 and $cf::PLAYER{$_[0]}->active 1027 and $cf::PLAYER{$_[0]}->active
970 my $login = $_[0]; 1040 my $login = $_[0];
971 1041
972 my $guard = cf::lock_acquire "user_find:$login"; 1042 my $guard = cf::lock_acquire "user_find:$login";
973 1043
974 $cf::PLAYER{$_[0]} || do { 1044 $cf::PLAYER{$_[0]} || do {
1045 # rename old playerfiles to new ones
1046 #TODO: remove when no longer required
1047 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1048 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1049 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1050 aio_unlink +(playerdir $login) . "/$login.pl";
1051
975 my $pl = load_pl path $login 1052 my $pl = load_pl path $login
976 or return; 1053 or return;
977 $cf::PLAYER{$login} = $pl 1054 $cf::PLAYER{$login} = $pl
978 } 1055 }
979 } 1056 }
1016 1093
1017=cut 1094=cut
1018 1095
1019sub quit_character { 1096sub quit_character {
1020 my ($pl) = @_; 1097 my ($pl) = @_;
1098
1099 my $name = $pl->ob->name;
1021 1100
1022 $pl->{deny_save} = 1; 1101 $pl->{deny_save} = 1;
1023 $pl->password ("*"); # this should lock out the player until we nuked the dir 1102 $pl->password ("*"); # this should lock out the player until we nuked the dir
1024 1103
1025 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1104 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1030 my $path = playerdir $pl; 1109 my $path = playerdir $pl;
1031 my $temp = "$path~$cf::RUNTIME~deleting~"; 1110 my $temp = "$path~$cf::RUNTIME~deleting~";
1032 aio_rename $path, $temp; 1111 aio_rename $path, $temp;
1033 delete $cf::PLAYER{$pl->ob->name}; 1112 delete $cf::PLAYER{$pl->ob->name};
1034 $pl->destroy; 1113 $pl->destroy;
1114
1115 my $prefix = qr<^~\Q$name\E/>;
1116
1117 # nuke player maps
1118 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1119
1035 IO::AIO::aio_rmtree $temp; 1120 IO::AIO::aio_rmtree $temp;
1121}
1122
1123=item $pl->kick
1124
1125Kicks a player out of the game. This destroys the connection.
1126
1127=cut
1128
1129sub kick {
1130 my ($pl, $kicker) = @_;
1131
1132 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1133 $pl->killer ("kicked");
1134 $pl->ns->destroy;
1036} 1135}
1037 1136
1038=item cf::player::list_logins 1137=item cf::player::list_logins
1039 1138
1040Returns am arrayref of all valid playernames in the system, can take a 1139Returns am arrayref of all valid playernames in the system, can take a
1041while and may block, so not sync_job-capable, ever. 1140while and may block, so not sync_job-capable, ever.
1042 1141
1043=cut 1142=cut
1044 1143
1045sub list_logins { 1144sub list_logins {
1046 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1145 my $dirs = aio_readdir $PLAYERDIR
1047 or return []; 1146 or return [];
1048 1147
1049 my @logins; 1148 my @logins;
1050 1149
1051 for my $login (@$dirs) { 1150 for my $login (@$dirs) {
1068=cut 1167=cut
1069 1168
1070sub maps($) { 1169sub maps($) {
1071 my ($pl) = @_; 1170 my ($pl) = @_;
1072 1171
1172 $pl = ref $pl ? $pl->ob->name : $pl;
1173
1073 my $files = aio_readdir playerdir $pl 1174 my $files = aio_readdir playerdir $pl
1074 or return; 1175 or return;
1075 1176
1076 my @paths; 1177 my @paths;
1077 1178
1078 for (@$files) { 1179 for (@$files) {
1079 utf8::decode $_; 1180 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1181 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1182 next unless /^$PATH_SEP/o;
1082 1183
1083 s/\.map$//; 1184 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1185 }
1086 1186
1087 \@paths 1187 \@paths
1088} 1188}
1089 1189
1090=item $player->ext_reply ($msgid, $msgtype, %msg) 1190=item $player->ext_reply ($msgid, %msg)
1091 1191
1092Sends an ext reply to the player. 1192Sends an ext reply to the player.
1093 1193
1094=cut 1194=cut
1095 1195
1096sub ext_reply($$$%) { 1196sub ext_reply($$%) {
1097 my ($self, $id, %msg) = @_; 1197 my ($self, $id, %msg) = @_;
1098 1198
1099 $msg{msgid} = $id; 1199 $msg{msgid} = $id;
1100 1200
1101 $self->send ("ext " . cf::to_json \%msg); 1201 $self->send ("ext " . cf::to_json \%msg);
1102} 1202}
1103 1203
1104package cf; 1204=item $player->ext_event ($type, %msg)
1205
1206Sends an ext event to the client.
1207
1208=cut
1209
1210sub ext_event($$%) {
1211 my ($self, $type, %msg) = @_;
1212
1213 $self->ns->ext_event ($type, %msg);
1214}
1215
1216=head3 cf::region
1217
1218=over 4
1219
1220=cut
1221
1222package cf::region;
1223
1224=item cf::region::find_by_path $path
1225
1226Tries to decuce the probable region for a map knowing only its path.
1227
1228=cut
1229
1230sub find_by_path($) {
1231 my ($path) = @_;
1232
1233 my ($match, $specificity);
1234
1235 for my $region (list) {
1236 if ($region->match && $path =~ $region->match) {
1237 ($match, $specificity) = ($region, $region->specificity)
1238 if $region->specificity > $specificity;
1239 }
1240 }
1241
1242 $match
1243}
1105 1244
1106=back 1245=back
1107
1108 1246
1109=head3 cf::map 1247=head3 cf::map
1110 1248
1111=over 4 1249=over 4
1112 1250
1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1278 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1141 (cf::region::find $rmp->{region}), $rmp->{custom} 1279 (cf::region::find $rmp->{region}), $rmp->{custom}
1142 ) 1280 )
1143} 1281}
1144 1282
1283=item cf::map->register ($regex, $prio)
1284
1285Register a handler for the map path matching the given regex at the
1286givne priority (higher is better, built-in handlers have priority 0, the
1287default).
1288
1289=cut
1290
1145sub register { 1291sub register {
1146 my (undef, $regex) = @_; 1292 my (undef, $regex, $prio) = @_;
1147 my $pkg = caller; 1293 my $pkg = caller;
1148 1294
1149 no strict; 1295 no strict;
1150 push @{"$pkg\::ISA"}, __PACKAGE__; 1296 push @{"$pkg\::ISA"}, __PACKAGE__;
1151 1297
1152 $EXT_MAP{$pkg} = qr<$regex>; 1298 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1153} 1299}
1154 1300
1155# also paths starting with '/' 1301# also paths starting with '/'
1156$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1302$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1157 1303
1158sub thawer_merge { 1304sub thawer_merge {
1159 my ($self, $merge) = @_; 1305 my ($self, $merge) = @_;
1160 1306
1161 # we have to keep some variables in memory intact 1307 # we have to keep some variables in memory intact
1162 local $self->{path}; 1308 local $self->{path};
1163 local $self->{load_path}; 1309 local $self->{load_path};
1164 local $self->{deny_save};
1165 local $self->{deny_reset};
1166 1310
1167 $self->SUPER::thawer_merge ($merge); 1311 $self->SUPER::thawer_merge ($merge);
1168} 1312}
1169 1313
1170sub normalise { 1314sub normalise {
1171 my ($path, $base) = @_; 1315 my ($path, $base) = @_;
1316
1317 $path = "$path"; # make sure its a string
1318
1319 $path =~ s/\.map$//;
1172 1320
1173 # map plan: 1321 # map plan:
1174 # 1322 #
1175 # /! non-realised random map exit (special hack!) 1323 # /! non-realised random map exit (special hack!)
1176 # {... are special paths that are not being touched 1324 # {... are special paths that are not being touched
1204 1352
1205 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1353 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1206 1354
1207 $path = normalise $path, $base; 1355 $path = normalise $path, $base;
1208 1356
1209 for my $pkg (keys %EXT_MAP) { 1357 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1210 if ($path =~ $EXT_MAP{$pkg}) { 1358 if ($path =~ $EXT_MAP{$pkg}[1]) {
1211 my $self = bless cf::map::new, $pkg; 1359 my $self = bless cf::map::new, $pkg;
1212 $self->{path} = $path; $self->path ($path); 1360 $self->{path} = $path; $self->path ($path);
1213 $self->init; # pass $1 etc. 1361 $self->init; # pass $1 etc.
1214 return $self; 1362 return $self;
1215 } 1363 }
1216 } 1364 }
1217 1365
1218 Carp::carp "unable to resolve path '$path'."; 1366 Carp::carp "unable to resolve path '$path' (base '$base').";
1219 () 1367 ()
1220} 1368}
1221 1369
1222sub init { 1370sub init {
1223 my ($self) = @_; 1371 my ($self) = @_;
1238 1386
1239# the original (read-only) location 1387# the original (read-only) location
1240sub load_path { 1388sub load_path {
1241 my ($self) = @_; 1389 my ($self) = @_;
1242 1390
1243 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1391 "$MAPDIR/$self->{path}.map"
1244} 1392}
1245 1393
1246# the temporary/swap location 1394# the temporary/swap location
1247sub save_path { 1395sub save_path {
1248 my ($self) = @_; 1396 my ($self) = @_;
1249 1397
1250 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1398 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1251 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1399 "$TMPDIR/$path.map"
1252} 1400}
1253 1401
1254# the unique path, undef == no special unique path 1402# the unique path, undef == no special unique path
1255sub uniq_path { 1403sub uniq_path {
1256 my ($self) = @_; 1404 my ($self) = @_;
1257 1405
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1406 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1407 "$UNIQUEDIR/$path"
1260} 1408}
1261 1409
1262# and all this just because we cannot iterate over 1410# and all this just because we cannot iterate over
1263# all maps in C++... 1411# all maps in C++...
1264sub change_all_map_light { 1412sub change_all_map_light {
1266 1414
1267 $_->change_map_light ($change) 1415 $_->change_map_light ($change)
1268 for grep $_->outdoor, values %cf::MAP; 1416 for grep $_->outdoor, values %cf::MAP;
1269} 1417}
1270 1418
1419sub decay_objects {
1420 my ($self) = @_;
1421
1422 return if $self->{deny_reset};
1423
1424 $self->do_decay_objects;
1425}
1426
1271sub unlink_save { 1427sub unlink_save {
1272 my ($self) = @_; 1428 my ($self) = @_;
1273 1429
1274 utf8::encode (my $save = $self->save_path); 1430 utf8::encode (my $save = $self->save_path);
1275 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1431 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1278 1434
1279sub load_header_from($) { 1435sub load_header_from($) {
1280 my ($self, $path) = @_; 1436 my ($self, $path) = @_;
1281 1437
1282 utf8::encode $path; 1438 utf8::encode $path;
1283 aio_open $path, O_RDONLY, 0 1439 #aio_open $path, O_RDONLY, 0
1284 or return; 1440 # or return;
1285 1441
1286 $self->_load_header ($path) 1442 $self->_load_header ($path)
1287 or return; 1443 or return;
1288 1444
1289 $self->{load_path} = $path; 1445 $self->{load_path} = $path;
1290 1446
1291 1 1447 1
1292} 1448}
1293 1449
1294sub load_orig { 1450sub load_header_orig {
1295 my ($self) = @_; 1451 my ($self) = @_;
1296 1452
1297 $self->load_header_from ($self->load_path) 1453 $self->load_header_from ($self->load_path)
1298} 1454}
1299 1455
1300sub load_temp { 1456sub load_header_temp {
1301 my ($self) = @_; 1457 my ($self) = @_;
1302 1458
1303 $self->load_header_from ($self->save_path) 1459 $self->load_header_from ($self->save_path)
1460}
1461
1462sub prepare_temp {
1463 my ($self) = @_;
1464
1465 $self->last_access ((delete $self->{last_access})
1466 || $cf::RUNTIME); #d#
1467 # safety
1468 $self->{instantiate_time} = $cf::RUNTIME
1469 if $self->{instantiate_time} > $cf::RUNTIME;
1470}
1471
1472sub prepare_orig {
1473 my ($self) = @_;
1474
1475 $self->{load_original} = 1;
1476 $self->{instantiate_time} = $cf::RUNTIME;
1477 $self->last_access ($cf::RUNTIME);
1478 $self->instantiate;
1304} 1479}
1305 1480
1306sub load_header { 1481sub load_header {
1307 my ($self) = @_; 1482 my ($self) = @_;
1308 1483
1309 if ($self->load_temp) { 1484 if ($self->load_header_temp) {
1310 $self->last_access ((delete $self->{last_access}) 1485 $self->prepare_temp;
1311 || $cf::RUNTIME); #d#
1312 # safety
1313 $self->{instantiate_time} = $cf::RUNTIME
1314 if $self->{instantiate_time} > $cf::RUNTIME;
1315 } else { 1486 } else {
1316 $self->load_orig 1487 $self->load_header_orig
1317 or return; 1488 or return;
1318 1489 $self->prepare_orig;
1319 $self->{load_original} = 1;
1320 $self->{instantiate_time} = $cf::RUNTIME;
1321 $self->last_access ($cf::RUNTIME);
1322 $self->instantiate;
1323 } 1490 }
1491
1492 $self->{deny_reset} = 1
1493 if $self->no_reset;
1494
1495 $self->default_region (cf::region::find_by_path $self->{path})
1496 unless $self->default_region;
1324 1497
1325 1 1498 1
1326} 1499}
1327 1500
1328sub find; 1501sub find;
1341 $map->{last_save} = $cf::RUNTIME; 1514 $map->{last_save} = $cf::RUNTIME;
1342 1515
1343 $map->load_header 1516 $map->load_header
1344 or return; 1517 or return;
1345 1518
1346 if ($map->should_reset) { 1519 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1347 # doing this can freeze the server in a sync job, obviously 1520 # doing this can freeze the server in a sync job, obviously
1348 #$cf::WAIT_FOR_TICK->wait; 1521 #$cf::WAIT_FOR_TICK->wait;
1349 $map->reset; 1522 $map->reset;
1350 undef $guard; 1523 undef $guard;
1351 $map = find $path 1524 return find $path;
1352 or return;
1353 } 1525 }
1354 1526
1355 $cf::MAP{$path} = $map 1527 $cf::MAP{$path} = $map
1356 } 1528 }
1357} 1529}
1530
1531sub pre_load { }
1532sub post_load { }
1358 1533
1359sub load { 1534sub load {
1360 my ($self) = @_; 1535 my ($self) = @_;
1361 1536
1537 local $self->{deny_reset} = 1; # loading can take a long time
1538
1362 my $path = $self->{path}; 1539 my $path = $self->{path};
1540
1541 {
1363 my $guard = cf::lock_acquire "map_load:$path"; 1542 my $guard = cf::lock_acquire "map_load:$path";
1364 1543
1365 return if $self->in_memory != cf::MAP_SWAPPED; 1544 return if $self->in_memory != cf::MAP_SWAPPED;
1366 1545
1367 $self->in_memory (cf::MAP_LOADING); 1546 $self->in_memory (cf::MAP_LOADING);
1368 1547
1369 $self->alloc; 1548 $self->alloc;
1370 $self->_load_objects ($self->{load_path}, 1)
1371 or return;
1372 1549
1373 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1550 $self->pre_load;
1374 if delete $self->{load_original};
1375
1376 if (my $uniq = $self->uniq_path) {
1377 utf8::encode $uniq;
1378 if (aio_open $uniq, O_RDONLY, 0) {
1379 $self->clear_unique_items;
1380 $self->_load_objects ($uniq, 0);
1381 }
1382 }
1383
1384 Coro::cede;
1385
1386 # now do the right thing for maps
1387 $self->link_multipart_objects;
1388
1389 unless ($self->{deny_activate}) {
1390 $self->decay_objects;
1391 $self->fix_auto_apply;
1392 $self->update_buttons;
1393 Coro::cede; 1551 Coro::cede;
1394 $self->set_darkness_map; 1552
1553 $self->_load_objects ($self->{load_path}, 1)
1554 or return;
1555
1556 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1557 if delete $self->{load_original};
1558
1559 if (my $uniq = $self->uniq_path) {
1560 utf8::encode $uniq;
1561 if (aio_open $uniq, O_RDONLY, 0) {
1562 $self->clear_unique_items;
1563 $self->_load_objects ($uniq, 0);
1564 }
1565 }
1566
1567 Coro::cede;
1568 # now do the right thing for maps
1569 $self->link_multipart_objects;
1395 $self->difficulty ($self->estimate_difficulty) 1570 $self->difficulty ($self->estimate_difficulty)
1396 unless $self->difficulty; 1571 unless $self->difficulty;
1397 Coro::cede; 1572 Coro::cede;
1573
1574 unless ($self->{deny_activate}) {
1575 $self->decay_objects;
1576 $self->fix_auto_apply;
1577 $self->update_buttons;
1578 Coro::cede;
1579 $self->set_darkness_map;
1580 Coro::cede;
1398 $self->activate; 1581 $self->activate;
1399 } 1582 }
1400 1583
1401 $self->in_memory (cf::MAP_IN_MEMORY); 1584 $self->in_memory (cf::MAP_IN_MEMORY);
1585 }
1586
1587 $self->post_load;
1402} 1588}
1403 1589
1404sub customise_for { 1590sub customise_for {
1405 my ($self, $ob) = @_; 1591 my ($self, $ob) = @_;
1406 1592
1407 return find "~" . $ob->name . "/" . $self->{path} 1593 return find "~" . $ob->name . "/" . $self->{path}
1408 if $self->per_player; 1594 if $self->per_player;
1595
1596# return find "?party/" . $ob->name . "/" . $self->{path}
1597# if $self->per_party;
1409 1598
1410 $self 1599 $self
1411} 1600}
1412 1601
1413# find and load all maps in the 3x3 area around a map 1602# find and load all maps in the 3x3 area around a map
1469 delete $MAP_PREFETCH{$path}; 1658 delete $MAP_PREFETCH{$path};
1470 } 1659 }
1471 } 1660 }
1472 undef $MAP_PREFETCHER; 1661 undef $MAP_PREFETCHER;
1473 }; 1662 };
1663 $MAP_PREFETCHER->prio (6);
1474 1664
1475 () 1665 ()
1476} 1666}
1477 1667
1478sub save { 1668sub save {
1523 1713
1524sub reset_at { 1714sub reset_at {
1525 my ($self) = @_; 1715 my ($self) = @_;
1526 1716
1527 # TODO: safety, remove and allow resettable per-player maps 1717 # TODO: safety, remove and allow resettable per-player maps
1528 return 1e99 if $self->isa ("ext::map_per_player");#d#
1529 return 1e99 if $self->{deny_reset}; 1718 return 1e99 if $self->{deny_reset};
1530 1719
1531 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1720 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1532 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1721 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1533 1722
1544 my ($self) = @_; 1733 my ($self) = @_;
1545 1734
1546 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1735 my $lock = cf::lock_acquire "map_data:$self->{path}";
1547 1736
1548 return if $self->players; 1737 return if $self->players;
1549 return if $self->isa ("ext::map_per_player");#d#
1550 1738
1551 warn "resetting map ", $self->path;#d# 1739 warn "resetting map ", $self->path;
1740
1741 $self->in_memory (cf::MAP_SWAPPED);
1742
1743 # need to save uniques path
1744 unless ($self->{deny_save}) {
1745 my $uniq = $self->uniq_path; utf8::encode $uniq;
1746
1747 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1748 if $uniq;
1749 }
1552 1750
1553 delete $cf::MAP{$self->path}; 1751 delete $cf::MAP{$self->path};
1554 1752
1555 $self->in_memory (cf::MAP_SWAPPED);
1556 $self->clear; 1753 $self->clear;
1557 1754
1558 $_->clear_links_to ($self) for values %cf::MAP; 1755 $_->clear_links_to ($self) for values %cf::MAP;
1559 1756
1560 $self->unlink_save; 1757 $self->unlink_save;
1587instantiated unique items. May block. 1784instantiated unique items. May block.
1588 1785
1589=cut 1786=cut
1590 1787
1591sub unique_maps() { 1788sub unique_maps() {
1592 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1789 my $files = aio_readdir $UNIQUEDIR
1593 or return; 1790 or return;
1594 1791
1595 my @paths; 1792 my @paths;
1596 1793
1597 for (@$files) { 1794 for (@$files) {
1598 utf8::decode $_; 1795 utf8::decode $_;
1599 next if /\.pst$/; 1796 next if /\.pst$/;
1600 next unless /^$PATH_SEP/o; 1797 next unless /^$PATH_SEP/o;
1601 1798
1602 s/\.map$//; 1799 push @paths, cf::map::normalise $_;
1603 push @paths, $_;
1604 } 1800 }
1605 1801
1606 \@paths 1802 \@paths
1607} 1803}
1608 1804
1702=cut 1898=cut
1703 1899
1704sub link_map { 1900sub link_map {
1705 unless ($LINK_MAP) { 1901 unless ($LINK_MAP) {
1706 $LINK_MAP = cf::map::find "{link}" 1902 $LINK_MAP = cf::map::find "{link}"
1707 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1903 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1708 $LINK_MAP->load; 1904 $LINK_MAP->load;
1709 } 1905 }
1710 1906
1711 $LINK_MAP 1907 $LINK_MAP
1712} 1908}
1717 $self->deactivate_recursive; 1913 $self->deactivate_recursive;
1718 1914
1719 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1915 return if UNIVERSAL::isa $self->map, "ext::map_link";
1720 1916
1721 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1917 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1722 if $self->map; 1918 if $self->map && $self->map->{path} ne "{link}";
1723 1919
1724 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1920 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1725} 1921}
1726 1922
1727sub cf::object::player::leave_link { 1923sub cf::object::player::leave_link {
1728 my ($self, $map, $x, $y) = @_; 1924 my ($self, $map, $x, $y) = @_;
1925
1926 return unless $self->contr->active;
1729 1927
1730 my $link_pos = delete $self->{_link_pos}; 1928 my $link_pos = delete $self->{_link_pos};
1731 1929
1732 unless ($map) { 1930 unless ($map) {
1733 # restore original map position 1931 # restore original map position
1751 $map->load; 1949 $map->load;
1752 $map->load_diag; 1950 $map->load_diag;
1753 1951
1754 return unless $self->contr->active; 1952 return unless $self->contr->active;
1755 $self->activate_recursive; 1953 $self->activate_recursive;
1954
1955 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1756 $self->enter_map ($map, $x, $y); 1956 $self->enter_map ($map, $x, $y);
1757} 1957}
1758 1958
1759cf::player->attach (
1760 on_logout => sub {
1761 my ($pl) = @_;
1762
1763 # abort map switching before logout
1764 if ($pl->ob->{_link_pos}) {
1765 cf::sync_job {
1766 $pl->ob->leave_link
1767 };
1768 }
1769 },
1770 on_login => sub {
1771 my ($pl) = @_;
1772
1773 # try to abort aborted map switching on player login :)
1774 # should happen only on crashes
1775 if ($pl->ob->{_link_pos}) {
1776 $pl->ob->enter_link;
1777 (async {
1778 # we need this sleep as the login has a concurrent enter_exit running
1779 # and this sleep increases chances of the player not ending up in scorn
1780 $pl->ob->reply (undef,
1781 "There was an internal problem at your last logout, "
1782 . "the server will try to bring you to your intended destination in a second.",
1783 cf::NDI_RED);
1784 Coro::Timer::sleep 1;
1785 $pl->ob->leave_link;
1786 })->prio (2);
1787 }
1788 },
1789);
1790
1791=item $player_object->goto ($path, $x, $y) 1959=item $player_object->goto ($path, $x, $y[, $check->($map)])
1792 1960
1961Moves the player to the given map-path and coordinates by first freezing
1962her, loading and preparing them map, calling the provided $check callback
1963that has to return the map if sucecssful, and then unfreezes the player on
1964the new (success) or old (failed) map position.
1965
1793=cut 1966=cut
1967
1968our $GOTOGEN;
1794 1969
1795sub cf::object::player::goto { 1970sub cf::object::player::goto {
1796 my ($self, $path, $x, $y) = @_; 1971 my ($self, $path, $x, $y, $check) = @_;
1972
1973 # do generation counting so two concurrent goto's will be executed in-order
1974 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1797 1975
1798 $self->enter_link; 1976 $self->enter_link;
1799 1977
1800 (async { 1978 (async {
1979 my $map = eval {
1801 my $map = cf::map::find $path; 1980 my $map = cf::map::find $path;
1981
1982 if ($map) {
1802 $map = $map->customise_for ($self) if $map; 1983 $map = $map->customise_for ($self);
1803 1984 $map = $check->($map) if $check && $map;
1804# warn "entering ", $map->path, " at ($x, $y)\n" 1985 } else {
1805# if $map;
1806
1807 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1986 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1987 }
1808 1988
1989 $map
1990 };
1991
1992 if ($@) {
1993 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
1994 LOG llevError | logBacktrace, Carp::longmess $@;
1995 }
1996
1997 if ($gen == $self->{_goto_generation}) {
1998 delete $self->{_goto_generation};
1809 $self->leave_link ($map, $x, $y); 1999 $self->leave_link ($map, $x, $y);
2000 }
1810 })->prio (1); 2001 })->prio (1);
1811} 2002}
1812 2003
1813=item $player_object->enter_exit ($exit_object) 2004=item $player_object->enter_exit ($exit_object)
1814 2005
1843 # that depends on the exit object 2034 # that depends on the exit object
1844 2035
1845 my $rmp = parse_random_map_params $exit->msg; 2036 my $rmp = parse_random_map_params $exit->msg;
1846 2037
1847 if ($exit->map) { 2038 if ($exit->map) {
1848 $rmp->{region} = $exit->map->region_name; 2039 $rmp->{region} = $exit->region->name;
1849 $rmp->{origin_map} = $exit->map->path; 2040 $rmp->{origin_map} = $exit->map->path;
1850 $rmp->{origin_x} = $exit->x; 2041 $rmp->{origin_x} = $exit->x;
1851 $rmp->{origin_y} = $exit->y; 2042 $rmp->{origin_y} = $exit->y;
1852 } 2043 }
1853 2044
1854 $rmp->{random_seed} ||= $exit->random_seed; 2045 $rmp->{random_seed} ||= $exit->random_seed;
1855 2046
1856 my $data = cf::to_json $rmp; 2047 my $data = cf::to_json $rmp;
1857 my $md5 = Digest::MD5::md5_hex $data; 2048 my $md5 = Digest::MD5::md5_hex $data;
1858 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2049 my $meta = "$RANDOMDIR/$md5.meta";
1859 2050
1860 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2051 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1861 aio_write $fh, 0, (length $data), $data, 0; 2052 aio_write $fh, 0, (length $data), $data, 0;
1862 undef $fh; 2053 undef $fh;
1863 aio_rename "$meta~", $meta; 2054 aio_rename "$meta~", $meta;
1870sub cf::object::player::enter_exit { 2061sub cf::object::player::enter_exit {
1871 my ($self, $exit) = @_; 2062 my ($self, $exit) = @_;
1872 2063
1873 return unless $self->type == cf::PLAYER; 2064 return unless $self->type == cf::PLAYER;
1874 2065
2066 if ($exit->slaying eq "/!") {
2067 #TODO: this should de-fi-ni-te-ly not be a sync-job
2068 # the problem is that $exit might not survive long enough
2069 # so it needs to be done right now, right here
2070 cf::sync_job { prepare_random_map $exit };
2071 }
2072
2073 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2074 my $hp = $exit->stats->hp;
2075 my $sp = $exit->stats->sp;
2076
1875 $self->enter_link; 2077 $self->enter_link;
1876 2078
1877 (async { 2079 (async {
1878 $self->deactivate_recursive; # just to be sure 2080 $self->deactivate_recursive; # just to be sure
1879 unless (eval { 2081 unless (eval {
1880 prepare_random_map $exit 2082 $self->goto ($slaying, $hp, $sp);
1881 if $exit->slaying eq "/!";
1882
1883 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1884 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1885 2083
1886 1; 2084 1;
1887 }) { 2085 }) {
1888 $self->message ("Something went wrong deep within the crossfire server. " 2086 $self->message ("Something went wrong deep within the crossfire server. "
1889 . "I'll try to bring you back to the map you were before. " 2087 . "I'll try to bring you back to the map you were before. "
1890 . "Please report this to the dungeon master!", 2088 . "Please report this to the dungeon master!",
1891 cf::NDI_UNIQUE | cf::NDI_RED); 2089 cf::NDI_UNIQUE | cf::NDI_RED);
1892 2090
1893 warn "ERROR in enter_exit: $@"; 2091 warn "ERROR in enter_exit: $@";
1894 $self->leave_link; 2092 $self->leave_link;
1895 } 2093 }
1896 })->prio (1); 2094 })->prio (1);
1909 2107
1910sub cf::client::send_drawinfo { 2108sub cf::client::send_drawinfo {
1911 my ($self, $text, $flags) = @_; 2109 my ($self, $text, $flags) = @_;
1912 2110
1913 utf8::encode $text; 2111 utf8::encode $text;
1914 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2112 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1915} 2113}
1916 2114
2115=item $client->ext_event ($type, %msg)
2116
2117Sends an exti event to the client.
2118
2119=cut
2120
2121sub cf::client::ext_event($$%) {
2122 my ($self, $type, %msg) = @_;
2123
2124 $msg{msgtype} = "event_$type";
2125 $self->send_packet ("ext " . cf::to_json \%msg);
2126}
1917 2127
1918=item $success = $client->query ($flags, "text", \&cb) 2128=item $success = $client->query ($flags, "text", \&cb)
1919 2129
1920Queues a query to the client, calling the given callback with 2130Queues a query to the client, calling the given callback with
1921the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2131the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1950 # get handled first 2160 # get handled first
1951 my $queue = delete $ns->{query_queue} 2161 my $queue = delete $ns->{query_queue}
1952 or return; # be conservative, not sure how that can happen, but we saw a crash here 2162 or return; # be conservative, not sure how that can happen, but we saw a crash here
1953 2163
1954 (shift @$queue)->[1]->($msg); 2164 (shift @$queue)->[1]->($msg);
2165 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1955 2166
1956 push @{ $ns->{query_queue} }, @$queue; 2167 push @{ $ns->{query_queue} }, @$queue;
1957 2168
1958 if (@{ $ns->{query_queue} } == @$queue) { 2169 if (@{ $ns->{query_queue} } == @$queue) {
1959 if (@$queue) { 2170 if (@$queue) {
2017 2228
2018# here we export the classes and methods available to script code 2229# here we export the classes and methods available to script code
2019 2230
2020=pod 2231=pod
2021 2232
2022The following fucntions and emthods are available within a safe environment: 2233The following functions and methods are available within a safe environment:
2023 2234
2024 cf::object contr pay_amount pay_player map 2235 cf::object contr pay_amount pay_player map
2025 cf::object::player player 2236 cf::object::player player
2026 cf::player peaceful 2237 cf::player peaceful
2027 cf::map trigger 2238 cf::map trigger
2112############################################################################# 2323#############################################################################
2113 2324
2114=head2 EXTENSION DATABASE SUPPORT 2325=head2 EXTENSION DATABASE SUPPORT
2115 2326
2116Crossfire maintains a very simple database for extension use. It can 2327Crossfire maintains a very simple database for extension use. It can
2117currently store anything that can be serialised using Storable, which 2328currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2118excludes objects. 2329convert to/from binary).
2119 2330
2120The parameter C<$family> should best start with the name of the extension 2331The parameter C<$family> should best start with the name of the extension
2121using it, it should be unique. 2332using it, it should be unique.
2122 2333
2123=over 4 2334=over 4
2124 2335
2125=item $hashref = cf::db_get $family
2126
2127Return a hashref for use by the extension C<$family>, which can be
2128modified. After modifications, you have to call C<cf::db_dirty> or
2129C<cf::db_sync>.
2130
2131=item $value = cf::db_get $family => $key 2336=item $value = cf::db_get $family => $key
2132 2337
2133Returns a single value from the database 2338Returns a single value from the database.
2134
2135=item cf::db_put $family => $hashref
2136
2137Stores the given family hashref into the database. Updates are delayed, if
2138you want the data to be synced to disk immediately, use C<cf::db_sync>.
2139 2339
2140=item cf::db_put $family => $key => $value 2340=item cf::db_put $family => $key => $value
2141 2341
2142Stores the given C<$value> in the family hash. Updates are delayed, if you 2342Stores the given C<$value> in the family.
2143want the data to be synced to disk immediately, use C<cf::db_sync>.
2144
2145=item cf::db_dirty
2146
2147Marks the database as dirty, to be updated at a later time.
2148
2149=item cf::db_sync
2150
2151Immediately write the database to disk I<if it is dirty>.
2152 2343
2153=cut 2344=cut
2154 2345
2155our $DB; 2346our $DB;
2156 2347
2157{ 2348sub db_init {
2158 my $path = cf::localdir . "/database.pst"; 2349 unless ($DB) {
2350 $DB = BDB::db_create $DB_ENV;
2159 2351
2160 sub db_load() { 2352 cf::sync_job {
2161 $DB = stat $path ? Storable::retrieve $path : { }; 2353 eval {
2162 } 2354 $DB->set_flags (BDB::CHKSUM);
2163 2355
2164 my $pid; 2356 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2165 2357 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2166 sub db_save() { 2358 cf::cleanup "db_open(db): $!" if $!;
2167 waitpid $pid, 0 if $pid; 2359 };
2168 if (0 == ($pid = fork)) { 2360 cf::cleanup "db_open(db): $@" if $@;
2169 $DB->{_meta}{version} = 1;
2170 Storable::nstore $DB, "$path~";
2171 rename "$path~", $path;
2172 cf::_exit 0 if defined $pid;
2173 } 2361 };
2174 }
2175
2176 my $dirty;
2177
2178 sub db_sync() {
2179 db_save if $dirty;
2180 undef $dirty;
2181 }
2182
2183 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2184 db_sync;
2185 }); 2362 }
2363}
2186 2364
2187 sub db_dirty() {
2188 $dirty = 1;
2189 $idle->start;
2190 }
2191
2192 sub db_get($;$) { 2365sub db_get($$) {
2193 @_ >= 2 2366 my $key = "$_[0]/$_[1]";
2194 ? $DB->{$_[0]}{$_[1]}
2195 : ($DB->{$_[0]} ||= { })
2196 }
2197 2367
2368 cf::sync_job {
2369 BDB::db_get $DB, undef, $key, my $data;
2370
2371 $! ? ()
2372 : $data
2373 }
2374}
2375
2198 sub db_put($$;$) { 2376sub db_put($$$) {
2199 if (@_ >= 3) { 2377 BDB::dbreq_pri 4;
2200 $DB->{$_[0]}{$_[1]} = $_[2]; 2378 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2201 } else { 2379}
2202 $DB->{$_[0]} = $_[1];
2203 }
2204 db_dirty;
2205 }
2206 2380
2207 cf::global->attach ( 2381=item cf::cache $id => [$paths...], $processversion => $process
2208 prio => 10000, 2382
2209 on_cleanup => sub { 2383Generic caching function that returns the value of the resource $id,
2210 db_sync; 2384caching and regenerating as required.
2385
2386This function can block.
2387
2388=cut
2389
2390sub cache {
2391 my ($id, $src, $processversion, $process) = @_;
2392
2393 my $meta =
2394 join "\x00",
2395 $processversion,
2396 map {
2397 aio_stat $_
2398 and Carp::croak "$_: $!";
2399
2400 ($_, (stat _)[7,9])
2401 } @$src;
2402
2403 my $dbmeta = db_get cache => "$id/meta";
2404 if ($dbmeta ne $meta) {
2405 # changed, we may need to process
2406
2407 my @data;
2408 my $md5;
2409
2410 for (0 .. $#$src) {
2411 0 <= aio_load $src->[$_], $data[$_]
2412 or Carp::croak "$src->[$_]: $!";
2211 }, 2413 }
2212 ); 2414
2415 # if processing is expensive, check
2416 # checksum first
2417 if (1) {
2418 $md5 =
2419 join "\x00",
2420 $processversion,
2421 map {
2422 Coro::cede;
2423 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2424 } 0.. $#$src;
2425
2426
2427 my $dbmd5 = db_get cache => "$id/md5";
2428 if ($dbmd5 eq $md5) {
2429 db_put cache => "$id/meta", $meta;
2430
2431 return db_get cache => "$id/data";
2432 }
2433 }
2434
2435 my $t1 = Time::HiRes::time;
2436 my $data = $process->(\@data);
2437 my $t2 = Time::HiRes::time;
2438
2439 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2440
2441 db_put cache => "$id/data", $data;
2442 db_put cache => "$id/md5" , $md5;
2443 db_put cache => "$id/meta", $meta;
2444
2445 return $data;
2446 }
2447
2448 db_get cache => "$id/data"
2449}
2450
2451=item fork_call { }, $args
2452
2453Executes the given code block with the given arguments in a seperate
2454process, returning the results. Everything must be serialisable with
2455Coro::Storable. May, of course, block. Note that the executed sub may
2456never block itself or use any form of Event handling.
2457
2458=cut
2459
2460sub fork_call(&@) {
2461 my ($cb, @args) = @_;
2462
2463# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2464# or die "socketpair: $!";
2465 pipe my $fh1, my $fh2
2466 or die "pipe: $!";
2467
2468 if (my $pid = fork) {
2469 close $fh2;
2470
2471 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2472 $res = Coro::Storable::thaw $res;
2473
2474 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2475
2476 die $$res unless "ARRAY" eq ref $res;
2477
2478 return wantarray ? @$res : $res->[-1];
2479 } else {
2480 reset_signals;
2481 local $SIG{__WARN__};
2482 local $SIG{__DIE__};
2483 eval {
2484 close $fh1;
2485
2486 my @res = eval { $cb->(@args) };
2487 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2488 };
2489
2490 warn $@ if $@;
2491 _exit 0;
2492 }
2213} 2493}
2214 2494
2215############################################################################# 2495#############################################################################
2216# the server's main() 2496# the server's init and main functions
2497
2498sub load_facedata($) {
2499 my ($path) = @_;
2500
2501 warn "loading facedata from $path\n";
2502
2503 my $facedata;
2504 0 < aio_load $path, $facedata
2505 or die "$path: $!";
2506
2507 $facedata = Coro::Storable::thaw $facedata;
2508
2509 $facedata->{version} == 2
2510 or cf::cleanup "$path: version mismatch, cannot proceed.";
2511
2512 {
2513 my $faces = $facedata->{faceinfo};
2514
2515 while (my ($face, $info) = each %$faces) {
2516 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2517 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2518 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2519 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2520 Coro::cede;
2521 }
2522
2523 while (my ($face, $info) = each %$faces) {
2524 next unless $info->{smooth};
2525 my $idx = cf::face::find $face
2526 or next;
2527 if (my $smooth = cf::face::find $info->{smooth}) {
2528 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2529 } else {
2530 warn "smooth face '$info->{smooth}' not found for face '$face'";
2531 }
2532 Coro::cede;
2533 }
2534 }
2535
2536 {
2537 my $anims = $facedata->{animinfo};
2538
2539 while (my ($anim, $info) = each %$anims) {
2540 cf::anim::set $anim, $info->{frames}, $info->{facings};
2541 Coro::cede;
2542 }
2543
2544 cf::anim::invalidate_all; # d'oh
2545 }
2546
2547 1
2548}
2549
2550sub reload_regions {
2551 load_resource_file "$MAPDIR/regions"
2552 or die "unable to load regions file\n";
2553}
2554
2555sub reload_facedata {
2556 load_facedata "$DATADIR/facedata"
2557 or die "unable to load facedata\n";
2558}
2559
2560sub reload_archetypes {
2561 load_resource_file "$DATADIR/archetypes"
2562 or die "unable to load archetypes\n";
2563}
2564
2565sub reload_treasures {
2566 load_resource_file "$DATADIR/treasures"
2567 or die "unable to load treasurelists\n";
2568}
2569
2570sub reload_resources {
2571 warn "reloading resource files...\n";
2572
2573 reload_regions;
2574 reload_facedata;
2575 #reload_archetypes;#d#
2576 reload_archetypes;
2577 reload_treasures;
2578
2579 warn "finished reloading resource files\n";
2580}
2581
2582sub init {
2583 reload_resources;
2584}
2217 2585
2218sub cfg_load { 2586sub cfg_load {
2219 open my $fh, "<:utf8", cf::confdir . "/config" 2587 open my $fh, "<:utf8", "$CONFDIR/config"
2220 or return; 2588 or return;
2221 2589
2222 local $/; 2590 local $/;
2223 *CFG = YAML::Syck::Load <$fh>; 2591 *CFG = YAML::Syck::Load <$fh>;
2224 2592
2244 Event::one_event; 2612 Event::one_event;
2245 })->prio (Coro::PRIO_MAX); 2613 })->prio (Coro::PRIO_MAX);
2246 }; 2614 };
2247 2615
2248 cfg_load; 2616 cfg_load;
2249 db_load; 2617 db_init;
2250 load_extensions; 2618 load_extensions;
2251 2619
2252 $TICK_WATCHER->start; 2620 $TICK_WATCHER->start;
2253 Event::loop; 2621 Event::loop;
2254} 2622}
2258 2626
2259# install some emergency cleanup handlers 2627# install some emergency cleanup handlers
2260BEGIN { 2628BEGIN {
2261 for my $signal (qw(INT HUP TERM)) { 2629 for my $signal (qw(INT HUP TERM)) {
2262 Event->signal ( 2630 Event->signal (
2631 reentrant => 0,
2263 data => WF_AUTOCANCEL, 2632 data => WF_AUTOCANCEL,
2264 signal => $signal, 2633 signal => $signal,
2634 prio => 0,
2265 cb => sub { 2635 cb => sub {
2266 cf::cleanup "SIG$signal"; 2636 cf::cleanup "SIG$signal";
2267 }, 2637 },
2268 ); 2638 );
2269 } 2639 }
2270} 2640}
2291 my $map = $cf::MAP{$path} or next; 2661 my $map = $cf::MAP{$path} or next;
2292 $map->valid or next; 2662 $map->valid or next;
2293 $map->save; 2663 $map->save;
2294 } 2664 }
2295 warn "end emergency map save\n"; 2665 warn "end emergency map save\n";
2666
2667 warn "begin emergency database checkpoint\n";
2668 BDB::db_env_txn_checkpoint $DB_ENV;
2669 warn "end emergency database checkpoint\n";
2296 }; 2670 };
2297 2671
2298 warn "leave emergency perl save\n"; 2672 warn "leave emergency perl save\n";
2299} 2673}
2300 2674
2675sub post_cleanup {
2676 my ($make_core) = @_;
2677
2678 warn Carp::longmess "post_cleanup backtrace"
2679 if $make_core;
2680}
2681
2301sub reload() { 2682sub do_reload_perl() {
2302 # can/must only be called in main 2683 # can/must only be called in main
2303 if ($Coro::current != $Coro::main) { 2684 if ($Coro::current != $Coro::main) {
2304 warn "can only reload from main coroutine"; 2685 warn "can only reload from main coroutine";
2305 return; 2686 return;
2306 } 2687 }
2307 2688
2308 warn "reloading..."; 2689 warn "reloading...";
2309 2690
2310 warn "cancelling server ticker"; 2691 warn "entering sync_job";
2311 $TICK_WATCHER->cancel;
2312 2692
2693 cf::sync_job {
2694 cf::write_runtime; # external watchdog should not bark
2313 cf::emergency_save; 2695 cf::emergency_save;
2696 cf::write_runtime; # external watchdog should not bark
2314 2697
2315 eval { 2698 warn "syncing database to disk";
2699 BDB::db_env_txn_checkpoint $DB_ENV;
2700
2316 # if anything goes wrong in here, we should simply crash as we already saved 2701 # if anything goes wrong in here, we should simply crash as we already saved
2317
2318 warn "syncing database to disk";
2319 cf::db_sync;
2320 2702
2321 warn "cancelling all WF_AUTOCANCEL watchers"; 2703 warn "cancelling all WF_AUTOCANCEL watchers";
2322 for (Event::all_watchers) { 2704 for (Event::all_watchers) {
2323 $_->cancel if $_->data & WF_AUTOCANCEL; 2705 $_->cancel if $_->data & WF_AUTOCANCEL;
2324 } 2706 }
2325 2707
2326 warn "flushing outstanding aio requests"; 2708 warn "flushing outstanding aio requests";
2327 for (;;) { 2709 for (;;) {
2710 BDB::flush;
2328 IO::AIO::flush; 2711 IO::AIO::flush;
2329 Coro::cede; 2712 Coro::cede;
2330 last unless IO::AIO::nreqs; 2713 last unless IO::AIO::nreqs || BDB::nreqs;
2331 warn "iterate..."; 2714 warn "iterate...";
2332 } 2715 }
2716
2717 ++$RELOAD;
2333 2718
2334 warn "cancelling all extension coros"; 2719 warn "cancelling all extension coros";
2335 $_->cancel for values %EXT_CORO; 2720 $_->cancel for values %EXT_CORO;
2336 %EXT_CORO = (); 2721 %EXT_CORO = ();
2337 2722
2377 Symbol::delete_package "safe::$_" 2762 Symbol::delete_package "safe::$_"
2378 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2763 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2379 2764
2380 warn "unloading cf.pm \"a bit\""; 2765 warn "unloading cf.pm \"a bit\"";
2381 delete $INC{"cf.pm"}; 2766 delete $INC{"cf.pm"};
2767 delete $INC{"cf/pod.pm"};
2382 2768
2383 # don't, removes xs symbols, too, 2769 # don't, removes xs symbols, too,
2384 # and global variables created in xs 2770 # and global variables created in xs
2385 #Symbol::delete_package __PACKAGE__; 2771 #Symbol::delete_package __PACKAGE__;
2386 2772
2390 require cf; 2776 require cf;
2391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2777 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2392 2778
2393 warn "loading config and database again"; 2779 warn "loading config and database again";
2394 cf::cfg_load; 2780 cf::cfg_load;
2395 cf::db_load;
2396 2781
2397 warn "loading extensions"; 2782 warn "loading extensions";
2398 cf::load_extensions; 2783 cf::load_extensions;
2399 2784
2400 warn "reattaching attachments to objects/players"; 2785 warn "reattaching attachments to objects/players";
2401 _global_reattach; 2786 _global_reattach; # objects, sockets
2402 warn "reattaching attachments to maps"; 2787 warn "reattaching attachments to maps";
2403 reattach $_ for values %MAP; 2788 reattach $_ for values %MAP;
2789 warn "reattaching attachments to players";
2790 reattach $_ for values %PLAYER;
2404 2791
2405 warn "restarting server ticker"; 2792 warn "leaving sync_job";
2406 2793
2407 $TICK_WATCHER->start; 2794 1
2408 }; 2795 } or do {
2409
2410 if ($@) {
2411 warn $@; 2796 warn $@;
2412 warn "error while reloading, exiting."; 2797 warn "error while reloading, exiting.";
2413 exit 1; 2798 exit 1;
2414 } 2799 };
2415 2800
2416 warn "reloaded"; 2801 warn "reloaded";
2417}; 2802};
2418 2803
2419our $RELOAD_WATCHER; # used only during reload 2804our $RELOAD_WATCHER; # used only during reload
2420 2805
2806sub reload_perl() {
2807 # doing reload synchronously and two reloads happen back-to-back,
2808 # coro crashes during coro_state_free->destroy here.
2809
2810 $RELOAD_WATCHER ||= Event->timer (
2811 reentrant => 0,
2812 after => 0,
2813 data => WF_AUTOCANCEL,
2814 cb => sub {
2815 do_reload_perl;
2816 undef $RELOAD_WATCHER;
2817 },
2818 );
2819}
2820
2421register_command "reload" => sub { 2821register_command "reload" => sub {
2422 my ($who, $arg) = @_; 2822 my ($who, $arg) = @_;
2423 2823
2424 if ($who->flag (FLAG_WIZ)) { 2824 if ($who->flag (FLAG_WIZ)) {
2425 $who->message ("reloading server."); 2825 $who->message ("reloading server.");
2426 2826 async { reload_perl };
2427 # doing reload synchronously and two reloads happen back-to-back,
2428 # coro crashes during coro_state_free->destroy here.
2429
2430 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2431 reload;
2432 undef $RELOAD_WATCHER;
2433 });
2434 } 2827 }
2435}; 2828};
2436 2829
2437unshift @INC, $LIBDIR; 2830unshift @INC, $LIBDIR;
2438 2831
2439my $bug_warning = 0; 2832my $bug_warning = 0;
2440 2833
2834our @WAIT_FOR_TICK;
2835our @WAIT_FOR_TICK_BEGIN;
2836
2837sub wait_for_tick {
2838 return unless $TICK_WATCHER->is_active;
2839 return if $Coro::current == $Coro::main;
2840
2841 my $signal = new Coro::Signal;
2842 push @WAIT_FOR_TICK, $signal;
2843 $signal->wait;
2844}
2845
2846sub wait_for_tick_begin {
2847 return unless $TICK_WATCHER->is_active;
2848 return if $Coro::current == $Coro::main;
2849
2850 my $signal = new Coro::Signal;
2851 push @WAIT_FOR_TICK_BEGIN, $signal;
2852 $signal->wait;
2853}
2854
2855 my $min = 1e6;#d#
2856 my $avg = 10;
2441$TICK_WATCHER = Event->timer ( 2857$TICK_WATCHER = Event->timer (
2442 reentrant => 0, 2858 reentrant => 0,
2443 parked => 1, 2859 parked => 1,
2444 prio => 0, 2860 prio => 0,
2445 at => $NEXT_TICK || $TICK, 2861 at => $NEXT_TICK || $TICK,
2449 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2865 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2450 unless ++$bug_warning > 10; 2866 unless ++$bug_warning > 10;
2451 return; 2867 return;
2452 } 2868 }
2453 2869
2454 $NOW = Event::time; 2870 $NOW = $tick_start = Event::time;
2455 2871
2456 cf::server_tick; # one server iteration 2872 cf::server_tick; # one server iteration
2873
2874 0 && sync_job {#d#
2875 for(1..10) {
2876 my $t = Event::time;
2877 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2878 or die;
2879
2880 $map->width (50);
2881 $map->height (50);
2882 $map->alloc;
2883 $map->_load_objects ("/tmp/x.map", 1);
2884 my $t = Event::time - $t;
2885
2886 #next unless $t < 0.0013;#d#
2887 if ($t < $min) {
2888 $min = $t;
2889 }
2890 $avg = $avg * 0.99 + $t * 0.01;
2891 }
2892 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2893 exit 0;
2894 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2895 };
2896
2457 $RUNTIME += $TICK; 2897 $RUNTIME += $TICK;
2458 $NEXT_TICK += $TICK; 2898 $NEXT_TICK += $TICK;
2459 2899
2460 $WAIT_FOR_TICK->broadcast; 2900 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2461 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2901 $NEXT_RUNTIME_WRITE = $NOW + 10;
2902 Coro::async_pool {
2903 write_runtime
2904 or warn "ERROR: unable to write runtime file: $!";
2905 };
2906 }
2907
2908# my $AFTER = Event::time;
2909# warn $AFTER - $NOW;#d#
2910
2911 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2912 $sig->send;
2913 }
2914 while (my $sig = shift @WAIT_FOR_TICK) {
2915 $sig->send;
2916 }
2917
2918 $NOW = Event::time;
2462 2919
2463 # if we are delayed by four ticks or more, skip them all 2920 # if we are delayed by four ticks or more, skip them all
2464 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2921 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2465 2922
2466 $TICK_WATCHER->at ($NEXT_TICK); 2923 $TICK_WATCHER->at ($NEXT_TICK);
2467 $TICK_WATCHER->start; 2924 $TICK_WATCHER->start;
2925
2926 $LOAD = ($NOW - $tick_start) / $TICK;
2927 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2928
2929 _post_tick;
2930
2931
2468 }, 2932 },
2469); 2933);
2470 2934
2935{
2936 BDB::max_poll_time $TICK * 0.1;
2937 $BDB_POLL_WATCHER = Event->io (
2938 reentrant => 0,
2939 fd => BDB::poll_fileno,
2940 poll => 'r',
2941 prio => 0,
2942 data => WF_AUTOCANCEL,
2943 cb => \&BDB::poll_cb,
2944 );
2945 BDB::min_parallel 8;
2946
2947 BDB::set_sync_prepare {
2948 my $status;
2949 my $current = $Coro::current;
2950 (
2951 sub {
2952 $status = $!;
2953 $current->ready; undef $current;
2954 },
2955 sub {
2956 Coro::schedule while defined $current;
2957 $! = $status;
2958 },
2959 )
2960 };
2961
2962 unless ($DB_ENV) {
2963 $DB_ENV = BDB::db_env_create;
2964
2965 cf::sync_job {
2966 eval {
2967 BDB::db_env_open
2968 $DB_ENV,
2969 $BDBDIR,
2970 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2971 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2972 0666;
2973
2974 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2975
2976 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2977 $DB_ENV->set_lk_detect;
2978 };
2979
2980 cf::cleanup "db_env_open(db): $@" if $@;
2981 };
2982 }
2983}
2984
2985{
2986 IO::AIO::min_parallel 8;
2987
2988 undef $Coro::AIO::WATCHER;
2471IO::AIO::max_poll_time $TICK * 0.2; 2989 IO::AIO::max_poll_time $TICK * 0.1;
2472
2473$AIO_POLL_WATCHER = Event->io ( 2990 $AIO_POLL_WATCHER = Event->io (
2474 fd => IO::AIO::poll_fileno, 2991 reentrant => 0,
2475 poll => 'r',
2476 prio => 5,
2477 data => WF_AUTOCANCEL,
2478 cb => \&IO::AIO::poll_cb,
2479);
2480
2481$WRITE_RUNTIME_WATCHER = Event->timer (
2482 data => WF_AUTOCANCEL, 2992 data => WF_AUTOCANCEL,
2483 after => 1, 2993 fd => IO::AIO::poll_fileno,
2484 interval => 10, 2994 poll => 'r',
2485 prio => 6, # keep it lowest so it acts like a watchdog 2995 prio => 6,
2486 cb => Coro::unblock_sub { 2996 cb => \&IO::AIO::poll_cb,
2487 write_runtime 2997 );
2488 or warn "ERROR: unable to write runtime file: $!"; 2998}
2999
3000my $_log_backtrace;
3001
3002sub _log_backtrace {
3003 my ($msg, @addr) = @_;
3004
3005 $msg =~ s/\n//;
3006
3007 # limit the # of concurrent backtraces
3008 if ($_log_backtrace < 2) {
3009 ++$_log_backtrace;
3010 async {
3011 my @bt = fork_call {
3012 @addr = map { sprintf "%x", $_ } @addr;
3013 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3014 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3015 or die "addr2line: $!";
3016
3017 my @funcs;
3018 my @res = <$fh>;
3019 chomp for @res;
3020 while (@res) {
3021 my ($func, $line) = splice @res, 0, 2, ();
3022 push @funcs, "[$func] $line";
3023 }
3024
3025 @funcs
3026 };
3027
3028 LOG llevInfo, "[ABT] $msg\n";
3029 LOG llevInfo, "[ABT] $_\n" for @bt;
3030 --$_log_backtrace;
3031 };
3032 } else {
3033 LOG llevInfo, "[ABT] $msg\n";
3034 LOG llevInfo, "[ABT] [suppressed]\n";
2489 }, 3035 }
2490); 3036}
3037
3038# load additional modules
3039use cf::pod;
2491 3040
2492END { cf::emergency_save } 3041END { cf::emergency_save }
2493 3042
24941 30431
2495 3044

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines