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.234 by root, Thu Apr 5 13:44:31 2007 UTC vs.
Revision 1.295 by root, Wed Jul 4 05:08:15 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;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.52 (); 15use Coro 3.61 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
21 24
25use JSON::XS 1.4 ();
22use BDB (); 26use BDB ();
23use Data::Dumper; 27use Data::Dumper;
24use Digest::MD5; 28use Digest::MD5;
25use Fcntl; 29use Fcntl;
26use YAML::Syck (); 30use YAML::Syck ();
28use Time::HiRes; 32use Time::HiRes;
29use Compress::LZF; 33use Compress::LZF;
30 34
31# configure various modules to our taste 35# configure various modules to our taste
32# 36#
37$Storable::canonical = 1; # reduce rsync transfers
33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 39Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35 40
36$Event::Eval = 1; # no idea why this is required, but it is 41$Event::Eval = 1; # no idea why this is required, but it is
37 42
45our %COMMAND = (); 50our %COMMAND = ();
46our %COMMAND_TIME = (); 51our %COMMAND_TIME = ();
47 52
48our @EXTS = (); # list of extension package names 53our @EXTS = (); # list of extension package names
49our %EXTCMD = (); 54our %EXTCMD = ();
55our %EXTICMD = ();
50our %EXT_CORO = (); # coroutines bound to extensions 56our %EXT_CORO = (); # coroutines bound to extensions
51our %EXT_MAP = (); # pluggable maps 57our %EXT_MAP = (); # pluggable maps
52 58
53our $RELOAD; # number of reloads so far 59our $RELOAD; # number of reloads so far
54our @EVENT; 60our @EVENT;
55our $LIBDIR = datadir . "/ext";
56 61
57our $TICK = MAX_TIME * 1e-6; 62our $CONFDIR = confdir;
63our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db";
73
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
58our $TICK_WATCHER; 75our $TICK_WATCHER;
59our $AIO_POLL_WATCHER; 76our $AIO_POLL_WATCHER;
60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
61our $NEXT_TICK; 78our $NEXT_TICK;
62our $NOW; 79our $NOW;
71our $RUNTIME; 88our $RUNTIME;
72 89
73our %PLAYER; # all users 90our %PLAYER; # all users
74our %MAP; # all maps 91our %MAP; # all maps
75our $LINK_MAP; # the special {link} map, which is always available 92our $LINK_MAP; # the special {link} map, which is always available
76our $RANDOM_MAPS = cf::localdir . "/random";
77our $BDB_ENV_DIR = cf::localdir . "/db";
78
79our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
80our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
81 93
82# used to convert map paths into valid unix filenames by replacing / by ∕ 94# used to convert map paths into valid unix filenames by replacing / by ∕
83our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
84 96
97our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing
99our $tick_start; # for load detecting purposes
100
85binmode STDOUT; 101binmode STDOUT;
86binmode STDERR; 102binmode STDERR;
87 103
88# read virtual server time, if available 104# read virtual server time, if available
89unless ($RUNTIME || !-e cf::localdir . "/runtime") { 105unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
90 open my $fh, "<", cf::localdir . "/runtime" 106 open my $fh, "<", "$LOCALDIR/runtime"
91 or die "unable to read runtime file: $!"; 107 or die "unable to read runtime file: $!";
92 $RUNTIME = <$fh> + 0.; 108 $RUNTIME = <$fh> + 0.;
93} 109}
94 110
95mkdir cf::localdir; 111mkdir $_
96mkdir cf::localdir . "/" . cf::playerdir; 112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
97mkdir cf::localdir . "/" . cf::tmpdir;
98mkdir cf::localdir . "/" . cf::uniquedir;
99mkdir $RANDOM_MAPS;
100mkdir $BDB_ENV_DIR;
101 113
102our $EMERGENCY_POSITION; 114our $EMERGENCY_POSITION;
103 115
104sub cf::map::normalise; 116sub cf::map::normalise;
105 117
116=item $cf::RUNTIME 128=item $cf::RUNTIME
117 129
118The time this server has run, starts at 0 and is increased by $cf::TICK on 130The time this server has run, starts at 0 and is increased by $cf::TICK on
119every server tick. 131every server tick.
120 132
121=item $cf::LIBDIR 133=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
134$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
135$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
122 136
123The perl library directory, where extensions and cf-specific modules can 137Various directories - "/etc", read-only install directory, perl-library
124be found. It will be added to C<@INC> automatically. 138directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
139unique-items directory, player file directory, random maps directory and
140database environment.
125 141
126=item $cf::NOW 142=item $cf::NOW
127 143
128The time of the last (current) server tick. 144The time of the last (current) server tick.
129 145
130=item $cf::TICK 146=item $cf::TICK
131 147
132The interval between server ticks, in seconds. 148The interval between server ticks, in seconds.
149
150=item $cf::LOADAVG
151
152The current CPU load on the server (alpha-smoothed), as a value between 0
153(none) and 1 (overloaded), indicating how much time is spent on processing
154objects per tick. Healthy values are < 0.5.
155
156=item $cf::LOAD
157
158The raw value load value from the last tick.
133 159
134=item %cf::CFG 160=item %cf::CFG
135 161
136Configuration for the server, loaded from C</etc/crossfire/config>, or 162Configuration for the server, loaded from C</etc/crossfire/config>, or
137from wherever your confdir points to. 163from wherever your confdir points to.
138 164
139=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 165=item cf::wait_for_tick, cf::wait_for_tick_begin
140 166
141These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
142or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 168returns directly I<after> the tick processing (and consequently, can only wake one process
143processing has been done. Call C<< ->wait >> on them to maximise the 169per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
144window of cpu time available, or simply to synchronise to the server tick.
145 170
146=back 171=back
147 172
148=cut 173=cut
149 174
150BEGIN { 175BEGIN {
151 *CORE::GLOBAL::warn = sub { 176 *CORE::GLOBAL::warn = sub {
152 my $msg = join "", @_; 177 my $msg = join "", @_;
153 utf8::encode $msg;
154 178
155 $msg .= "\n" 179 $msg .= "\n"
156 unless $msg =~ /\n$/; 180 unless $msg =~ /\n$/;
157 181
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183
184 utf8::encode $msg;
158 LOG llevError, $msg; 185 LOG llevError, $msg;
159 }; 186 };
160} 187}
161 188
162@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
163@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
164@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
165@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
166@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 193@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
194@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
167@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 195@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
168 196
169# we bless all objects into (empty) derived classes to force a method lookup 197# we bless all objects into (empty) derived classes to force a method lookup
170# within the Safe compartment. 198# within the Safe compartment.
171for my $pkg (qw( 199for my $pkg (qw(
172 cf::global cf::attachable 200 cf::global cf::attachable
180} 208}
181 209
182$Event::DIED = sub { 210$Event::DIED = sub {
183 warn "error in event callback: @_"; 211 warn "error in event callback: @_";
184}; 212};
213
214#############################################################################
185 215
186=head2 UTILITY FUNCTIONS 216=head2 UTILITY FUNCTIONS
187 217
188=over 4 218=over 4
189 219
208 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
209 $d 239 $d
210 } || "[unable to dump $_[0]: '$@']"; 240 } || "[unable to dump $_[0]: '$@']";
211} 241}
212 242
213use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
214
215=item $ref = cf::from_json $json 243=item $ref = cf::from_json $json
216 244
217Converts a JSON string into the corresponding perl data structure. 245Converts a JSON string into the corresponding perl data structure.
218 246
219=item $json = cf::to_json $ref 247=item $json = cf::to_json $ref
220 248
221Converts a perl data structure into its JSON representation. 249Converts a perl data structure into its JSON representation.
250
251=cut
252
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254
255sub to_json ($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) }
222 257
223=item cf::lock_wait $string 258=item cf::lock_wait $string
224 259
225Wait until the given lock is available. See cf::lock_acquire. 260Wait until the given lock is available. See cf::lock_acquire.
226 261
232returned. 267returned.
233 268
234Lock names should begin with a unique identifier (for example, cf::map::find 269Lock names should begin with a unique identifier (for example, cf::map::find
235uses map_find and cf::map::load uses map_load). 270uses map_find and cf::map::load uses map_load).
236 271
272=item $locked = cf::lock_active $string
273
274Return true if the lock is currently active, i.e. somebody has locked it.
275
237=cut 276=cut
238 277
239our %LOCK; 278our %LOCK;
240 279
241sub lock_wait($) { 280sub lock_wait($) {
258 297
259 Coro::guard { 298 Coro::guard {
260 # wake up all waiters, to be on the safe side 299 # wake up all waiters, to be on the safe side
261 $_->ready for @{ delete $LOCK{$key} }; 300 $_->ready for @{ delete $LOCK{$key} };
262 } 301 }
302}
303
304sub lock_active($) {
305 my ($key) = @_;
306
307 ! ! $LOCK{$key}
263} 308}
264 309
265sub freeze_mainloop { 310sub freeze_mainloop {
266 return unless $TICK_WATCHER->is_active; 311 return unless $TICK_WATCHER->is_active;
267 312
282 327
283BEGIN { *async = \&Coro::async_pool } 328BEGIN { *async = \&Coro::async_pool }
284 329
285=item cf::sync_job { BLOCK } 330=item cf::sync_job { BLOCK }
286 331
287The design of crossfire+ requires that the main coro ($Coro::main) is 332The design of Crossfire TRT requires that the main coroutine ($Coro::main)
288always able to handle events or runnable, as crossfire+ is only partly 333is always able to handle events or runnable, as Crossfire TRT is only
289reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable.
290 336
291If it must be done, put the blocking parts into C<sync_job>. This will run 337If it must be done, put the blocking parts into C<sync_job>. This will run
292the given BLOCK in another coroutine while waiting for the result. The 338the given BLOCK in another coroutine while waiting for the result. The
293server will be frozen during this time, so the block should either finish 339server will be frozen during this time, so the block should either finish
294fast or be very important. 340fast or be very important.
297 343
298sub sync_job(&) { 344sub sync_job(&) {
299 my ($job) = @_; 345 my ($job) = @_;
300 346
301 if ($Coro::current == $Coro::main) { 347 if ($Coro::current == $Coro::main) {
348 my $time = Event::time;
349
302 # this is the main coro, too bad, we have to block 350 # this is the main coro, too bad, we have to block
303 # till the operation succeeds, freezing the server :/ 351 # till the operation succeeds, freezing the server :/
304 352
305 # TODO: use suspend/resume instead 353 # TODO: use suspend/resume instead
306 # (but this is cancel-safe) 354 # (but this is cancel-safe)
317 365
318 while ($busy) { 366 while ($busy) {
319 Coro::cede or Event::one_event; 367 Coro::cede or Event::one_event;
320 } 368 }
321 369
370 $time = Event::time - $time;
371
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load
376
322 wantarray ? @res : $res[0] 377 wantarray ? @res : $res[0]
323 } else { 378 } else {
324 # we are in another coroutine, how wonderful, everything just works 379 # we are in another coroutine, how wonderful, everything just works
325 380
326 $job->() 381 $job->()
345 $EXT_CORO{$coro+0} = $coro; 400 $EXT_CORO{$coro+0} = $coro;
346 401
347 $coro 402 $coro
348} 403}
349 404
350sub write_runtime { 405=item fork_call { }, $args
351 my $guard = cf::lock_acquire "write_runtime";
352 406
353 my $runtime = cf::localdir . "/runtime"; 407Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling.
354 411
355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 412=cut
356 or return;
357 413
358 my $value = $cf::RUNTIME + 90 + 10; 414sub fork_call(&@) {
359 # 10 is the runtime save interval, for a monotonic clock 415 my ($cb, @args) = @_;
360 # 60 allows for the watchdog to kill the server.
361 416
362 (aio_write $fh, 0, (length $value), $value, 0) <= 0 417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
363 and return; 418# or die "socketpair: $!";
419 pipe my $fh1, my $fh2
420 or die "pipe: $!";
364 421
365 # always fsync - this file is important 422 if (my $pid = fork) {
366 aio_fsync $fh
367 and return;
368
369 close $fh 423 close $fh2;
370 or return;
371 424
372 aio_rename "$runtime~", $runtime 425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
373 and return; 426 $res = Coro::Storable::thaw $res;
374 427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals;
435 local $SIG{__WARN__};
436 local $SIG{__DIE__};
437 eval {
438 close $fh1;
439
440 my @res = eval { $cb->(@args) };
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
375 1 446 }
447}
448
449=item $value = cf::db_get $family => $key
450
451Returns a single value from the environment database.
452
453=item cf::db_put $family => $key => $value
454
455Stores the given C<$value> in the family. It can currently store binary
456data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457
458=cut
459
460our $DB;
461
462sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job {
467 eval {
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 }
477}
478
479sub db_get($$) {
480 my $key = "$_[0]/$_[1]";
481
482 cf::sync_job {
483 BDB::db_get $DB, undef, $key, my $data;
484
485 $! ? ()
486 : $data
487 }
488}
489
490sub db_put($$$) {
491 BDB::dbreq_pri 4;
492 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
493}
494
495=item cf::cache $id => [$paths...], $processversion => $process
496
497Generic caching function that returns the value of the resource $id,
498caching and regenerating as required.
499
500This function can block.
501
502=cut
503
504sub cache {
505 my ($id, $src, $processversion, $process) = @_;
506
507 my $meta =
508 join "\x00",
509 $processversion,
510 map {
511 aio_stat $_
512 and Carp::croak "$_: $!";
513
514 ($_, (stat _)[7,9])
515 } @$src;
516
517 my $dbmeta = db_get cache => "$id/meta";
518 if ($dbmeta ne $meta) {
519 # changed, we may need to process
520
521 my @data;
522 my $md5;
523
524 for (0 .. $#$src) {
525 0 <= aio_load $src->[$_], $data[$_]
526 or Carp::croak "$src->[$_]: $!";
527 }
528
529 # if processing is expensive, check
530 # checksum first
531 if (1) {
532 $md5 =
533 join "\x00",
534 $processversion,
535 map {
536 Coro::cede;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src;
539
540
541 my $dbmd5 = db_get cache => "$id/md5";
542 if ($dbmd5 eq $md5) {
543 db_put cache => "$id/meta", $meta;
544
545 return db_get cache => "$id/data";
546 }
547 }
548
549 my $t1 = Time::HiRes::time;
550 my $data = $process->(\@data);
551 my $t2 = Time::HiRes::time;
552
553 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
554
555 db_put cache => "$id/data", $data;
556 db_put cache => "$id/md5" , $md5;
557 db_put cache => "$id/meta", $meta;
558
559 return $data;
560 }
561
562 db_get cache => "$id/data"
376} 563}
377 564
378=item cf::datalog type => key => value, ... 565=item cf::datalog type => key => value, ...
379 566
380Log a datalog packet of the given type with the given key-value pairs. 567Log a datalog packet of the given type with the given key-value pairs.
398attach callbacks/event handlers (a collection of which is called an "attachment") 585attach callbacks/event handlers (a collection of which is called an "attachment")
399to it. All such attachable objects support the following methods. 586to it. All such attachable objects support the following methods.
400 587
401In the following description, CLASS can be any of C<global>, C<object> 588In the following description, CLASS can be any of C<global>, C<object>
402C<player>, C<client> or C<map> (i.e. the attachable objects in 589C<player>, C<client> or C<map> (i.e. the attachable objects in
403crossfire+). 590Crossfire TRT).
404 591
405=over 4 592=over 4
406 593
407=item $attachable->attach ($attachment, key => $value...) 594=item $attachable->attach ($attachment, key => $value...)
408 595
571 $registry = $CB_TYPE[$object_type] ||= []; 758 $registry = $CB_TYPE[$object_type] ||= [];
572 759
573 } elsif ($type eq "subtype") { 760 } elsif ($type eq "subtype") {
574 defined $object_type or Carp::croak "subtype specified without type"; 761 defined $object_type or Carp::croak "subtype specified without type";
575 my $object_subtype = shift @arg; 762 my $object_subtype = shift @arg;
576 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 763 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
577 764
578 } elsif ($type eq "package") { 765 } elsif ($type eq "package") {
579 my $pkg = shift @arg; 766 my $pkg = shift @arg;
580 767
581 while (my ($name, $id) = each %cb_id) { 768 while (my ($name, $id) = each %cb_id) {
610 _attach $registry, $klass, @attach; 797 _attach $registry, $klass, @attach;
611 } 798 }
612 799
613 $obj->{$name} = \%arg; 800 $obj->{$name} = \%arg;
614 } else { 801 } else {
615 warn "object uses attachment '$name' that is not available, postponing.\n"; 802 warn "object uses attachment '$name' which is not available, postponing.\n";
616 } 803 }
617 804
618 $obj->{_attachment}{$name} = undef; 805 $obj->{_attachment}{$name} = undef;
619} 806}
620 807
622 if (ref $_[0]) { 809 if (ref $_[0]) {
623 _object_attach @_; 810 _object_attach @_;
624 } else { 811 } else {
625 _attach shift->_attach_registry, @_; 812 _attach shift->_attach_registry, @_;
626 } 813 }
814 _recalc_want;
627}; 815};
628 816
629# all those should be optimised 817# all those should be optimised
630sub cf::attachable::detach { 818sub cf::attachable::detach {
631 my ($obj, $name) = @_; 819 my ($obj, $name) = @_;
634 delete $obj->{_attachment}{$name}; 822 delete $obj->{_attachment}{$name};
635 reattach ($obj); 823 reattach ($obj);
636 } else { 824 } else {
637 Carp::croak "cannot, currently, detach class attachments"; 825 Carp::croak "cannot, currently, detach class attachments";
638 } 826 }
827 _recalc_want;
639}; 828};
640 829
641sub cf::attachable::attached { 830sub cf::attachable::attached {
642 my ($obj, $name) = @_; 831 my ($obj, $name) = @_;
643 832
816 or return; 1005 or return;
817 $av = eval { (Storable::thaw $av)->{objs} }; 1006 $av = eval { (Storable::thaw $av)->{objs} };
818 } 1007 }
819 1008
820 warn sprintf "loading %s (%d)\n", 1009 warn sprintf "loading %s (%d)\n",
821 $filename, length $data, scalar @{$av || []};#d# 1010 $filename, length $data, scalar @{$av || []};
822 return ($data, $av); 1011 return ($data, $av);
823} 1012}
1013
1014=head2 COMMAND CALLBACKS
1015
1016=over 4
1017
1018=cut
824 1019
825############################################################################# 1020#############################################################################
826# command handling &c 1021# command handling &c
827 1022
828=item cf::register_command $name => \&callback($ob,$args); 1023=item cf::register_command $name => \&callback($ob,$args);
841 push @{ $COMMAND{$name} }, [$caller, $cb]; 1036 push @{ $COMMAND{$name} }, [$caller, $cb];
842} 1037}
843 1038
844=item cf::register_extcmd $name => \&callback($pl,$packet); 1039=item cf::register_extcmd $name => \&callback($pl,$packet);
845 1040
846Register a callbackf ro execution when the client sends an extcmd packet. 1041Register a callback for execution when the client sends an (synchronous)
1042extcmd packet. Ext commands will be processed in the order they are
1043received by the server, like other user commands. The first argument is
1044the logged-in player. Ext commands can only be processed after a player
1045has logged in successfully.
847 1046
848If the callback returns something, it is sent back as if reply was being 1047If the callback returns something, it is sent back as if reply was being
849called. 1048called.
850 1049
1050=item cf::register_exticmd $name => \&callback($ns,$packet);
1051
1052Register a callback for execution when the client sends an (asynchronous)
1053exticmd packet. Exti commands are processed by the server as soon as they
1054are received, i.e. out of order w.r.t. other commands. The first argument
1055is a client socket. Exti commands can be received anytime, even before
1056log-in.
1057
1058If the callback returns something, it is sent back as if reply was being
1059called.
1060
851=cut 1061=cut
852 1062
853sub register_extcmd { 1063sub register_extcmd {
854 my ($name, $cb) = @_; 1064 my ($name, $cb) = @_;
855 1065
856 $EXTCMD{$name} = $cb; 1066 $EXTCMD{$name} = $cb;
1067}
1068
1069sub register_exticmd {
1070 my ($name, $cb) = @_;
1071
1072 $EXTICMD{$name} = $cb;
857} 1073}
858 1074
859cf::player->attach ( 1075cf::player->attach (
860 on_command => sub { 1076 on_command => sub {
861 my ($pl, $name, $params) = @_; 1077 my ($pl, $name, $params) = @_;
870 cf::override; 1086 cf::override;
871 }, 1087 },
872 on_extcmd => sub { 1088 on_extcmd => sub {
873 my ($pl, $buf) = @_; 1089 my ($pl, $buf) = @_;
874 1090
875 my $msg = eval { from_json $buf }; 1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
876 1092
877 if (ref $msg) { 1093 if (ref $msg) {
878 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
879 if (my %reply = $cb->($pl, $msg)) { 1095 if (my %reply = $cb->($pl, $msg)) {
880 $pl->ext_reply ($msg->{msgid}, %reply); 1096 $pl->ext_reply ($msg->{msgid}, %reply);
886 1102
887 cf::override; 1103 cf::override;
888 }, 1104 },
889); 1105);
890 1106
891sub load_extension {
892 my ($path) = @_;
893
894 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
895 my $base = $1;
896 my $pkg = $1;
897 $pkg =~ s/[^[:word:]]/_/g;
898 $pkg = "ext::$pkg";
899
900 warn "... loading '$path' into '$pkg'\n";
901
902 open my $fh, "<:utf8", $path
903 or die "$path: $!";
904
905 my $source =
906 "package $pkg; use strict; use utf8;\n"
907 . "#line 1 \"$path\"\n{\n"
908 . (do { local $/; <$fh> })
909 . "\n};\n1";
910
911 unless (eval $source) {
912 my $msg = $@ ? "$path: $@\n"
913 : "extension disabled.\n";
914 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
915 warn $@;
916 warn "mandatory extension failed to load, exiting.\n";
917 exit 1;
918 }
919 die $@;
920 }
921
922 push @EXTS, $pkg;
923}
924
925sub load_extensions { 1107sub load_extensions {
1108 cf::sync_job {
1109 my %todo;
1110
926 for my $ext (<$LIBDIR/*.ext>) { 1111 for my $path (<$LIBDIR/*.ext>) {
927 next unless -r $ext; 1112 next unless -r $path;
928 eval { 1113
929 load_extension $ext; 1114 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1115 my $base = $1;
1116 my $pkg = $1;
1117 $pkg =~ s/[^[:word:]]/_/g;
1118 $pkg = "ext::$pkg";
1119
1120 open my $fh, "<:utf8", $path
1121 or die "$path: $!";
1122
1123 my $source = do { local $/; <$fh> };
1124
1125 my %ext = (
1126 path => $path,
1127 base => $base,
1128 pkg => $pkg,
1129 );
1130
1131 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1132 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1133
1134 $ext{source} =
1135 "package $pkg; use strict; use utf8;\n"
1136 . "#line 1 \"$path\"\n{\n"
1137 . $source
1138 . "\n};\n1";
1139
1140 $todo{$base} = \%ext;
1141 }
1142
1143 my %done;
1144 while (%todo) {
1145 my $progress;
1146
1147 while (my ($k, $v) = each %todo) {
1148 for (split /,\s*/, $v->{meta}{depends}) {
1149 goto skip
1150 unless exists $done{$_};
1151 }
1152
1153 warn "... loading '$k' into '$v->{pkg}'\n";
1154
1155 unless (eval $v->{source}) {
1156 my $msg = $@ ? "$v->{path}: $@\n"
1157 : "$v->{base}: extension inactive.\n";
1158
1159 if (exists $v->{meta}{mandatory}) {
1160 warn $msg;
1161 warn "mandatory extension failed to load, exiting.\n";
1162 exit 1;
1163 }
1164
1165 warn $msg;
1166 }
1167
1168 $done{$k} = delete $todo{$k};
1169 push @EXTS, $v->{pkg};
1170 $progress = 1;
930 1 1171 }
931 } or warn "$ext not loaded: $@"; 1172
1173 skip:
1174 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1175 unless $progress;
1176 }
932 } 1177 };
933} 1178}
934 1179
935############################################################################# 1180#############################################################################
936 1181
1182=back
1183
937=head2 CORE EXTENSIONS 1184=head2 CORE EXTENSIONS
938 1185
939Functions and methods that extend core crossfire objects. 1186Functions and methods that extend core crossfire objects.
940 1187
941=cut 1188=cut
953Returns the given player object, loading it if necessary (might block). 1200Returns the given player object, loading it if necessary (might block).
954 1201
955=cut 1202=cut
956 1203
957sub playerdir($) { 1204sub playerdir($) {
958 cf::localdir 1205 "$PLAYERDIR/"
959 . "/"
960 . cf::playerdir
961 . "/"
962 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1206 . (ref $_[0] ? $_[0]->ob->name : $_[0])
963} 1207}
964 1208
965sub path($) { 1209sub path($) {
966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1210 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1086while and may block, so not sync_job-capable, ever. 1330while and may block, so not sync_job-capable, ever.
1087 1331
1088=cut 1332=cut
1089 1333
1090sub list_logins { 1334sub list_logins {
1091 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1335 my $dirs = aio_readdir $PLAYERDIR
1092 or return []; 1336 or return [];
1093 1337
1094 my @logins; 1338 my @logins;
1095 1339
1096 for my $login (@$dirs) { 1340 for my $login (@$dirs) {
1131 } 1375 }
1132 1376
1133 \@paths 1377 \@paths
1134} 1378}
1135 1379
1380=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1381
1382Expand crossfire pod fragments into protocol xml.
1383
1384=cut
1385
1386sub expand_cfpod {
1387 ((my $self), (local $_)) = @_;
1388
1389 # escape & and <
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392
1393 # this is buggy, it needs to properly take care of nested <'s
1394
1395 1 while
1396 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/
1400 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1
1403 }ge
1404 # replace H<hint text>
1405 || s{H<([^\>]*)>}
1406 {
1407 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1408 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1409 "")
1410 [$self->{hintmode}]
1411 }ge;
1412
1413 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g;
1415
1416 # compress some whitespace
1417 s/\s+\n/\n/g; # ws line-ends
1418 s/\n\n+/\n/g; # double lines
1419 s/^\n+//; # beginning lines
1420 s/\n+$//; # ending lines
1421
1422 $_
1423}
1424
1425sub hintmode {
1426 $_[0]{hintmode} = $_[1] if @_ > 1;
1427 $_[0]{hintmode}
1428}
1429
1136=item $player->ext_reply ($msgid, %msg) 1430=item $player->ext_reply ($msgid, %msg)
1137 1431
1138Sends an ext reply to the player. 1432Sends an ext reply to the player.
1139 1433
1140=cut 1434=cut
1141 1435
1142sub ext_reply($$%) { 1436sub ext_reply($$%) {
1143 my ($self, $id, %msg) = @_; 1437 my ($self, $id, %msg) = @_;
1144 1438
1145 $msg{msgid} = $id; 1439 $msg{msgid} = $id;
1146 1440 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1147 $self->send ("ext " . cf::to_json \%msg);
1148} 1441}
1149 1442
1150=item $player->ext_event ($type, %msg) 1443=item $player->ext_event ($type, %msg)
1151 1444
1152Sends an ext event to the client. 1445Sends an ext event to the client.
1157 my ($self, $type, %msg) = @_; 1450 my ($self, $type, %msg) = @_;
1158 1451
1159 $self->ns->ext_event ($type, %msg); 1452 $self->ns->ext_event ($type, %msg);
1160} 1453}
1161 1454
1162package cf; 1455=head3 cf::region
1456
1457=over 4
1458
1459=cut
1460
1461package cf::region;
1462
1463=item cf::region::find_by_path $path
1464
1465Tries to decuce the likely region for a map knowing only its path.
1466
1467=cut
1468
1469sub find_by_path($) {
1470 my ($path) = @_;
1471
1472 my ($match, $specificity);
1473
1474 for my $region (list) {
1475 if ($region->match && $path =~ $region->match) {
1476 ($match, $specificity) = ($region, $region->specificity)
1477 if $region->specificity > $specificity;
1478 }
1479 }
1480
1481 $match
1482}
1163 1483
1164=back 1484=back
1165
1166 1485
1167=head3 cf::map 1486=head3 cf::map
1168 1487
1169=over 4 1488=over 4
1170 1489
1225 my ($self, $merge) = @_; 1544 my ($self, $merge) = @_;
1226 1545
1227 # we have to keep some variables in memory intact 1546 # we have to keep some variables in memory intact
1228 local $self->{path}; 1547 local $self->{path};
1229 local $self->{load_path}; 1548 local $self->{load_path};
1230 local $self->{deny_save};
1231 local $self->{deny_reset};
1232 1549
1233 $self->SUPER::thawer_merge ($merge); 1550 $self->SUPER::thawer_merge ($merge);
1234} 1551}
1235 1552
1236sub normalise { 1553sub normalise {
1308 1625
1309# the original (read-only) location 1626# the original (read-only) location
1310sub load_path { 1627sub load_path {
1311 my ($self) = @_; 1628 my ($self) = @_;
1312 1629
1313 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1630 "$MAPDIR/$self->{path}.map"
1314} 1631}
1315 1632
1316# the temporary/swap location 1633# the temporary/swap location
1317sub save_path { 1634sub save_path {
1318 my ($self) = @_; 1635 my ($self) = @_;
1319 1636
1320 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1637 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1321 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1638 "$TMPDIR/$path.map"
1322} 1639}
1323 1640
1324# the unique path, undef == no special unique path 1641# the unique path, undef == no special unique path
1325sub uniq_path { 1642sub uniq_path {
1326 my ($self) = @_; 1643 my ($self) = @_;
1327 1644
1328 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1645 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1329 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1646 "$UNIQUEDIR/$path"
1330} 1647}
1331 1648
1332# and all this just because we cannot iterate over 1649# and all this just because we cannot iterate over
1333# all maps in C++... 1650# all maps in C++...
1334sub change_all_map_light { 1651sub change_all_map_light {
1335 my ($change) = @_; 1652 my ($change) = @_;
1336 1653
1337 $_->change_map_light ($change) 1654 $_->change_map_light ($change)
1338 for grep $_->outdoor, values %cf::MAP; 1655 for grep $_->outdoor, values %cf::MAP;
1656}
1657
1658sub decay_objects {
1659 my ($self) = @_;
1660
1661 return if $self->{deny_reset};
1662
1663 $self->do_decay_objects;
1339} 1664}
1340 1665
1341sub unlink_save { 1666sub unlink_save {
1342 my ($self) = @_; 1667 my ($self) = @_;
1343 1668
1401 $self->load_header_orig 1726 $self->load_header_orig
1402 or return; 1727 or return;
1403 $self->prepare_orig; 1728 $self->prepare_orig;
1404 } 1729 }
1405 1730
1731 $self->{deny_reset} = 1
1732 if $self->no_reset;
1733
1734 $self->default_region (cf::region::find_by_path $self->{path})
1735 unless $self->default_region;
1736
1406 1 1737 1
1407} 1738}
1408 1739
1409sub find; 1740sub find;
1410sub find { 1741sub find {
1422 $map->{last_save} = $cf::RUNTIME; 1753 $map->{last_save} = $cf::RUNTIME;
1423 1754
1424 $map->load_header 1755 $map->load_header
1425 or return; 1756 or return;
1426 1757
1427 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1758 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1428 # doing this can freeze the server in a sync job, obviously 1759 # doing this can freeze the server in a sync job, obviously
1429 #$cf::WAIT_FOR_TICK->wait; 1760 #$cf::WAIT_FOR_TICK->wait;
1430 $map->reset; 1761 $map->reset;
1431 undef $guard; 1762 undef $guard;
1432 return find $path; 1763 return find $path;
1443 my ($self) = @_; 1774 my ($self) = @_;
1444 1775
1445 local $self->{deny_reset} = 1; # loading can take a long time 1776 local $self->{deny_reset} = 1; # loading can take a long time
1446 1777
1447 my $path = $self->{path}; 1778 my $path = $self->{path};
1779
1780 {
1448 my $guard = cf::lock_acquire "map_load:$path"; 1781 my $guard = cf::lock_acquire "map_load:$path";
1449 1782
1450 return if $self->in_memory != cf::MAP_SWAPPED; 1783 return if $self->in_memory != cf::MAP_SWAPPED;
1451 1784
1452 $self->in_memory (cf::MAP_LOADING); 1785 $self->in_memory (cf::MAP_LOADING);
1453 1786
1454 $self->alloc; 1787 $self->alloc;
1455 1788
1456 $self->pre_load; 1789 $self->pre_load;
1457
1458 $self->_load_objects ($self->{load_path}, 1)
1459 or return;
1460
1461 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1462 if delete $self->{load_original};
1463
1464 if (my $uniq = $self->uniq_path) {
1465 utf8::encode $uniq;
1466 if (aio_open $uniq, O_RDONLY, 0) {
1467 $self->clear_unique_items;
1468 $self->_load_objects ($uniq, 0);
1469 }
1470 }
1471
1472 Coro::cede;
1473
1474 # now do the right thing for maps
1475 $self->link_multipart_objects;
1476
1477 unless ($self->{deny_activate}) {
1478 $self->decay_objects;
1479 $self->fix_auto_apply;
1480 $self->update_buttons;
1481 Coro::cede; 1790 Coro::cede;
1482 $self->set_darkness_map; 1791
1792 $self->_load_objects ($self->{load_path}, 1)
1793 or return;
1794
1795 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1796 if delete $self->{load_original};
1797
1798 if (my $uniq = $self->uniq_path) {
1799 utf8::encode $uniq;
1800 if (aio_open $uniq, O_RDONLY, 0) {
1801 $self->clear_unique_items;
1802 $self->_load_objects ($uniq, 0);
1803 }
1804 }
1805
1806 Coro::cede;
1807 # now do the right thing for maps
1808 $self->link_multipart_objects;
1483 $self->difficulty ($self->estimate_difficulty) 1809 $self->difficulty ($self->estimate_difficulty)
1484 unless $self->difficulty; 1810 unless $self->difficulty;
1485 Coro::cede; 1811 Coro::cede;
1812
1813 unless ($self->{deny_activate}) {
1814 $self->decay_objects;
1815 $self->fix_auto_apply;
1816 $self->update_buttons;
1817 Coro::cede;
1818 $self->set_darkness_map;
1819 Coro::cede;
1486 $self->activate; 1820 $self->activate;
1821 }
1822
1823 $self->in_memory (cf::MAP_IN_MEMORY);
1487 } 1824 }
1488 1825
1489 $self->post_load; 1826 $self->post_load;
1490
1491 $self->in_memory (cf::MAP_IN_MEMORY);
1492} 1827}
1493 1828
1494sub customise_for { 1829sub customise_for {
1495 my ($self, $ob) = @_; 1830 my ($self, $ob) = @_;
1496 1831
1497 return find "~" . $ob->name . "/" . $self->{path} 1832 return find "~" . $ob->name . "/" . $self->{path}
1498 if $self->per_player; 1833 if $self->per_player;
1834
1835# return find "?party/" . $ob->name . "/" . $self->{path}
1836# if $self->per_party;
1499 1837
1500 $self 1838 $self
1501} 1839}
1502 1840
1503# find and load all maps in the 3x3 area around a map 1841# find and load all maps in the 3x3 area around a map
1614 1952
1615sub reset_at { 1953sub reset_at {
1616 my ($self) = @_; 1954 my ($self) = @_;
1617 1955
1618 # TODO: safety, remove and allow resettable per-player maps 1956 # TODO: safety, remove and allow resettable per-player maps
1619 return 1e99 if $self->isa ("ext::map_per_player");#d#
1620 return 1e99 if $self->{deny_reset}; 1957 return 1e99 if $self->{deny_reset};
1621 1958
1622 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1959 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1623 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1960 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1624 1961
1635 my ($self) = @_; 1972 my ($self) = @_;
1636 1973
1637 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1974 my $lock = cf::lock_acquire "map_data:$self->{path}";
1638 1975
1639 return if $self->players; 1976 return if $self->players;
1640 return if $self->isa ("ext::map_per_player");#d#
1641 1977
1642 warn "resetting map ", $self->path;#d# 1978 warn "resetting map ", $self->path;
1643 1979
1644 $self->in_memory (cf::MAP_SWAPPED); 1980 $self->in_memory (cf::MAP_SWAPPED);
1645 1981
1646 # need to save uniques path 1982 # need to save uniques path
1647 unless ($self->{deny_save}) { 1983 unless ($self->{deny_save}) {
1679 $cf::MAP{$self->path} = $self; 2015 $cf::MAP{$self->path} = $self;
1680 2016
1681 $self->reset; # polite request, might not happen 2017 $self->reset; # polite request, might not happen
1682} 2018}
1683 2019
2020=item $maps = cf::map::tmp_maps
2021
2022Returns an arrayref with all map paths of currently instantiated and saved
2023maps. May block.
2024
2025=cut
2026
2027sub tmp_maps() {
2028 [
2029 map {
2030 utf8::decode $_;
2031 /\.map$/
2032 ? normalise $_
2033 : ()
2034 } @{ aio_readdir $TMPDIR or [] }
2035 ]
2036}
2037
2038=item $maps = cf::map::random_maps
2039
2040Returns an arrayref with all map paths of currently instantiated and saved
2041random maps. May block.
2042
2043=cut
2044
2045sub random_maps() {
2046 [
2047 map {
2048 utf8::decode $_;
2049 /\.map$/
2050 ? normalise "?random/$_"
2051 : ()
2052 } @{ aio_readdir $RANDOMDIR or [] }
2053 ]
2054}
2055
1684=item cf::map::unique_maps 2056=item cf::map::unique_maps
1685 2057
1686Returns an arrayref of paths of all shared maps that have 2058Returns an arrayref of paths of all shared maps that have
1687instantiated unique items. May block. 2059instantiated unique items. May block.
1688 2060
1689=cut 2061=cut
1690 2062
1691sub unique_maps() { 2063sub unique_maps() {
1692 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2064 [
1693 or return; 2065 map {
1694
1695 my @paths;
1696
1697 for (@$files) {
1698 utf8::decode $_; 2066 utf8::decode $_;
1699 next if /\.pst$/; 2067 /\.map$/
1700 next unless /^$PATH_SEP/o; 2068 ? normalise $_
1701 2069 : ()
1702 push @paths, cf::map::normalise $_; 2070 } @{ aio_readdir $UNIQUEDIR or [] }
1703 } 2071 ]
1704
1705 \@paths
1706} 2072}
1707 2073
1708package cf; 2074package cf;
1709 2075
1710=back 2076=back
1756 2122
1757 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2123 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1758 2124
1759 if ($self->{record_replies}) { 2125 if ($self->{record_replies}) {
1760 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2126 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2127
1761 } else { 2128 } else {
2129 my $pl = $self->contr;
2130
2131 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132 my $diag = $pl->{npc_dialog};
2133 $diag->{pl}->ext_reply (
2134 $diag->{id},
2135 msgtype => "reply",
2136 msg => $diag->{pl}->expand_cfpod ($msg),
2137 add_topics => []
2138 );
2139
2140 } else {
1762 $msg = $npc->name . " says: $msg" if $npc; 2141 $msg = $npc->name . " says: $msg" if $npc;
1763 $self->message ($msg, $flags); 2142 $self->message ($msg, $flags);
2143 }
1764 } 2144 }
1765} 2145}
1766 2146
1767=item $player_object->may ("access") 2147=item $player_object->may ("access")
1768 2148
1816 $self->deactivate_recursive; 2196 $self->deactivate_recursive;
1817 2197
1818 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2198 return if UNIVERSAL::isa $self->map, "ext::map_link";
1819 2199
1820 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2200 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1821 if $self->map; 2201 if $self->map && $self->map->{path} ne "{link}";
1822 2202
1823 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2203 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1824} 2204}
1825 2205
1826sub cf::object::player::leave_link { 2206sub cf::object::player::leave_link {
1827 my ($self, $map, $x, $y) = @_; 2207 my ($self, $map, $x, $y) = @_;
2208
2209 return unless $self->contr->active;
1828 2210
1829 my $link_pos = delete $self->{_link_pos}; 2211 my $link_pos = delete $self->{_link_pos};
1830 2212
1831 unless ($map) { 2213 unless ($map) {
1832 # restore original map position 2214 # restore original map position
1855 2237
1856 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2238 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1857 $self->enter_map ($map, $x, $y); 2239 $self->enter_map ($map, $x, $y);
1858} 2240}
1859 2241
1860cf::player->attach (
1861 on_logout => sub {
1862 my ($pl) = @_;
1863
1864 # abort map switching before logout
1865 if ($pl->ob->{_link_pos}) {
1866 cf::sync_job {
1867 $pl->ob->leave_link
1868 };
1869 }
1870 },
1871 on_login => sub {
1872 my ($pl) = @_;
1873
1874 # try to abort aborted map switching on player login :)
1875 # should happen only on crashes
1876 if ($pl->ob->{_link_pos}) {
1877 $pl->ob->enter_link;
1878 (async {
1879 $pl->ob->reply (undef,
1880 "There was an internal problem at your last logout, "
1881 . "the server will try to bring you to your intended destination in a second.",
1882 cf::NDI_RED);
1883 # we need this sleep as the login has a concurrent enter_exit running
1884 # and this sleep increases chances of the player not ending up in scorn
1885 Coro::Timer::sleep 1;
1886 $pl->ob->leave_link;
1887 })->prio (2);
1888 }
1889 },
1890);
1891
1892=item $player_object->goto ($path, $x, $y) 2242=item $player_object->goto ($path, $x, $y[, $check->($map)])
1893 2243
2244Moves the player to the given map-path and coordinates by first freezing
2245her, loading and preparing them map, calling the provided $check callback
2246that has to return the map if sucecssful, and then unfreezes the player on
2247the new (success) or old (failed) map position.
2248
1894=cut 2249=cut
2250
2251our $GOTOGEN;
1895 2252
1896sub cf::object::player::goto { 2253sub cf::object::player::goto {
1897 my ($self, $path, $x, $y) = @_; 2254 my ($self, $path, $x, $y, $check) = @_;
2255
2256 # do generation counting so two concurrent goto's will be executed in-order
2257 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1898 2258
1899 $self->enter_link; 2259 $self->enter_link;
1900 2260
1901 (async { 2261 (async {
1902 my $map = eval { 2262 my $map = eval {
1903 my $map = cf::map::find $path; 2263 my $map = cf::map::find $path;
2264
2265 if ($map) {
1904 $map = $map->customise_for ($self) if $map; 2266 $map = $map->customise_for ($self);
2267 $map = $check->($map) if $check && $map;
2268 } else {
2269 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2270 }
2271
1905 $map 2272 $map
2273 };
2274
2275 if ($@) {
2276 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2277 LOG llevError | logBacktrace, Carp::longmess $@;
1906 } or 2278 }
1907 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1908 2279
2280 if ($gen == $self->{_goto_generation}) {
2281 delete $self->{_goto_generation};
1909 $self->leave_link ($map, $x, $y); 2282 $self->leave_link ($map, $x, $y);
2283 }
1910 })->prio (1); 2284 })->prio (1);
1911} 2285}
1912 2286
1913=item $player_object->enter_exit ($exit_object) 2287=item $player_object->enter_exit ($exit_object)
1914 2288
1953 2327
1954 $rmp->{random_seed} ||= $exit->random_seed; 2328 $rmp->{random_seed} ||= $exit->random_seed;
1955 2329
1956 my $data = cf::to_json $rmp; 2330 my $data = cf::to_json $rmp;
1957 my $md5 = Digest::MD5::md5_hex $data; 2331 my $md5 = Digest::MD5::md5_hex $data;
1958 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2332 my $meta = "$RANDOMDIR/$md5.meta";
1959 2333
1960 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2334 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1961 aio_write $fh, 0, (length $data), $data, 0; 2335 aio_write $fh, 0, (length $data), $data, 0;
1962 undef $fh; 2336 undef $fh;
1963 aio_rename "$meta~", $meta; 2337 aio_rename "$meta~", $meta;
2019 2393
2020 utf8::encode $text; 2394 utf8::encode $text;
2021 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2395 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2022} 2396}
2023 2397
2398=item $client->send_msg ($color, $type, $msg, [extra...])
2399
2400Send a drawinfo or msg packet to the client, formatting the msg for the
2401client if neccessary. C<$type> should be a string identifying the type of
2402the message, with C<log> being the default. If C<$color> is negative, suppress
2403the message unless the client supports the msg packet.
2404
2405=cut
2406
2407sub cf::client::send_msg {
2408 my ($self, $color, $type, $msg, @extra) = @_;
2409
2410 $msg = $self->pl->expand_cfpod ($msg);
2411
2412 return unless @extra || length $msg;
2413
2414 if ($self->can_msg) {
2415 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2416 } else {
2417 # replace some tags by gcfclient-compatible ones
2418 for ($msg) {
2419 1 while
2420 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2421 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2422 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2423 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2424 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2425 }
2426
2427 if ($color >= 0) {
2428 if (0 && $msg =~ /\[/) {
2429 $self->send_packet ("drawextinfo $color 4 0 $msg")
2430 } else {
2431 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2432 $self->send_packet ("drawinfo $color $msg")
2433 }
2434 }
2435 }
2436}
2437
2024=item $client->ext_event ($type, %msg) 2438=item $client->ext_event ($type, %msg)
2025 2439
2026Sends an exti event to the client. 2440Sends an ext event to the client.
2027 2441
2028=cut 2442=cut
2029 2443
2030sub cf::client::ext_event($$%) { 2444sub cf::client::ext_event($$%) {
2031 my ($self, $type, %msg) = @_; 2445 my ($self, $type, %msg) = @_;
2032 2446
2033 $msg{msgtype} = "event_$type"; 2447 $msg{msgtype} = "event_$type";
2034 $self->send_packet ("ext " . cf::to_json \%msg); 2448 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2035} 2449}
2036 2450
2037=item $success = $client->query ($flags, "text", \&cb) 2451=item $success = $client->query ($flags, "text", \&cb)
2038 2452
2039Queues a query to the client, calling the given callback with 2453Queues a query to the client, calling the given callback with
2040the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2454the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2041C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2455C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2042 2456
2043Queries can fail, so check the return code. Or don't, as queries will become 2457Queries can fail, so check the return code. Or don't, as queries will
2044reliable at some point in the future. 2458become reliable at some point in the future.
2045 2459
2046=cut 2460=cut
2047 2461
2048sub cf::client::query { 2462sub cf::client::query {
2049 my ($self, $flags, $text, $cb) = @_; 2463 my ($self, $flags, $text, $cb) = @_;
2057 utf8::encode $text; 2471 utf8::encode $text;
2058 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2472 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2059 2473
2060 $self->send_packet ($self->{query_queue}[0][0]) 2474 $self->send_packet ($self->{query_queue}[0][0])
2061 if @{ $self->{query_queue} } == 1; 2475 if @{ $self->{query_queue} } == 1;
2476
2477 1
2062} 2478}
2063 2479
2064cf::client->attach ( 2480cf::client->attach (
2481 on_connect => sub {
2482 my ($ns) = @_;
2483
2484 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2485 },
2065 on_reply => sub { 2486 on_reply => sub {
2066 my ($ns, $msg) = @_; 2487 my ($ns, $msg) = @_;
2067 2488
2068 # this weird shuffling is so that direct followup queries 2489 # this weird shuffling is so that direct followup queries
2069 # get handled first 2490 # get handled first
2080 $ns->send_packet ($ns->{query_queue}[0][0]); 2501 $ns->send_packet ($ns->{query_queue}[0][0]);
2081 } else { 2502 } else {
2082 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2503 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2083 } 2504 }
2084 } 2505 }
2506 },
2507 on_exticmd => sub {
2508 my ($ns, $buf) = @_;
2509
2510 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2511
2512 if (ref $msg) {
2513 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2514 if (my %reply = $cb->($ns, $msg)) {
2515 $reply{msgid} = $msg->{msgid};
2516 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2517 }
2518 }
2519 } else {
2520 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2521 }
2522
2523 cf::override;
2085 }, 2524 },
2086); 2525);
2087 2526
2088=item $client->async (\&cb) 2527=item $client->async (\&cb)
2089 2528
2228=back 2667=back
2229 2668
2230=cut 2669=cut
2231 2670
2232############################################################################# 2671#############################################################################
2233
2234=head2 EXTENSION DATABASE SUPPORT
2235
2236Crossfire maintains a very simple database for extension use. It can
2237currently store anything that can be serialised using Storable, which
2238excludes objects.
2239
2240The parameter C<$family> should best start with the name of the extension
2241using it, it should be unique.
2242
2243=over 4
2244
2245=item $value = cf::db_get $family => $key
2246
2247Returns a single value from the database.
2248
2249=item cf::db_put $family => $key => $value
2250
2251Stores the given C<$value> in the family.
2252
2253=cut
2254
2255our $DB;
2256
2257sub db_init {
2258 unless ($DB) {
2259 $DB = BDB::db_create $DB_ENV;
2260
2261 cf::sync_job {
2262 eval {
2263 $DB->set_flags (BDB::CHKSUM);
2264
2265 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2266 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2267 cf::cleanup "db_open(db): $!" if $!;
2268 };
2269 cf::cleanup "db_open(db): $@" if $@;
2270 };
2271
2272 my $path = cf::localdir . "/database.pst";
2273 if (stat $path) {
2274 cf::sync_job {
2275 my $pst = Storable::retrieve $path;
2276
2277 cf::db_put (board => data => $pst->{board});
2278 cf::db_put (guildrules => data => $pst->{guildrules});
2279 cf::db_put (rent => balance => $pst->{rent}{balance});
2280 BDB::db_env_txn_checkpoint $DB_ENV;
2281
2282 unlink $path;
2283 };
2284 }
2285 }
2286}
2287
2288sub db_get($$) {
2289 my $key = "$_[0]/$_[1]";
2290
2291 cf::sync_job {
2292 BDB::db_get $DB, undef, $key, my $data;
2293
2294 $! ? ()
2295 : Compress::LZF::sthaw $data
2296 }
2297}
2298
2299sub db_put($$$) {
2300 BDB::dbreq_pri 4;
2301 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2302}
2303
2304#############################################################################
2305# the server's init and main functions 2672# the server's init and main functions
2306 2673
2307sub load_facedata { 2674sub load_facedata($) {
2308 my $path = sprintf "%s/facedata", cf::datadir; 2675 my ($path) = @_;
2309 2676
2310 warn "loading facedata from $path\n"; 2677 warn "loading facedata from $path\n";
2311 2678
2312 my $faces; 2679 my $facedata;
2313 0 < aio_load $path, $faces 2680 0 < aio_load $path, $facedata
2314 or die "$path: $!"; 2681 or die "$path: $!";
2315 2682
2316 Coro::cede;
2317 $faces = Storable::thaw $faces; 2683 $facedata = Coro::Storable::thaw $facedata;
2318 Coro::cede;
2319 2684
2320 my $meta = delete $faces->{""};
2321 $meta->{version} == 1 2685 $facedata->{version} == 2
2322 or cf::cleanup "$path: version mismatch, cannot proceed."; 2686 or cf::cleanup "$path: version mismatch, cannot proceed.";
2323 2687
2688 {
2689 my $faces = $facedata->{faceinfo};
2690
2324 while (my ($face, $info) = each %$faces) { 2691 while (my ($face, $info) = each %$faces) {
2325 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2692 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2326 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2693 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2327 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2694 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2328 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2695 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2329 Coro::cede; 2696 Coro::cede;
2330 } 2697 }
2331 2698
2332 while (my ($face, $info) = each %$faces) { 2699 while (my ($face, $info) = each %$faces) {
2333 next unless $info->{smooth}; 2700 next unless $info->{smooth};
2334 my $idx = cf::face::find $face 2701 my $idx = cf::face::find $face
2335 or next; 2702 or next;
2336 if (my $smooth = cf::face::find $info->{smooth}) { 2703 if (my $smooth = cf::face::find $info->{smooth}) {
2337 cf::face::set_smooth $idx, $smooth; 2704 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2338 } else { 2705 } else {
2339 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2706 warn "smooth face '$info->{smooth}' not found for face '$face'";
2340 } 2707 }
2341 Coro::cede; 2708 Coro::cede;
2709 }
2710 }
2711
2712 {
2713 my $anims = $facedata->{animinfo};
2714
2715 while (my ($anim, $info) = each %$anims) {
2716 cf::anim::set $anim, $info->{frames}, $info->{facings};
2717 Coro::cede;
2718 }
2719
2720 cf::anim::invalidate_all; # d'oh
2342 } 2721 }
2343 2722
2344 1 2723 1
2345} 2724}
2346 2725
2726sub reload_regions {
2727 load_resource_file "$MAPDIR/regions"
2728 or die "unable to load regions file\n";
2729}
2730
2731sub reload_facedata {
2732 load_facedata "$DATADIR/facedata"
2733 or die "unable to load facedata\n";
2734}
2735
2736sub reload_archetypes {
2737 load_resource_file "$DATADIR/archetypes"
2738 or die "unable to load archetypes\n";
2739 #d# NEED to laod twice to resolve forward references
2740 # this really needs to be done in an extra post-pass
2741 # (which needs to be synchronous, so solve it differently)
2742 load_resource_file "$DATADIR/archetypes"
2743 or die "unable to load archetypes\n";
2744}
2745
2746sub reload_treasures {
2747 load_resource_file "$DATADIR/treasures"
2748 or die "unable to load treasurelists\n";
2749}
2750
2347sub reload_resources { 2751sub reload_resources {
2348 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2752 warn "reloading resource files...\n";
2349 or die "unable to load regions file\n";#d# 2753
2754 reload_regions;
2350 load_facedata 2755 reload_facedata;
2351 or die "unable to load facedata\n";#d# 2756 #reload_archetypes;#d#
2757 reload_archetypes;
2758 reload_treasures;
2759
2760 warn "finished reloading resource files\n";
2352} 2761}
2353 2762
2354sub init { 2763sub init {
2355 reload_resources; 2764 reload_resources;
2356} 2765}
2357 2766
2358sub cfg_load { 2767sub cfg_load {
2359 open my $fh, "<:utf8", cf::confdir . "/config" 2768 open my $fh, "<:utf8", "$CONFDIR/config"
2360 or return; 2769 or return;
2361 2770
2362 local $/; 2771 local $/;
2363 *CFG = YAML::Syck::Load <$fh>; 2772 *CFG = YAML::Syck::Load <$fh>;
2364 2773
2409 }, 2818 },
2410 ); 2819 );
2411 } 2820 }
2412} 2821}
2413 2822
2823sub write_runtime {
2824 my $runtime = "$LOCALDIR/runtime";
2825
2826 # first touch the runtime file to show we are still running:
2827 # the fsync below can take a very very long time.
2828
2829 IO::AIO::aio_utime $runtime, undef, undef;
2830
2831 my $guard = cf::lock_acquire "write_runtime";
2832
2833 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2834 or return;
2835
2836 my $value = $cf::RUNTIME + 90 + 10;
2837 # 10 is the runtime save interval, for a monotonic clock
2838 # 60 allows for the watchdog to kill the server.
2839
2840 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2841 and return;
2842
2843 # always fsync - this file is important
2844 aio_fsync $fh
2845 and return;
2846
2847 # touch it again to show we are up-to-date
2848 aio_utime $fh, undef, undef;
2849
2850 close $fh
2851 or return;
2852
2853 aio_rename "$runtime~", $runtime
2854 and return;
2855
2856 warn "runtime file written.\n";
2857
2858 1
2859}
2860
2414sub emergency_save() { 2861sub emergency_save() {
2415 my $freeze_guard = cf::freeze_mainloop; 2862 my $freeze_guard = cf::freeze_mainloop;
2416 2863
2417 warn "enter emergency perl save\n"; 2864 warn "enter emergency perl save\n";
2418 2865
2449 2896
2450 warn Carp::longmess "post_cleanup backtrace" 2897 warn Carp::longmess "post_cleanup backtrace"
2451 if $make_core; 2898 if $make_core;
2452} 2899}
2453 2900
2454sub reload() { 2901sub do_reload_perl() {
2455 # can/must only be called in main 2902 # can/must only be called in main
2456 if ($Coro::current != $Coro::main) { 2903 if ($Coro::current != $Coro::main) {
2457 warn "can only reload from main coroutine"; 2904 warn "can only reload from main coroutine";
2458 return; 2905 return;
2459 } 2906 }
2493 %EXT_CORO = (); 2940 %EXT_CORO = ();
2494 2941
2495 warn "removing commands"; 2942 warn "removing commands";
2496 %COMMAND = (); 2943 %COMMAND = ();
2497 2944
2498 warn "removing ext commands"; 2945 warn "removing ext/exti commands";
2499 %EXTCMD = (); 2946 %EXTCMD = ();
2947 %EXTICMD = ();
2500 2948
2501 warn "unloading/nuking all extensions"; 2949 warn "unloading/nuking all extensions";
2502 for my $pkg (@EXTS) { 2950 for my $pkg (@EXTS) {
2503 warn "... unloading $pkg"; 2951 warn "... unloading $pkg";
2504 2952
2534 Symbol::delete_package "safe::$_" 2982 Symbol::delete_package "safe::$_"
2535 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2983 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2536 2984
2537 warn "unloading cf.pm \"a bit\""; 2985 warn "unloading cf.pm \"a bit\"";
2538 delete $INC{"cf.pm"}; 2986 delete $INC{"cf.pm"};
2987 delete $INC{"cf/pod.pm"};
2539 2988
2540 # don't, removes xs symbols, too, 2989 # don't, removes xs symbols, too,
2541 # and global variables created in xs 2990 # and global variables created in xs
2542 #Symbol::delete_package __PACKAGE__; 2991 #Symbol::delete_package __PACKAGE__;
2543 2992
2558 warn "reattaching attachments to maps"; 3007 warn "reattaching attachments to maps";
2559 reattach $_ for values %MAP; 3008 reattach $_ for values %MAP;
2560 warn "reattaching attachments to players"; 3009 warn "reattaching attachments to players";
2561 reattach $_ for values %PLAYER; 3010 reattach $_ for values %PLAYER;
2562 3011
2563 warn "loading reloadable resources";
2564 reload_resources;
2565
2566 warn "leaving sync_job"; 3012 warn "leaving sync_job";
2567 3013
2568 1 3014 1
2569 } or do { 3015 } or do {
2570 warn $@; 3016 warn $@;
2575 warn "reloaded"; 3021 warn "reloaded";
2576}; 3022};
2577 3023
2578our $RELOAD_WATCHER; # used only during reload 3024our $RELOAD_WATCHER; # used only during reload
2579 3025
3026sub reload_perl() {
3027 # doing reload synchronously and two reloads happen back-to-back,
3028 # coro crashes during coro_state_free->destroy here.
3029
3030 $RELOAD_WATCHER ||= Event->timer (
3031 reentrant => 0,
3032 after => 0,
3033 data => WF_AUTOCANCEL,
3034 cb => sub {
3035 do_reload_perl;
3036 undef $RELOAD_WATCHER;
3037 },
3038 );
3039}
3040
2580register_command "reload" => sub { 3041register_command "reload" => sub {
2581 my ($who, $arg) = @_; 3042 my ($who, $arg) = @_;
2582 3043
2583 if ($who->flag (FLAG_WIZ)) { 3044 if ($who->flag (FLAG_WIZ)) {
2584 $who->message ("reloading server."); 3045 $who->message ("reloading server.");
2585 3046 async { reload_perl };
2586 # doing reload synchronously and two reloads happen back-to-back,
2587 # coro crashes during coro_state_free->destroy here.
2588
2589 $RELOAD_WATCHER ||= Event->timer (
2590 reentrant => 0,
2591 after => 0,
2592 data => WF_AUTOCANCEL,
2593 cb => sub {
2594 reload;
2595 undef $RELOAD_WATCHER;
2596 },
2597 );
2598 } 3047 }
2599}; 3048};
2600 3049
2601unshift @INC, $LIBDIR; 3050unshift @INC, $LIBDIR;
2602 3051
2603my $bug_warning = 0; 3052my $bug_warning = 0;
2604 3053
3054our @WAIT_FOR_TICK;
3055our @WAIT_FOR_TICK_BEGIN;
3056
3057sub wait_for_tick {
3058 return unless $TICK_WATCHER->is_active;
3059 return if $Coro::current == $Coro::main;
3060
3061 my $signal = new Coro::Signal;
3062 push @WAIT_FOR_TICK, $signal;
3063 $signal->wait;
3064}
3065
3066sub wait_for_tick_begin {
3067 return unless $TICK_WATCHER->is_active;
3068 return if $Coro::current == $Coro::main;
3069
3070 my $signal = new Coro::Signal;
3071 push @WAIT_FOR_TICK_BEGIN, $signal;
3072 $signal->wait;
3073}
3074
3075 my $min = 1e6;#d#
3076 my $avg = 10;
2605$TICK_WATCHER = Event->timer ( 3077$TICK_WATCHER = Event->timer (
2606 reentrant => 0, 3078 reentrant => 0,
2607 parked => 1, 3079 parked => 1,
2608 prio => 0, 3080 prio => 0,
2609 at => $NEXT_TICK || $TICK, 3081 at => $NEXT_TICK || $TICK,
2613 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3085 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2614 unless ++$bug_warning > 10; 3086 unless ++$bug_warning > 10;
2615 return; 3087 return;
2616 } 3088 }
2617 3089
2618 $NOW = Event::time; 3090 $NOW = $tick_start = Event::time;
2619 3091
2620 cf::server_tick; # one server iteration 3092 cf::server_tick; # one server iteration
3093
3094 0 && sync_job {#d#
3095 for(1..10) {
3096 my $t = Event::time;
3097 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3098 or die;
3099
3100 $map->width (50);
3101 $map->height (50);
3102 $map->alloc;
3103 $map->_load_objects ("/tmp/x.map", 1);
3104 my $t = Event::time - $t;
3105
3106 #next unless $t < 0.0013;#d#
3107 if ($t < $min) {
3108 $min = $t;
3109 }
3110 $avg = $avg * 0.99 + $t * 0.01;
3111 }
3112 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3113 exit 0;
3114 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3115 };
3116
2621 $RUNTIME += $TICK; 3117 $RUNTIME += $TICK;
2622 $NEXT_TICK += $TICK; 3118 $NEXT_TICK += $TICK;
2623 3119
2624 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3120 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2625 $NEXT_RUNTIME_WRITE = $NOW + 10; 3121 $NEXT_RUNTIME_WRITE = $NOW + 10;
2627 write_runtime 3123 write_runtime
2628 or warn "ERROR: unable to write runtime file: $!"; 3124 or warn "ERROR: unable to write runtime file: $!";
2629 }; 3125 };
2630 } 3126 }
2631 3127
2632 $WAIT_FOR_TICK->broadcast;
2633 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2634
2635# my $AFTER = Event::time; 3128# my $AFTER = Event::time;
2636# warn $AFTER - $NOW;#d# 3129# warn $AFTER - $NOW;#d#
2637 3130
3131 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3132 $sig->send;
3133 }
3134 while (my $sig = shift @WAIT_FOR_TICK) {
3135 $sig->send;
3136 }
3137
3138 $NOW = Event::time;
3139
2638 # if we are delayed by four ticks or more, skip them all 3140 # if we are delayed by four ticks or more, skip them all
2639 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3141 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2640 3142
2641 $TICK_WATCHER->at ($NEXT_TICK); 3143 $TICK_WATCHER->at ($NEXT_TICK);
2642 $TICK_WATCHER->start; 3144 $TICK_WATCHER->start;
3145
3146 $LOAD = ($NOW - $tick_start) / $TICK;
3147 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3148
3149 _post_tick;
3150
3151
2643 }, 3152 },
2644); 3153);
2645 3154
2646{ 3155{
2647 BDB::max_poll_time $TICK * 0.1; 3156 BDB::max_poll_time $TICK * 0.1;
2675 3184
2676 cf::sync_job { 3185 cf::sync_job {
2677 eval { 3186 eval {
2678 BDB::db_env_open 3187 BDB::db_env_open
2679 $DB_ENV, 3188 $DB_ENV,
2680 $BDB_ENV_DIR, 3189 $BDBDIR,
2681 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3190 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2682 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3191 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2683 0666; 3192 0666;
2684 3193
2685 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3194 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2686 3195
2687 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3196 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2688 $DB_ENV->set_lk_detect; 3197 $DB_ENV->set_lk_detect;
2689 }; 3198 };
2690 3199
2706 prio => 6, 3215 prio => 6,
2707 cb => \&IO::AIO::poll_cb, 3216 cb => \&IO::AIO::poll_cb,
2708 ); 3217 );
2709} 3218}
2710 3219
3220my $_log_backtrace;
3221
3222sub _log_backtrace {
3223 my ($msg, @addr) = @_;
3224
3225 $msg =~ s/\n//;
3226
3227 # limit the # of concurrent backtraces
3228 if ($_log_backtrace < 2) {
3229 ++$_log_backtrace;
3230 async {
3231 my @bt = fork_call {
3232 @addr = map { sprintf "%x", $_ } @addr;
3233 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3234 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3235 or die "addr2line: $!";
3236
3237 my @funcs;
3238 my @res = <$fh>;
3239 chomp for @res;
3240 while (@res) {
3241 my ($func, $line) = splice @res, 0, 2, ();
3242 push @funcs, "[$func] $line";
3243 }
3244
3245 @funcs
3246 };
3247
3248 LOG llevInfo, "[ABT] $msg\n";
3249 LOG llevInfo, "[ABT] $_\n" for @bt;
3250 --$_log_backtrace;
3251 };
3252 } else {
3253 LOG llevInfo, "[ABT] $msg\n";
3254 LOG llevInfo, "[ABT] [suppressed]\n";
3255 }
3256}
3257
3258# load additional modules
3259use cf::pod;
3260
2711END { cf::emergency_save } 3261END { cf::emergency_save }
2712 3262
27131 32631
2714 3264

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines