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.235 by root, Tue Apr 10 09:35:23 2007 UTC vs.
Revision 1.288 by root, Mon Jun 25 07:40:53 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->convert_blessed->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) = @_;
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<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1406
1407 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g;
1409
1410 $_
1411}
1412
1136=item $player->ext_reply ($msgid, %msg) 1413=item $player->ext_reply ($msgid, %msg)
1137 1414
1138Sends an ext reply to the player. 1415Sends an ext reply to the player.
1139 1416
1140=cut 1417=cut
1141 1418
1142sub ext_reply($$%) { 1419sub ext_reply($$%) {
1143 my ($self, $id, %msg) = @_; 1420 my ($self, $id, %msg) = @_;
1144 1421
1145 $msg{msgid} = $id; 1422 $msg{msgid} = $id;
1146
1147 $self->send ("ext " . cf::to_json \%msg); 1423 $self->send ("ext " . cf::to_json \%msg);
1148} 1424}
1149 1425
1150=item $player->ext_event ($type, %msg) 1426=item $player->ext_event ($type, %msg)
1151 1427
1157 my ($self, $type, %msg) = @_; 1433 my ($self, $type, %msg) = @_;
1158 1434
1159 $self->ns->ext_event ($type, %msg); 1435 $self->ns->ext_event ($type, %msg);
1160} 1436}
1161 1437
1162package cf; 1438=head3 cf::region
1439
1440=over 4
1441
1442=cut
1443
1444package cf::region;
1445
1446=item cf::region::find_by_path $path
1447
1448Tries to decuce the likely region for a map knowing only its path.
1449
1450=cut
1451
1452sub find_by_path($) {
1453 my ($path) = @_;
1454
1455 my ($match, $specificity);
1456
1457 for my $region (list) {
1458 if ($region->match && $path =~ $region->match) {
1459 ($match, $specificity) = ($region, $region->specificity)
1460 if $region->specificity > $specificity;
1461 }
1462 }
1463
1464 $match
1465}
1163 1466
1164=back 1467=back
1165
1166 1468
1167=head3 cf::map 1469=head3 cf::map
1168 1470
1169=over 4 1471=over 4
1170 1472
1225 my ($self, $merge) = @_; 1527 my ($self, $merge) = @_;
1226 1528
1227 # we have to keep some variables in memory intact 1529 # we have to keep some variables in memory intact
1228 local $self->{path}; 1530 local $self->{path};
1229 local $self->{load_path}; 1531 local $self->{load_path};
1230 local $self->{deny_save};
1231 local $self->{deny_reset};
1232 1532
1233 $self->SUPER::thawer_merge ($merge); 1533 $self->SUPER::thawer_merge ($merge);
1234} 1534}
1235 1535
1236sub normalise { 1536sub normalise {
1308 1608
1309# the original (read-only) location 1609# the original (read-only) location
1310sub load_path { 1610sub load_path {
1311 my ($self) = @_; 1611 my ($self) = @_;
1312 1612
1313 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1613 "$MAPDIR/$self->{path}.map"
1314} 1614}
1315 1615
1316# the temporary/swap location 1616# the temporary/swap location
1317sub save_path { 1617sub save_path {
1318 my ($self) = @_; 1618 my ($self) = @_;
1319 1619
1320 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1620 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1321 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1621 "$TMPDIR/$path.map"
1322} 1622}
1323 1623
1324# the unique path, undef == no special unique path 1624# the unique path, undef == no special unique path
1325sub uniq_path { 1625sub uniq_path {
1326 my ($self) = @_; 1626 my ($self) = @_;
1327 1627
1328 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1628 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1329 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1629 "$UNIQUEDIR/$path"
1330} 1630}
1331 1631
1332# and all this just because we cannot iterate over 1632# and all this just because we cannot iterate over
1333# all maps in C++... 1633# all maps in C++...
1334sub change_all_map_light { 1634sub change_all_map_light {
1335 my ($change) = @_; 1635 my ($change) = @_;
1336 1636
1337 $_->change_map_light ($change) 1637 $_->change_map_light ($change)
1338 for grep $_->outdoor, values %cf::MAP; 1638 for grep $_->outdoor, values %cf::MAP;
1639}
1640
1641sub decay_objects {
1642 my ($self) = @_;
1643
1644 return if $self->{deny_reset};
1645
1646 $self->do_decay_objects;
1339} 1647}
1340 1648
1341sub unlink_save { 1649sub unlink_save {
1342 my ($self) = @_; 1650 my ($self) = @_;
1343 1651
1401 $self->load_header_orig 1709 $self->load_header_orig
1402 or return; 1710 or return;
1403 $self->prepare_orig; 1711 $self->prepare_orig;
1404 } 1712 }
1405 1713
1714 $self->{deny_reset} = 1
1715 if $self->no_reset;
1716
1717 $self->default_region (cf::region::find_by_path $self->{path})
1718 unless $self->default_region;
1719
1406 1 1720 1
1407} 1721}
1408 1722
1409sub find; 1723sub find;
1410sub find { 1724sub find {
1422 $map->{last_save} = $cf::RUNTIME; 1736 $map->{last_save} = $cf::RUNTIME;
1423 1737
1424 $map->load_header 1738 $map->load_header
1425 or return; 1739 or return;
1426 1740
1427 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1741 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1428 # doing this can freeze the server in a sync job, obviously 1742 # doing this can freeze the server in a sync job, obviously
1429 #$cf::WAIT_FOR_TICK->wait; 1743 #$cf::WAIT_FOR_TICK->wait;
1430 $map->reset; 1744 $map->reset;
1431 undef $guard; 1745 undef $guard;
1432 return find $path; 1746 return find $path;
1443 my ($self) = @_; 1757 my ($self) = @_;
1444 1758
1445 local $self->{deny_reset} = 1; # loading can take a long time 1759 local $self->{deny_reset} = 1; # loading can take a long time
1446 1760
1447 my $path = $self->{path}; 1761 my $path = $self->{path};
1762
1763 {
1448 my $guard = cf::lock_acquire "map_load:$path"; 1764 my $guard = cf::lock_acquire "map_load:$path";
1449 1765
1450 return if $self->in_memory != cf::MAP_SWAPPED; 1766 return if $self->in_memory != cf::MAP_SWAPPED;
1451 1767
1452 $self->in_memory (cf::MAP_LOADING); 1768 $self->in_memory (cf::MAP_LOADING);
1453 1769
1454 $self->alloc; 1770 $self->alloc;
1455 1771
1456 $self->pre_load; 1772 $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; 1773 Coro::cede;
1482 $self->set_darkness_map; 1774
1775 $self->_load_objects ($self->{load_path}, 1)
1776 or return;
1777
1778 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1779 if delete $self->{load_original};
1780
1781 if (my $uniq = $self->uniq_path) {
1782 utf8::encode $uniq;
1783 if (aio_open $uniq, O_RDONLY, 0) {
1784 $self->clear_unique_items;
1785 $self->_load_objects ($uniq, 0);
1786 }
1787 }
1788
1789 Coro::cede;
1790 # now do the right thing for maps
1791 $self->link_multipart_objects;
1483 $self->difficulty ($self->estimate_difficulty) 1792 $self->difficulty ($self->estimate_difficulty)
1484 unless $self->difficulty; 1793 unless $self->difficulty;
1485 Coro::cede; 1794 Coro::cede;
1795
1796 unless ($self->{deny_activate}) {
1797 $self->decay_objects;
1798 $self->fix_auto_apply;
1799 $self->update_buttons;
1800 Coro::cede;
1801 $self->set_darkness_map;
1802 Coro::cede;
1486 $self->activate; 1803 $self->activate;
1804 }
1805
1806 $self->in_memory (cf::MAP_IN_MEMORY);
1487 } 1807 }
1488 1808
1489 $self->post_load; 1809 $self->post_load;
1490
1491 $self->in_memory (cf::MAP_IN_MEMORY);
1492} 1810}
1493 1811
1494sub customise_for { 1812sub customise_for {
1495 my ($self, $ob) = @_; 1813 my ($self, $ob) = @_;
1496 1814
1497 return find "~" . $ob->name . "/" . $self->{path} 1815 return find "~" . $ob->name . "/" . $self->{path}
1498 if $self->per_player; 1816 if $self->per_player;
1817
1818# return find "?party/" . $ob->name . "/" . $self->{path}
1819# if $self->per_party;
1499 1820
1500 $self 1821 $self
1501} 1822}
1502 1823
1503# find and load all maps in the 3x3 area around a map 1824# find and load all maps in the 3x3 area around a map
1614 1935
1615sub reset_at { 1936sub reset_at {
1616 my ($self) = @_; 1937 my ($self) = @_;
1617 1938
1618 # TODO: safety, remove and allow resettable per-player maps 1939 # 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}; 1940 return 1e99 if $self->{deny_reset};
1621 1941
1622 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1942 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1623 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1943 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1624 1944
1635 my ($self) = @_; 1955 my ($self) = @_;
1636 1956
1637 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1957 my $lock = cf::lock_acquire "map_data:$self->{path}";
1638 1958
1639 return if $self->players; 1959 return if $self->players;
1640 return if $self->isa ("ext::map_per_player");#d#
1641 1960
1642 warn "resetting map ", $self->path;#d# 1961 warn "resetting map ", $self->path;
1643 1962
1644 $self->in_memory (cf::MAP_SWAPPED); 1963 $self->in_memory (cf::MAP_SWAPPED);
1645 1964
1646 # need to save uniques path 1965 # need to save uniques path
1647 unless ($self->{deny_save}) { 1966 unless ($self->{deny_save}) {
1679 $cf::MAP{$self->path} = $self; 1998 $cf::MAP{$self->path} = $self;
1680 1999
1681 $self->reset; # polite request, might not happen 2000 $self->reset; # polite request, might not happen
1682} 2001}
1683 2002
2003=item $maps = cf::map::tmp_maps
2004
2005Returns an arrayref with all map paths of currently instantiated and saved
2006maps. May block.
2007
2008=cut
2009
2010sub tmp_maps() {
2011 [
2012 map {
2013 utf8::decode $_;
2014 /\.map$/
2015 ? normalise $_
2016 : ()
2017 } @{ aio_readdir $TMPDIR or [] }
2018 ]
2019}
2020
2021=item $maps = cf::map::random_maps
2022
2023Returns an arrayref with all map paths of currently instantiated and saved
2024random maps. May block.
2025
2026=cut
2027
2028sub random_maps() {
2029 [
2030 map {
2031 utf8::decode $_;
2032 /\.map$/
2033 ? normalise "?random/$_"
2034 : ()
2035 } @{ aio_readdir $RANDOMDIR or [] }
2036 ]
2037}
2038
1684=item cf::map::unique_maps 2039=item cf::map::unique_maps
1685 2040
1686Returns an arrayref of paths of all shared maps that have 2041Returns an arrayref of paths of all shared maps that have
1687instantiated unique items. May block. 2042instantiated unique items. May block.
1688 2043
1689=cut 2044=cut
1690 2045
1691sub unique_maps() { 2046sub unique_maps() {
1692 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2047 [
1693 or return; 2048 map {
1694
1695 my @paths;
1696
1697 for (@$files) {
1698 utf8::decode $_; 2049 utf8::decode $_;
1699 next if /\.pst$/; 2050 /\.map$/
1700 next unless /^$PATH_SEP/o; 2051 ? normalise $_
1701 2052 : ()
1702 push @paths, cf::map::normalise $_; 2053 } @{ aio_readdir $UNIQUEDIR or [] }
1703 } 2054 ]
1704
1705 \@paths
1706} 2055}
1707 2056
1708package cf; 2057package cf;
1709 2058
1710=back 2059=back
1756 2105
1757 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2106 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1758 2107
1759 if ($self->{record_replies}) { 2108 if ($self->{record_replies}) {
1760 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2109 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2110
1761 } else { 2111 } else {
2112 my $pl = $self->contr;
2113
2114 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115 my $diag = $pl->{npc_dialog};
2116 $diag->{pl}->ext_reply (
2117 $diag->{id},
2118 msgtype => "reply",
2119 msg => $diag->{pl}->expand_cfpod ($msg),
2120 add_topics => []
2121 );
2122
2123 } else {
1762 $msg = $npc->name . " says: $msg" if $npc; 2124 $msg = $npc->name . " says: $msg" if $npc;
1763 $self->message ($msg, $flags); 2125 $self->message ($msg, $flags);
2126 }
1764 } 2127 }
1765} 2128}
1766 2129
1767=item $player_object->may ("access") 2130=item $player_object->may ("access")
1768 2131
1816 $self->deactivate_recursive; 2179 $self->deactivate_recursive;
1817 2180
1818 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2181 return if UNIVERSAL::isa $self->map, "ext::map_link";
1819 2182
1820 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2183 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1821 if $self->map; 2184 if $self->map && $self->map->{path} ne "{link}";
1822 2185
1823 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2186 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1824} 2187}
1825 2188
1826sub cf::object::player::leave_link { 2189sub cf::object::player::leave_link {
1827 my ($self, $map, $x, $y) = @_; 2190 my ($self, $map, $x, $y) = @_;
2191
2192 return unless $self->contr->active;
1828 2193
1829 my $link_pos = delete $self->{_link_pos}; 2194 my $link_pos = delete $self->{_link_pos};
1830 2195
1831 unless ($map) { 2196 unless ($map) {
1832 # restore original map position 2197 # restore original map position
1855 2220
1856 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1857 $self->enter_map ($map, $x, $y); 2222 $self->enter_map ($map, $x, $y);
1858} 2223}
1859 2224
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) 2225=item $player_object->goto ($path, $x, $y[, $check->($map)])
1893 2226
2227Moves the player to the given map-path and coordinates by first freezing
2228her, loading and preparing them map, calling the provided $check callback
2229that has to return the map if sucecssful, and then unfreezes the player on
2230the new (success) or old (failed) map position.
2231
1894=cut 2232=cut
2233
2234our $GOTOGEN;
1895 2235
1896sub cf::object::player::goto { 2236sub cf::object::player::goto {
1897 my ($self, $path, $x, $y) = @_; 2237 my ($self, $path, $x, $y, $check) = @_;
2238
2239 # do generation counting so two concurrent goto's will be executed in-order
2240 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1898 2241
1899 $self->enter_link; 2242 $self->enter_link;
1900 2243
1901 (async { 2244 (async {
1902 my $map = eval { 2245 my $map = eval {
1903 my $map = cf::map::find $path; 2246 my $map = cf::map::find $path;
2247
2248 if ($map) {
1904 $map = $map->customise_for ($self) if $map; 2249 $map = $map->customise_for ($self);
2250 $map = $check->($map) if $check && $map;
2251 } else {
2252 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2253 }
2254
1905 $map 2255 $map
2256 };
2257
2258 if ($@) {
2259 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2260 LOG llevError | logBacktrace, Carp::longmess $@;
1906 } or 2261 }
1907 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1908 2262
2263 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation};
1909 $self->leave_link ($map, $x, $y); 2265 $self->leave_link ($map, $x, $y);
2266 }
1910 })->prio (1); 2267 })->prio (1);
1911} 2268}
1912 2269
1913=item $player_object->enter_exit ($exit_object) 2270=item $player_object->enter_exit ($exit_object)
1914 2271
1953 2310
1954 $rmp->{random_seed} ||= $exit->random_seed; 2311 $rmp->{random_seed} ||= $exit->random_seed;
1955 2312
1956 my $data = cf::to_json $rmp; 2313 my $data = cf::to_json $rmp;
1957 my $md5 = Digest::MD5::md5_hex $data; 2314 my $md5 = Digest::MD5::md5_hex $data;
1958 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2315 my $meta = "$RANDOMDIR/$md5.meta";
1959 2316
1960 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2317 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1961 aio_write $fh, 0, (length $data), $data, 0; 2318 aio_write $fh, 0, (length $data), $data, 0;
1962 undef $fh; 2319 undef $fh;
1963 aio_rename "$meta~", $meta; 2320 aio_rename "$meta~", $meta;
2019 2376
2020 utf8::encode $text; 2377 utf8::encode $text;
2021 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2378 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2022} 2379}
2023 2380
2381=item $client->send_msg ($color, $type, $msg, [extra...])
2382
2383Send a drawinfo or msg packet to the client, formatting the msg for the
2384client if neccessary. C<$type> should be a string identifying the type of
2385the message, with C<log> being the default. If C<$color> is negative, suppress
2386the message unless the client supports the msg packet.
2387
2388=cut
2389
2390sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_;
2392
2393 $msg = $self->pl->expand_cfpod ($msg);
2394
2395 if ($self->can_msg) {
2396 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);
2397 } else {
2398 # replace some tags by gcfclient-compatible ones
2399 for ($msg) {
2400 1 while
2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406 }
2407
2408 if ($color >= 0) {
2409 if (0 && $msg =~ /\[/) {
2410 $self->send_packet ("drawextinfo $color 4 0 $msg")
2411 } else {
2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2413 $self->send_packet ("drawinfo $color $msg")
2414 }
2415 }
2416 }
2417}
2418
2024=item $client->ext_event ($type, %msg) 2419=item $client->ext_event ($type, %msg)
2025 2420
2026Sends an exti event to the client. 2421Sends an ext event to the client.
2027 2422
2028=cut 2423=cut
2029 2424
2030sub cf::client::ext_event($$%) { 2425sub cf::client::ext_event($$%) {
2031 my ($self, $type, %msg) = @_; 2426 my ($self, $type, %msg) = @_;
2038 2433
2039Queues a query to the client, calling the given callback with 2434Queues a query to the client, calling the given callback with
2040the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2435the 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>. 2436C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2042 2437
2043Queries can fail, so check the return code. Or don't, as queries will become 2438Queries can fail, so check the return code. Or don't, as queries will
2044reliable at some point in the future. 2439become reliable at some point in the future.
2045 2440
2046=cut 2441=cut
2047 2442
2048sub cf::client::query { 2443sub cf::client::query {
2049 my ($self, $flags, $text, $cb) = @_; 2444 my ($self, $flags, $text, $cb) = @_;
2057 utf8::encode $text; 2452 utf8::encode $text;
2058 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2453 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2059 2454
2060 $self->send_packet ($self->{query_queue}[0][0]) 2455 $self->send_packet ($self->{query_queue}[0][0])
2061 if @{ $self->{query_queue} } == 1; 2456 if @{ $self->{query_queue} } == 1;
2457
2458 1
2062} 2459}
2063 2460
2064cf::client->attach ( 2461cf::client->attach (
2065 on_reply => sub { 2462 on_reply => sub {
2066 my ($ns, $msg) = @_; 2463 my ($ns, $msg) = @_;
2080 $ns->send_packet ($ns->{query_queue}[0][0]); 2477 $ns->send_packet ($ns->{query_queue}[0][0]);
2081 } else { 2478 } else {
2082 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2479 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2083 } 2480 }
2084 } 2481 }
2482 },
2483 on_exticmd => sub {
2484 my ($ns, $buf) = @_;
2485
2486 my $msg = eval { from_json $buf };
2487
2488 if (ref $msg) {
2489 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2490 if (my %reply = $cb->($ns, $msg)) {
2491 $reply{msgid} = $msg->{msgid};
2492 $ns->send ("ext " . cf::to_json \%reply);
2493 }
2494 }
2495 } else {
2496 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2497 }
2498
2499 cf::override;
2085 }, 2500 },
2086); 2501);
2087 2502
2088=item $client->async (\&cb) 2503=item $client->async (\&cb)
2089 2504
2228=back 2643=back
2229 2644
2230=cut 2645=cut
2231 2646
2232############################################################################# 2647#############################################################################
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 2648# the server's init and main functions
2306 2649
2307sub load_facedata { 2650sub load_facedata($) {
2308 my $path = sprintf "%s/facedata", cf::datadir; 2651 my ($path) = @_;
2309 2652
2310 warn "loading facedata from $path\n"; 2653 warn "loading facedata from $path\n";
2311 2654
2312 my $faces; 2655 my $facedata;
2313 0 < aio_load $path, $faces 2656 0 < aio_load $path, $facedata
2314 or die "$path: $!"; 2657 or die "$path: $!";
2315 2658
2316 Coro::cede;
2317 $faces = Storable::thaw $faces; 2659 $facedata = Coro::Storable::thaw $facedata;
2318 Coro::cede;
2319 2660
2320 my $meta = delete $faces->{""};
2321 $meta->{version} == 1 2661 $facedata->{version} == 2
2322 or cf::cleanup "$path: version mismatch, cannot proceed."; 2662 or cf::cleanup "$path: version mismatch, cannot proceed.";
2323 2663
2664 {
2665 my $faces = $facedata->{faceinfo};
2666
2324 while (my ($face, $info) = each %$faces) { 2667 while (my ($face, $info) = each %$faces) {
2325 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2668 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2326 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2669 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2327 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2670 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2328 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2671 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2329 Coro::cede; 2672 Coro::cede;
2330 } 2673 }
2331 2674
2332 while (my ($face, $info) = each %$faces) { 2675 while (my ($face, $info) = each %$faces) {
2333 next unless $info->{smooth}; 2676 next unless $info->{smooth};
2334 my $idx = cf::face::find $face 2677 my $idx = cf::face::find $face
2335 or next; 2678 or next;
2336 if (my $smooth = cf::face::find $info->{smooth}) { 2679 if (my $smooth = cf::face::find $info->{smooth}) {
2337 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2680 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2338 } else { 2681 } else {
2339 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2682 warn "smooth face '$info->{smooth}' not found for face '$face'";
2340 } 2683 }
2341 Coro::cede; 2684 Coro::cede;
2685 }
2686 }
2687
2688 {
2689 my $anims = $facedata->{animinfo};
2690
2691 while (my ($anim, $info) = each %$anims) {
2692 cf::anim::set $anim, $info->{frames}, $info->{facings};
2693 Coro::cede;
2694 }
2695
2696 cf::anim::invalidate_all; # d'oh
2342 } 2697 }
2343 2698
2344 1 2699 1
2345} 2700}
2346 2701
2702sub reload_regions {
2703 load_resource_file "$MAPDIR/regions"
2704 or die "unable to load regions file\n";
2705}
2706
2707sub reload_facedata {
2708 load_facedata "$DATADIR/facedata"
2709 or die "unable to load facedata\n";
2710}
2711
2712sub reload_archetypes {
2713 load_resource_file "$DATADIR/archetypes"
2714 or die "unable to load archetypes\n";
2715}
2716
2717sub reload_treasures {
2718 load_resource_file "$DATADIR/treasures"
2719 or die "unable to load treasurelists\n";
2720}
2721
2347sub reload_resources { 2722sub reload_resources {
2348 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2723 warn "reloading resource files...\n";
2349 or die "unable to load regions file\n";#d# 2724
2725 reload_regions;
2350 load_facedata 2726 reload_facedata;
2351 or die "unable to load facedata\n";#d# 2727 #reload_archetypes;#d#
2728 reload_archetypes;
2729 reload_treasures;
2730
2731 warn "finished reloading resource files\n";
2352} 2732}
2353 2733
2354sub init { 2734sub init {
2355 reload_resources; 2735 reload_resources;
2356} 2736}
2357 2737
2358sub cfg_load { 2738sub cfg_load {
2359 open my $fh, "<:utf8", cf::confdir . "/config" 2739 open my $fh, "<:utf8", "$CONFDIR/config"
2360 or return; 2740 or return;
2361 2741
2362 local $/; 2742 local $/;
2363 *CFG = YAML::Syck::Load <$fh>; 2743 *CFG = YAML::Syck::Load <$fh>;
2364 2744
2409 }, 2789 },
2410 ); 2790 );
2411 } 2791 }
2412} 2792}
2413 2793
2794sub write_runtime {
2795 my $runtime = "$LOCALDIR/runtime";
2796
2797 # first touch the runtime file to show we are still running:
2798 # the fsync below can take a very very long time.
2799
2800 IO::AIO::aio_utime $runtime, undef, undef;
2801
2802 my $guard = cf::lock_acquire "write_runtime";
2803
2804 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2805 or return;
2806
2807 my $value = $cf::RUNTIME + 90 + 10;
2808 # 10 is the runtime save interval, for a monotonic clock
2809 # 60 allows for the watchdog to kill the server.
2810
2811 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2812 and return;
2813
2814 # always fsync - this file is important
2815 aio_fsync $fh
2816 and return;
2817
2818 # touch it again to show we are up-to-date
2819 aio_utime $fh, undef, undef;
2820
2821 close $fh
2822 or return;
2823
2824 aio_rename "$runtime~", $runtime
2825 and return;
2826
2827 warn "runtime file written.\n";
2828
2829 1
2830}
2831
2414sub emergency_save() { 2832sub emergency_save() {
2415 my $freeze_guard = cf::freeze_mainloop; 2833 my $freeze_guard = cf::freeze_mainloop;
2416 2834
2417 warn "enter emergency perl save\n"; 2835 warn "enter emergency perl save\n";
2418 2836
2449 2867
2450 warn Carp::longmess "post_cleanup backtrace" 2868 warn Carp::longmess "post_cleanup backtrace"
2451 if $make_core; 2869 if $make_core;
2452} 2870}
2453 2871
2454sub reload() { 2872sub do_reload_perl() {
2455 # can/must only be called in main 2873 # can/must only be called in main
2456 if ($Coro::current != $Coro::main) { 2874 if ($Coro::current != $Coro::main) {
2457 warn "can only reload from main coroutine"; 2875 warn "can only reload from main coroutine";
2458 return; 2876 return;
2459 } 2877 }
2493 %EXT_CORO = (); 2911 %EXT_CORO = ();
2494 2912
2495 warn "removing commands"; 2913 warn "removing commands";
2496 %COMMAND = (); 2914 %COMMAND = ();
2497 2915
2498 warn "removing ext commands"; 2916 warn "removing ext/exti commands";
2499 %EXTCMD = (); 2917 %EXTCMD = ();
2918 %EXTICMD = ();
2500 2919
2501 warn "unloading/nuking all extensions"; 2920 warn "unloading/nuking all extensions";
2502 for my $pkg (@EXTS) { 2921 for my $pkg (@EXTS) {
2503 warn "... unloading $pkg"; 2922 warn "... unloading $pkg";
2504 2923
2534 Symbol::delete_package "safe::$_" 2953 Symbol::delete_package "safe::$_"
2535 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2954 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2536 2955
2537 warn "unloading cf.pm \"a bit\""; 2956 warn "unloading cf.pm \"a bit\"";
2538 delete $INC{"cf.pm"}; 2957 delete $INC{"cf.pm"};
2958 delete $INC{"cf/pod.pm"};
2539 2959
2540 # don't, removes xs symbols, too, 2960 # don't, removes xs symbols, too,
2541 # and global variables created in xs 2961 # and global variables created in xs
2542 #Symbol::delete_package __PACKAGE__; 2962 #Symbol::delete_package __PACKAGE__;
2543 2963
2558 warn "reattaching attachments to maps"; 2978 warn "reattaching attachments to maps";
2559 reattach $_ for values %MAP; 2979 reattach $_ for values %MAP;
2560 warn "reattaching attachments to players"; 2980 warn "reattaching attachments to players";
2561 reattach $_ for values %PLAYER; 2981 reattach $_ for values %PLAYER;
2562 2982
2563 warn "loading reloadable resources";
2564 reload_resources;
2565
2566 warn "leaving sync_job"; 2983 warn "leaving sync_job";
2567 2984
2568 1 2985 1
2569 } or do { 2986 } or do {
2570 warn $@; 2987 warn $@;
2575 warn "reloaded"; 2992 warn "reloaded";
2576}; 2993};
2577 2994
2578our $RELOAD_WATCHER; # used only during reload 2995our $RELOAD_WATCHER; # used only during reload
2579 2996
2997sub reload_perl() {
2998 # doing reload synchronously and two reloads happen back-to-back,
2999 # coro crashes during coro_state_free->destroy here.
3000
3001 $RELOAD_WATCHER ||= Event->timer (
3002 reentrant => 0,
3003 after => 0,
3004 data => WF_AUTOCANCEL,
3005 cb => sub {
3006 do_reload_perl;
3007 undef $RELOAD_WATCHER;
3008 },
3009 );
3010}
3011
2580register_command "reload" => sub { 3012register_command "reload" => sub {
2581 my ($who, $arg) = @_; 3013 my ($who, $arg) = @_;
2582 3014
2583 if ($who->flag (FLAG_WIZ)) { 3015 if ($who->flag (FLAG_WIZ)) {
2584 $who->message ("reloading server."); 3016 $who->message ("reloading server.");
2585 3017 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 } 3018 }
2599}; 3019};
2600 3020
2601unshift @INC, $LIBDIR; 3021unshift @INC, $LIBDIR;
2602 3022
2603my $bug_warning = 0; 3023my $bug_warning = 0;
2604 3024
3025our @WAIT_FOR_TICK;
3026our @WAIT_FOR_TICK_BEGIN;
3027
3028sub wait_for_tick {
3029 return unless $TICK_WATCHER->is_active;
3030 return if $Coro::current == $Coro::main;
3031
3032 my $signal = new Coro::Signal;
3033 push @WAIT_FOR_TICK, $signal;
3034 $signal->wait;
3035}
3036
3037sub wait_for_tick_begin {
3038 return unless $TICK_WATCHER->is_active;
3039 return if $Coro::current == $Coro::main;
3040
3041 my $signal = new Coro::Signal;
3042 push @WAIT_FOR_TICK_BEGIN, $signal;
3043 $signal->wait;
3044}
3045
3046 my $min = 1e6;#d#
3047 my $avg = 10;
2605$TICK_WATCHER = Event->timer ( 3048$TICK_WATCHER = Event->timer (
2606 reentrant => 0, 3049 reentrant => 0,
2607 parked => 1, 3050 parked => 1,
2608 prio => 0, 3051 prio => 0,
2609 at => $NEXT_TICK || $TICK, 3052 at => $NEXT_TICK || $TICK,
2613 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3056 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2614 unless ++$bug_warning > 10; 3057 unless ++$bug_warning > 10;
2615 return; 3058 return;
2616 } 3059 }
2617 3060
2618 $NOW = Event::time; 3061 $NOW = $tick_start = Event::time;
2619 3062
2620 cf::server_tick; # one server iteration 3063 cf::server_tick; # one server iteration
3064
3065 0 && sync_job {#d#
3066 for(1..10) {
3067 my $t = Event::time;
3068 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3069 or die;
3070
3071 $map->width (50);
3072 $map->height (50);
3073 $map->alloc;
3074 $map->_load_objects ("/tmp/x.map", 1);
3075 my $t = Event::time - $t;
3076
3077 #next unless $t < 0.0013;#d#
3078 if ($t < $min) {
3079 $min = $t;
3080 }
3081 $avg = $avg * 0.99 + $t * 0.01;
3082 }
3083 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3084 exit 0;
3085 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3086 };
3087
2621 $RUNTIME += $TICK; 3088 $RUNTIME += $TICK;
2622 $NEXT_TICK += $TICK; 3089 $NEXT_TICK += $TICK;
2623 3090
2624 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3091 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2625 $NEXT_RUNTIME_WRITE = $NOW + 10; 3092 $NEXT_RUNTIME_WRITE = $NOW + 10;
2627 write_runtime 3094 write_runtime
2628 or warn "ERROR: unable to write runtime file: $!"; 3095 or warn "ERROR: unable to write runtime file: $!";
2629 }; 3096 };
2630 } 3097 }
2631 3098
2632 $WAIT_FOR_TICK->broadcast;
2633 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2634
2635# my $AFTER = Event::time; 3099# my $AFTER = Event::time;
2636# warn $AFTER - $NOW;#d# 3100# warn $AFTER - $NOW;#d#
2637 3101
3102 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3103 $sig->send;
3104 }
3105 while (my $sig = shift @WAIT_FOR_TICK) {
3106 $sig->send;
3107 }
3108
3109 $NOW = Event::time;
3110
2638 # if we are delayed by four ticks or more, skip them all 3111 # if we are delayed by four ticks or more, skip them all
2639 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3112 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2640 3113
2641 $TICK_WATCHER->at ($NEXT_TICK); 3114 $TICK_WATCHER->at ($NEXT_TICK);
2642 $TICK_WATCHER->start; 3115 $TICK_WATCHER->start;
3116
3117 $LOAD = ($NOW - $tick_start) / $TICK;
3118 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3119
3120 _post_tick;
3121
3122
2643 }, 3123 },
2644); 3124);
2645 3125
2646{ 3126{
2647 BDB::max_poll_time $TICK * 0.1; 3127 BDB::max_poll_time $TICK * 0.1;
2675 3155
2676 cf::sync_job { 3156 cf::sync_job {
2677 eval { 3157 eval {
2678 BDB::db_env_open 3158 BDB::db_env_open
2679 $DB_ENV, 3159 $DB_ENV,
2680 $BDB_ENV_DIR, 3160 $BDBDIR,
2681 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3161 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2682 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3162 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2683 0666; 3163 0666;
2684 3164
2685 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3165 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2686 3166
2687 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3167 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2688 $DB_ENV->set_lk_detect; 3168 $DB_ENV->set_lk_detect;
2689 }; 3169 };
2690 3170
2706 prio => 6, 3186 prio => 6,
2707 cb => \&IO::AIO::poll_cb, 3187 cb => \&IO::AIO::poll_cb,
2708 ); 3188 );
2709} 3189}
2710 3190
3191my $_log_backtrace;
3192
3193sub _log_backtrace {
3194 my ($msg, @addr) = @_;
3195
3196 $msg =~ s/\n//;
3197
3198 # limit the # of concurrent backtraces
3199 if ($_log_backtrace < 2) {
3200 ++$_log_backtrace;
3201 async {
3202 my @bt = fork_call {
3203 @addr = map { sprintf "%x", $_ } @addr;
3204 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3205 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3206 or die "addr2line: $!";
3207
3208 my @funcs;
3209 my @res = <$fh>;
3210 chomp for @res;
3211 while (@res) {
3212 my ($func, $line) = splice @res, 0, 2, ();
3213 push @funcs, "[$func] $line";
3214 }
3215
3216 @funcs
3217 };
3218
3219 LOG llevInfo, "[ABT] $msg\n";
3220 LOG llevInfo, "[ABT] $_\n" for @bt;
3221 --$_log_backtrace;
3222 };
3223 } else {
3224 LOG llevInfo, "[ABT] $msg\n";
3225 LOG llevInfo, "[ABT] [suppressed]\n";
3226 }
3227}
3228
3229# load additional modules
3230use cf::pod;
3231
2711END { cf::emergency_save } 3232END { cf::emergency_save }
2712 3233
27131 32341
2714 3235

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines