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.232 by root, Wed Apr 4 02:07:19 2007 UTC vs.
Revision 1.289 by root, Sat Jun 30 03:00:54 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];
967 1211
968 (playerdir $login) . "/$login.pl" 1212 (playerdir $login) . "/playerdata"
969} 1213}
970 1214
971sub find_active($) { 1215sub find_active($) {
972 $cf::PLAYER{$_[0]} 1216 $cf::PLAYER{$_[0]}
973 and $cf::PLAYER{$_[0]}->active 1217 and $cf::PLAYER{$_[0]}->active
986 my $login = $_[0]; 1230 my $login = $_[0];
987 1231
988 my $guard = cf::lock_acquire "user_find:$login"; 1232 my $guard = cf::lock_acquire "user_find:$login";
989 1233
990 $cf::PLAYER{$_[0]} || do { 1234 $cf::PLAYER{$_[0]} || do {
1235 # rename old playerfiles to new ones
1236 #TODO: remove when no longer required
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl";
1241
991 my $pl = load_pl path $login 1242 my $pl = load_pl path $login
992 or return; 1243 or return;
993 $cf::PLAYER{$login} = $pl 1244 $cf::PLAYER{$login} = $pl
994 } 1245 }
995 } 1246 }
1079while and may block, so not sync_job-capable, ever. 1330while and may block, so not sync_job-capable, ever.
1080 1331
1081=cut 1332=cut
1082 1333
1083sub list_logins { 1334sub list_logins {
1084 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1335 my $dirs = aio_readdir $PLAYERDIR
1085 or return []; 1336 or return [];
1086 1337
1087 my @logins; 1338 my @logins;
1088 1339
1089 for my $login (@$dirs) { 1340 for my $login (@$dirs) {
1124 } 1375 }
1125 1376
1126 \@paths 1377 \@paths
1127} 1378}
1128 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
1129=item $player->ext_reply ($msgid, %msg) 1413=item $player->ext_reply ($msgid, %msg)
1130 1414
1131Sends an ext reply to the player. 1415Sends an ext reply to the player.
1132 1416
1133=cut 1417=cut
1134 1418
1135sub ext_reply($$%) { 1419sub ext_reply($$%) {
1136 my ($self, $id, %msg) = @_; 1420 my ($self, $id, %msg) = @_;
1137 1421
1138 $msg{msgid} = $id; 1422 $msg{msgid} = $id;
1139
1140 $self->send ("ext " . cf::to_json \%msg); 1423 $self->send ("ext " . cf::to_json \%msg);
1141} 1424}
1142 1425
1143=item $player->ext_event ($type, %msg) 1426=item $player->ext_event ($type, %msg)
1144 1427
1150 my ($self, $type, %msg) = @_; 1433 my ($self, $type, %msg) = @_;
1151 1434
1152 $self->ns->ext_event ($type, %msg); 1435 $self->ns->ext_event ($type, %msg);
1153} 1436}
1154 1437
1155package 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}
1156 1466
1157=back 1467=back
1158
1159 1468
1160=head3 cf::map 1469=head3 cf::map
1161 1470
1162=over 4 1471=over 4
1163 1472
1218 my ($self, $merge) = @_; 1527 my ($self, $merge) = @_;
1219 1528
1220 # we have to keep some variables in memory intact 1529 # we have to keep some variables in memory intact
1221 local $self->{path}; 1530 local $self->{path};
1222 local $self->{load_path}; 1531 local $self->{load_path};
1223 local $self->{deny_save};
1224 local $self->{deny_reset};
1225 1532
1226 $self->SUPER::thawer_merge ($merge); 1533 $self->SUPER::thawer_merge ($merge);
1227} 1534}
1228 1535
1229sub normalise { 1536sub normalise {
1301 1608
1302# the original (read-only) location 1609# the original (read-only) location
1303sub load_path { 1610sub load_path {
1304 my ($self) = @_; 1611 my ($self) = @_;
1305 1612
1306 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1613 "$MAPDIR/$self->{path}.map"
1307} 1614}
1308 1615
1309# the temporary/swap location 1616# the temporary/swap location
1310sub save_path { 1617sub save_path {
1311 my ($self) = @_; 1618 my ($self) = @_;
1312 1619
1313 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1620 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1314 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1621 "$TMPDIR/$path.map"
1315} 1622}
1316 1623
1317# the unique path, undef == no special unique path 1624# the unique path, undef == no special unique path
1318sub uniq_path { 1625sub uniq_path {
1319 my ($self) = @_; 1626 my ($self) = @_;
1320 1627
1321 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1628 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1322 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1629 "$UNIQUEDIR/$path"
1323} 1630}
1324 1631
1325# and all this just because we cannot iterate over 1632# and all this just because we cannot iterate over
1326# all maps in C++... 1633# all maps in C++...
1327sub change_all_map_light { 1634sub change_all_map_light {
1328 my ($change) = @_; 1635 my ($change) = @_;
1329 1636
1330 $_->change_map_light ($change) 1637 $_->change_map_light ($change)
1331 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;
1332} 1647}
1333 1648
1334sub unlink_save { 1649sub unlink_save {
1335 my ($self) = @_; 1650 my ($self) = @_;
1336 1651
1394 $self->load_header_orig 1709 $self->load_header_orig
1395 or return; 1710 or return;
1396 $self->prepare_orig; 1711 $self->prepare_orig;
1397 } 1712 }
1398 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
1399 1 1720 1
1400} 1721}
1401 1722
1402sub find; 1723sub find;
1403sub find { 1724sub find {
1415 $map->{last_save} = $cf::RUNTIME; 1736 $map->{last_save} = $cf::RUNTIME;
1416 1737
1417 $map->load_header 1738 $map->load_header
1418 or return; 1739 or return;
1419 1740
1420 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1741 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1421 # doing this can freeze the server in a sync job, obviously 1742 # doing this can freeze the server in a sync job, obviously
1422 #$cf::WAIT_FOR_TICK->wait; 1743 #$cf::WAIT_FOR_TICK->wait;
1423 $map->reset; 1744 $map->reset;
1424 undef $guard; 1745 undef $guard;
1425 return find $path; 1746 return find $path;
1436 my ($self) = @_; 1757 my ($self) = @_;
1437 1758
1438 local $self->{deny_reset} = 1; # loading can take a long time 1759 local $self->{deny_reset} = 1; # loading can take a long time
1439 1760
1440 my $path = $self->{path}; 1761 my $path = $self->{path};
1762
1763 {
1441 my $guard = cf::lock_acquire "map_load:$path"; 1764 my $guard = cf::lock_acquire "map_load:$path";
1442 1765
1443 return if $self->in_memory != cf::MAP_SWAPPED; 1766 return if $self->in_memory != cf::MAP_SWAPPED;
1444 1767
1445 $self->in_memory (cf::MAP_LOADING); 1768 $self->in_memory (cf::MAP_LOADING);
1446 1769
1447 $self->alloc; 1770 $self->alloc;
1448 1771
1449 $self->pre_load; 1772 $self->pre_load;
1450
1451 $self->_load_objects ($self->{load_path}, 1)
1452 or return;
1453
1454 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1455 if delete $self->{load_original};
1456
1457 if (my $uniq = $self->uniq_path) {
1458 utf8::encode $uniq;
1459 if (aio_open $uniq, O_RDONLY, 0) {
1460 $self->clear_unique_items;
1461 $self->_load_objects ($uniq, 0);
1462 }
1463 }
1464
1465 Coro::cede;
1466
1467 # now do the right thing for maps
1468 $self->link_multipart_objects;
1469
1470 unless ($self->{deny_activate}) {
1471 $self->decay_objects;
1472 $self->fix_auto_apply;
1473 $self->update_buttons;
1474 Coro::cede; 1773 Coro::cede;
1475 $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;
1476 $self->difficulty ($self->estimate_difficulty) 1792 $self->difficulty ($self->estimate_difficulty)
1477 unless $self->difficulty; 1793 unless $self->difficulty;
1478 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;
1479 $self->activate; 1803 $self->activate;
1804 }
1805
1806 $self->in_memory (cf::MAP_IN_MEMORY);
1480 } 1807 }
1481 1808
1482 $self->post_load; 1809 $self->post_load;
1483
1484 $self->in_memory (cf::MAP_IN_MEMORY);
1485} 1810}
1486 1811
1487sub customise_for { 1812sub customise_for {
1488 my ($self, $ob) = @_; 1813 my ($self, $ob) = @_;
1489 1814
1490 return find "~" . $ob->name . "/" . $self->{path} 1815 return find "~" . $ob->name . "/" . $self->{path}
1491 if $self->per_player; 1816 if $self->per_player;
1817
1818# return find "?party/" . $ob->name . "/" . $self->{path}
1819# if $self->per_party;
1492 1820
1493 $self 1821 $self
1494} 1822}
1495 1823
1496# 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
1607 1935
1608sub reset_at { 1936sub reset_at {
1609 my ($self) = @_; 1937 my ($self) = @_;
1610 1938
1611 # TODO: safety, remove and allow resettable per-player maps 1939 # TODO: safety, remove and allow resettable per-player maps
1612 return 1e99 if $self->isa ("ext::map_per_player");#d#
1613 return 1e99 if $self->{deny_reset}; 1940 return 1e99 if $self->{deny_reset};
1614 1941
1615 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1942 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1616 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;
1617 1944
1628 my ($self) = @_; 1955 my ($self) = @_;
1629 1956
1630 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1957 my $lock = cf::lock_acquire "map_data:$self->{path}";
1631 1958
1632 return if $self->players; 1959 return if $self->players;
1633 return if $self->isa ("ext::map_per_player");#d#
1634 1960
1635 warn "resetting map ", $self->path;#d# 1961 warn "resetting map ", $self->path;
1636 1962
1637 $self->in_memory (cf::MAP_SWAPPED); 1963 $self->in_memory (cf::MAP_SWAPPED);
1638 1964
1639 # need to save uniques path 1965 # need to save uniques path
1640 unless ($self->{deny_save}) { 1966 unless ($self->{deny_save}) {
1672 $cf::MAP{$self->path} = $self; 1998 $cf::MAP{$self->path} = $self;
1673 1999
1674 $self->reset; # polite request, might not happen 2000 $self->reset; # polite request, might not happen
1675} 2001}
1676 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
1677=item cf::map::unique_maps 2039=item cf::map::unique_maps
1678 2040
1679Returns an arrayref of paths of all shared maps that have 2041Returns an arrayref of paths of all shared maps that have
1680instantiated unique items. May block. 2042instantiated unique items. May block.
1681 2043
1682=cut 2044=cut
1683 2045
1684sub unique_maps() { 2046sub unique_maps() {
1685 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2047 [
1686 or return; 2048 map {
1687
1688 my @paths;
1689
1690 for (@$files) {
1691 utf8::decode $_; 2049 utf8::decode $_;
1692 next if /\.pst$/; 2050 /\.map$/
1693 next unless /^$PATH_SEP/o; 2051 ? normalise $_
1694 2052 : ()
1695 push @paths, cf::map::normalise $_; 2053 } @{ aio_readdir $UNIQUEDIR or [] }
1696 } 2054 ]
1697
1698 \@paths
1699} 2055}
1700 2056
1701package cf; 2057package cf;
1702 2058
1703=back 2059=back
1749 2105
1750 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2106 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1751 2107
1752 if ($self->{record_replies}) { 2108 if ($self->{record_replies}) {
1753 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2109 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2110
1754 } 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 {
1755 $msg = $npc->name . " says: $msg" if $npc; 2124 $msg = $npc->name . " says: $msg" if $npc;
1756 $self->message ($msg, $flags); 2125 $self->message ($msg, $flags);
2126 }
1757 } 2127 }
1758} 2128}
1759 2129
1760=item $player_object->may ("access") 2130=item $player_object->may ("access")
1761 2131
1809 $self->deactivate_recursive; 2179 $self->deactivate_recursive;
1810 2180
1811 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2181 return if UNIVERSAL::isa $self->map, "ext::map_link";
1812 2182
1813 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2183 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1814 if $self->map; 2184 if $self->map && $self->map->{path} ne "{link}";
1815 2185
1816 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2186 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1817} 2187}
1818 2188
1819sub cf::object::player::leave_link { 2189sub cf::object::player::leave_link {
1820 my ($self, $map, $x, $y) = @_; 2190 my ($self, $map, $x, $y) = @_;
2191
2192 return unless $self->contr->active;
1821 2193
1822 my $link_pos = delete $self->{_link_pos}; 2194 my $link_pos = delete $self->{_link_pos};
1823 2195
1824 unless ($map) { 2196 unless ($map) {
1825 # restore original map position 2197 # restore original map position
1848 2220
1849 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1850 $self->enter_map ($map, $x, $y); 2222 $self->enter_map ($map, $x, $y);
1851} 2223}
1852 2224
1853cf::player->attach (
1854 on_logout => sub {
1855 my ($pl) = @_;
1856
1857 # abort map switching before logout
1858 if ($pl->ob->{_link_pos}) {
1859 cf::sync_job {
1860 $pl->ob->leave_link
1861 };
1862 }
1863 },
1864 on_login => sub {
1865 my ($pl) = @_;
1866
1867 # try to abort aborted map switching on player login :)
1868 # should happen only on crashes
1869 if ($pl->ob->{_link_pos}) {
1870 $pl->ob->enter_link;
1871 (async {
1872 $pl->ob->reply (undef,
1873 "There was an internal problem at your last logout, "
1874 . "the server will try to bring you to your intended destination in a second.",
1875 cf::NDI_RED);
1876 # we need this sleep as the login has a concurrent enter_exit running
1877 # and this sleep increases chances of the player not ending up in scorn
1878 Coro::Timer::sleep 1;
1879 $pl->ob->leave_link;
1880 })->prio (2);
1881 }
1882 },
1883);
1884
1885=item $player_object->goto ($path, $x, $y) 2225=item $player_object->goto ($path, $x, $y[, $check->($map)])
1886 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
1887=cut 2232=cut
2233
2234our $GOTOGEN;
1888 2235
1889sub cf::object::player::goto { 2236sub cf::object::player::goto {
1890 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;
1891 2241
1892 $self->enter_link; 2242 $self->enter_link;
1893 2243
1894 (async { 2244 (async {
1895 my $map = eval { 2245 my $map = eval {
1896 my $map = cf::map::find $path; 2246 my $map = cf::map::find $path;
2247
2248 if ($map) {
1897 $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
1898 $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 $@;
1899 } or 2261 }
1900 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1901 2262
2263 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation};
1902 $self->leave_link ($map, $x, $y); 2265 $self->leave_link ($map, $x, $y);
2266 }
1903 })->prio (1); 2267 })->prio (1);
1904} 2268}
1905 2269
1906=item $player_object->enter_exit ($exit_object) 2270=item $player_object->enter_exit ($exit_object)
1907 2271
1946 2310
1947 $rmp->{random_seed} ||= $exit->random_seed; 2311 $rmp->{random_seed} ||= $exit->random_seed;
1948 2312
1949 my $data = cf::to_json $rmp; 2313 my $data = cf::to_json $rmp;
1950 my $md5 = Digest::MD5::md5_hex $data; 2314 my $md5 = Digest::MD5::md5_hex $data;
1951 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2315 my $meta = "$RANDOMDIR/$md5.meta";
1952 2316
1953 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2317 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1954 aio_write $fh, 0, (length $data), $data, 0; 2318 aio_write $fh, 0, (length $data), $data, 0;
1955 undef $fh; 2319 undef $fh;
1956 aio_rename "$meta~", $meta; 2320 aio_rename "$meta~", $meta;
1965 2329
1966 return unless $self->type == cf::PLAYER; 2330 return unless $self->type == cf::PLAYER;
1967 2331
1968 if ($exit->slaying eq "/!") { 2332 if ($exit->slaying eq "/!") {
1969 #TODO: this should de-fi-ni-te-ly not be a sync-job 2333 #TODO: this should de-fi-ni-te-ly not be a sync-job
2334 # the problem is that $exit might not survive long enough
2335 # so it needs to be done right now, right here
1970 cf::sync_job { prepare_random_map $exit }; 2336 cf::sync_job { prepare_random_map $exit };
1971 } 2337 }
1972 2338
1973 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2339 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1974 my $hp = $exit->stats->hp; 2340 my $hp = $exit->stats->hp;
1982 $self->goto ($slaying, $hp, $sp); 2348 $self->goto ($slaying, $hp, $sp);
1983 2349
1984 1; 2350 1;
1985 }) { 2351 }) {
1986 $self->message ("Something went wrong deep within the crossfire server. " 2352 $self->message ("Something went wrong deep within the crossfire server. "
1987 . "I'll try to bring you back to the map you were before. " 2353 . "I'll try to bring you back to the map you were before. "
1988 . "Please report this to the dungeon master!", 2354 . "Please report this to the dungeon master!",
1989 cf::NDI_UNIQUE | cf::NDI_RED); 2355 cf::NDI_UNIQUE | cf::NDI_RED);
1990 2356
1991 warn "ERROR in enter_exit: $@"; 2357 warn "ERROR in enter_exit: $@";
1992 $self->leave_link; 2358 $self->leave_link;
1993 } 2359 }
1994 })->prio (1); 2360 })->prio (1);
2010 2376
2011 utf8::encode $text; 2377 utf8::encode $text;
2012 $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);
2013} 2379}
2014 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
2015=item $client->ext_event ($type, %msg) 2419=item $client->ext_event ($type, %msg)
2016 2420
2017Sends an exti event to the client. 2421Sends an ext event to the client.
2018 2422
2019=cut 2423=cut
2020 2424
2021sub cf::client::ext_event($$%) { 2425sub cf::client::ext_event($$%) {
2022 my ($self, $type, %msg) = @_; 2426 my ($self, $type, %msg) = @_;
2029 2433
2030Queues a query to the client, calling the given callback with 2434Queues a query to the client, calling the given callback with
2031the 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>,
2032C<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>.
2033 2437
2034Queries 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
2035reliable at some point in the future. 2439become reliable at some point in the future.
2036 2440
2037=cut 2441=cut
2038 2442
2039sub cf::client::query { 2443sub cf::client::query {
2040 my ($self, $flags, $text, $cb) = @_; 2444 my ($self, $flags, $text, $cb) = @_;
2048 utf8::encode $text; 2452 utf8::encode $text;
2049 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2453 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2050 2454
2051 $self->send_packet ($self->{query_queue}[0][0]) 2455 $self->send_packet ($self->{query_queue}[0][0])
2052 if @{ $self->{query_queue} } == 1; 2456 if @{ $self->{query_queue} } == 1;
2457
2458 1
2053} 2459}
2054 2460
2055cf::client->attach ( 2461cf::client->attach (
2056 on_reply => sub { 2462 on_reply => sub {
2057 my ($ns, $msg) = @_; 2463 my ($ns, $msg) = @_;
2071 $ns->send_packet ($ns->{query_queue}[0][0]); 2477 $ns->send_packet ($ns->{query_queue}[0][0]);
2072 } else { 2478 } else {
2073 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2479 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2074 } 2480 }
2075 } 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;
2076 }, 2500 },
2077); 2501);
2078 2502
2079=item $client->async (\&cb) 2503=item $client->async (\&cb)
2080 2504
2219=back 2643=back
2220 2644
2221=cut 2645=cut
2222 2646
2223############################################################################# 2647#############################################################################
2224
2225=head2 EXTENSION DATABASE SUPPORT
2226
2227Crossfire maintains a very simple database for extension use. It can
2228currently store anything that can be serialised using Storable, which
2229excludes objects.
2230
2231The parameter C<$family> should best start with the name of the extension
2232using it, it should be unique.
2233
2234=over 4
2235
2236=item $value = cf::db_get $family => $key
2237
2238Returns a single value from the database.
2239
2240=item cf::db_put $family => $key => $value
2241
2242Stores the given C<$value> in the family.
2243
2244=cut
2245
2246our $DB;
2247
2248sub db_init {
2249 unless ($DB) {
2250 $DB = BDB::db_create $DB_ENV;
2251
2252 cf::sync_job {
2253 eval {
2254 $DB->set_flags (BDB::CHKSUM);
2255
2256 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2257 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2258 cf::cleanup "db_open(db): $!" if $!;
2259 };
2260 cf::cleanup "db_open(db): $@" if $@;
2261 };
2262
2263 my $path = cf::localdir . "/database.pst";
2264 if (stat $path) {
2265 cf::sync_job {
2266 my $pst = Storable::retrieve $path;
2267
2268 cf::db_put (board => data => $pst->{board});
2269 cf::db_put (guildrules => data => $pst->{guildrules});
2270 cf::db_put (rent => balance => $pst->{rent}{balance});
2271 BDB::db_env_txn_checkpoint $DB_ENV;
2272
2273 unlink $path;
2274 };
2275 }
2276 }
2277}
2278
2279sub db_get($$) {
2280 my $key = "$_[0]/$_[1]";
2281
2282 cf::sync_job {
2283 BDB::db_get $DB, undef, $key, my $data;
2284
2285 $! ? ()
2286 : Compress::LZF::sthaw $data
2287 }
2288}
2289
2290sub db_put($$$) {
2291 BDB::dbreq_pri 4;
2292 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2293}
2294
2295#############################################################################
2296# the server's init and main functions 2648# the server's init and main functions
2297 2649
2298sub load_facedata { 2650sub load_facedata($) {
2299 my $path = sprintf "%s/facedata", cf::datadir; 2651 my ($path) = @_;
2300 2652
2301 warn "loading facedata from $path\n"; 2653 warn "loading facedata from $path\n";
2302 2654
2303 my $faces; 2655 my $facedata;
2304 0 < aio_load $path, $faces 2656 0 < aio_load $path, $facedata
2305 or die "$path: $!"; 2657 or die "$path: $!";
2306 2658
2307 Coro::cede;
2308 $faces = Storable::thaw $faces; 2659 $facedata = Coro::Storable::thaw $facedata;
2309 Coro::cede;
2310 2660
2311 my $meta = delete $faces->{""};
2312 $meta->{version} == 1 2661 $facedata->{version} == 2
2313 or cf::cleanup "$path: version mismatch, cannot proceed."; 2662 or cf::cleanup "$path: version mismatch, cannot proceed.";
2314 2663
2664 {
2665 my $faces = $facedata->{faceinfo};
2666
2315 while (my ($face, $info) = each %$faces) { 2667 while (my ($face, $info) = each %$faces) {
2316 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2668 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2317 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2669 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2318 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2670 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2319 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2671 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2320 Coro::cede; 2672 Coro::cede;
2321 } 2673 }
2322 2674
2323 while (my ($face, $info) = each %$faces) { 2675 while (my ($face, $info) = each %$faces) {
2324 next unless $info->{smooth}; 2676 next unless $info->{smooth};
2325 my $idx = cf::face::find $face 2677 my $idx = cf::face::find $face
2326 or next; 2678 or next;
2327 if (my $smooth = cf::face::find $info->{smooth}) { 2679 if (my $smooth = cf::face::find $info->{smooth}) {
2328 cf::face::set_smooth $idx, $smooth; 2680 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2329 } else { 2681 } else {
2330 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2682 warn "smooth face '$info->{smooth}' not found for face '$face'";
2331 } 2683 }
2332 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
2333 } 2697 }
2334 2698
2335 1 2699 1
2336} 2700}
2337 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 #d# NEED to laod twice to resolve forward references
2716 # this really needs to be done in an extra post-pass
2717 # (which needs to be synchronous, so solve it differently)
2718 load_resource_file "$DATADIR/archetypes"
2719 or die "unable to load archetypes\n";
2720}
2721
2722sub reload_treasures {
2723 load_resource_file "$DATADIR/treasures"
2724 or die "unable to load treasurelists\n";
2725}
2726
2338sub reload_resources { 2727sub reload_resources {
2339 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2728 warn "reloading resource files...\n";
2340 or die "unable to load regions file\n";#d# 2729
2730 reload_regions;
2341 load_facedata 2731 reload_facedata;
2342 or die "unable to load facedata\n";#d# 2732 #reload_archetypes;#d#
2733 reload_archetypes;
2734 reload_treasures;
2735
2736 warn "finished reloading resource files\n";
2343} 2737}
2344 2738
2345sub init { 2739sub init {
2346 reload_resources; 2740 reload_resources;
2347} 2741}
2348 2742
2349sub cfg_load { 2743sub cfg_load {
2350 open my $fh, "<:utf8", cf::confdir . "/config" 2744 open my $fh, "<:utf8", "$CONFDIR/config"
2351 or return; 2745 or return;
2352 2746
2353 local $/; 2747 local $/;
2354 *CFG = YAML::Syck::Load <$fh>; 2748 *CFG = YAML::Syck::Load <$fh>;
2355 2749
2400 }, 2794 },
2401 ); 2795 );
2402 } 2796 }
2403} 2797}
2404 2798
2799sub write_runtime {
2800 my $runtime = "$LOCALDIR/runtime";
2801
2802 # first touch the runtime file to show we are still running:
2803 # the fsync below can take a very very long time.
2804
2805 IO::AIO::aio_utime $runtime, undef, undef;
2806
2807 my $guard = cf::lock_acquire "write_runtime";
2808
2809 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2810 or return;
2811
2812 my $value = $cf::RUNTIME + 90 + 10;
2813 # 10 is the runtime save interval, for a monotonic clock
2814 # 60 allows for the watchdog to kill the server.
2815
2816 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2817 and return;
2818
2819 # always fsync - this file is important
2820 aio_fsync $fh
2821 and return;
2822
2823 # touch it again to show we are up-to-date
2824 aio_utime $fh, undef, undef;
2825
2826 close $fh
2827 or return;
2828
2829 aio_rename "$runtime~", $runtime
2830 and return;
2831
2832 warn "runtime file written.\n";
2833
2834 1
2835}
2836
2405sub emergency_save() { 2837sub emergency_save() {
2406 my $freeze_guard = cf::freeze_mainloop; 2838 my $freeze_guard = cf::freeze_mainloop;
2407 2839
2408 warn "enter emergency perl save\n"; 2840 warn "enter emergency perl save\n";
2409 2841
2440 2872
2441 warn Carp::longmess "post_cleanup backtrace" 2873 warn Carp::longmess "post_cleanup backtrace"
2442 if $make_core; 2874 if $make_core;
2443} 2875}
2444 2876
2445sub reload() { 2877sub do_reload_perl() {
2446 # can/must only be called in main 2878 # can/must only be called in main
2447 if ($Coro::current != $Coro::main) { 2879 if ($Coro::current != $Coro::main) {
2448 warn "can only reload from main coroutine"; 2880 warn "can only reload from main coroutine";
2449 return; 2881 return;
2450 } 2882 }
2484 %EXT_CORO = (); 2916 %EXT_CORO = ();
2485 2917
2486 warn "removing commands"; 2918 warn "removing commands";
2487 %COMMAND = (); 2919 %COMMAND = ();
2488 2920
2489 warn "removing ext commands"; 2921 warn "removing ext/exti commands";
2490 %EXTCMD = (); 2922 %EXTCMD = ();
2923 %EXTICMD = ();
2491 2924
2492 warn "unloading/nuking all extensions"; 2925 warn "unloading/nuking all extensions";
2493 for my $pkg (@EXTS) { 2926 for my $pkg (@EXTS) {
2494 warn "... unloading $pkg"; 2927 warn "... unloading $pkg";
2495 2928
2525 Symbol::delete_package "safe::$_" 2958 Symbol::delete_package "safe::$_"
2526 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2959 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2527 2960
2528 warn "unloading cf.pm \"a bit\""; 2961 warn "unloading cf.pm \"a bit\"";
2529 delete $INC{"cf.pm"}; 2962 delete $INC{"cf.pm"};
2963 delete $INC{"cf/pod.pm"};
2530 2964
2531 # don't, removes xs symbols, too, 2965 # don't, removes xs symbols, too,
2532 # and global variables created in xs 2966 # and global variables created in xs
2533 #Symbol::delete_package __PACKAGE__; 2967 #Symbol::delete_package __PACKAGE__;
2534 2968
2549 warn "reattaching attachments to maps"; 2983 warn "reattaching attachments to maps";
2550 reattach $_ for values %MAP; 2984 reattach $_ for values %MAP;
2551 warn "reattaching attachments to players"; 2985 warn "reattaching attachments to players";
2552 reattach $_ for values %PLAYER; 2986 reattach $_ for values %PLAYER;
2553 2987
2554 warn "loading reloadable resources";
2555 reload_resources;
2556
2557 warn "leaving sync_job"; 2988 warn "leaving sync_job";
2558 2989
2559 1 2990 1
2560 } or do { 2991 } or do {
2561 warn $@; 2992 warn $@;
2566 warn "reloaded"; 2997 warn "reloaded";
2567}; 2998};
2568 2999
2569our $RELOAD_WATCHER; # used only during reload 3000our $RELOAD_WATCHER; # used only during reload
2570 3001
3002sub reload_perl() {
3003 # doing reload synchronously and two reloads happen back-to-back,
3004 # coro crashes during coro_state_free->destroy here.
3005
3006 $RELOAD_WATCHER ||= Event->timer (
3007 reentrant => 0,
3008 after => 0,
3009 data => WF_AUTOCANCEL,
3010 cb => sub {
3011 do_reload_perl;
3012 undef $RELOAD_WATCHER;
3013 },
3014 );
3015}
3016
2571register_command "reload" => sub { 3017register_command "reload" => sub {
2572 my ($who, $arg) = @_; 3018 my ($who, $arg) = @_;
2573 3019
2574 if ($who->flag (FLAG_WIZ)) { 3020 if ($who->flag (FLAG_WIZ)) {
2575 $who->message ("reloading server."); 3021 $who->message ("reloading server.");
2576 3022 async { reload_perl };
2577 # doing reload synchronously and two reloads happen back-to-back,
2578 # coro crashes during coro_state_free->destroy here.
2579
2580 $RELOAD_WATCHER ||= Event->timer (
2581 reentrant => 0,
2582 after => 0,
2583 data => WF_AUTOCANCEL,
2584 cb => sub {
2585 reload;
2586 undef $RELOAD_WATCHER;
2587 },
2588 );
2589 } 3023 }
2590}; 3024};
2591 3025
2592unshift @INC, $LIBDIR; 3026unshift @INC, $LIBDIR;
2593 3027
2594my $bug_warning = 0; 3028my $bug_warning = 0;
2595 3029
3030our @WAIT_FOR_TICK;
3031our @WAIT_FOR_TICK_BEGIN;
3032
3033sub wait_for_tick {
3034 return unless $TICK_WATCHER->is_active;
3035 return if $Coro::current == $Coro::main;
3036
3037 my $signal = new Coro::Signal;
3038 push @WAIT_FOR_TICK, $signal;
3039 $signal->wait;
3040}
3041
3042sub wait_for_tick_begin {
3043 return unless $TICK_WATCHER->is_active;
3044 return if $Coro::current == $Coro::main;
3045
3046 my $signal = new Coro::Signal;
3047 push @WAIT_FOR_TICK_BEGIN, $signal;
3048 $signal->wait;
3049}
3050
3051 my $min = 1e6;#d#
3052 my $avg = 10;
2596$TICK_WATCHER = Event->timer ( 3053$TICK_WATCHER = Event->timer (
2597 reentrant => 0, 3054 reentrant => 0,
2598 parked => 1, 3055 parked => 1,
2599 prio => 0, 3056 prio => 0,
2600 at => $NEXT_TICK || $TICK, 3057 at => $NEXT_TICK || $TICK,
2604 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3061 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2605 unless ++$bug_warning > 10; 3062 unless ++$bug_warning > 10;
2606 return; 3063 return;
2607 } 3064 }
2608 3065
2609 $NOW = Event::time; 3066 $NOW = $tick_start = Event::time;
2610 3067
2611 cf::server_tick; # one server iteration 3068 cf::server_tick; # one server iteration
3069
3070 0 && sync_job {#d#
3071 for(1..10) {
3072 my $t = Event::time;
3073 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3074 or die;
3075
3076 $map->width (50);
3077 $map->height (50);
3078 $map->alloc;
3079 $map->_load_objects ("/tmp/x.map", 1);
3080 my $t = Event::time - $t;
3081
3082 #next unless $t < 0.0013;#d#
3083 if ($t < $min) {
3084 $min = $t;
3085 }
3086 $avg = $avg * 0.99 + $t * 0.01;
3087 }
3088 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3089 exit 0;
3090 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3091 };
3092
2612 $RUNTIME += $TICK; 3093 $RUNTIME += $TICK;
2613 $NEXT_TICK += $TICK; 3094 $NEXT_TICK += $TICK;
2614 3095
2615 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3096 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2616 $NEXT_RUNTIME_WRITE = $NOW + 10; 3097 $NEXT_RUNTIME_WRITE = $NOW + 10;
2618 write_runtime 3099 write_runtime
2619 or warn "ERROR: unable to write runtime file: $!"; 3100 or warn "ERROR: unable to write runtime file: $!";
2620 }; 3101 };
2621 } 3102 }
2622 3103
2623 $WAIT_FOR_TICK->broadcast;
2624 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2625
2626# my $AFTER = Event::time; 3104# my $AFTER = Event::time;
2627# warn $AFTER - $NOW;#d# 3105# warn $AFTER - $NOW;#d#
2628 3106
3107 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3108 $sig->send;
3109 }
3110 while (my $sig = shift @WAIT_FOR_TICK) {
3111 $sig->send;
3112 }
3113
3114 $NOW = Event::time;
3115
2629 # if we are delayed by four ticks or more, skip them all 3116 # if we are delayed by four ticks or more, skip them all
2630 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3117 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2631 3118
2632 $TICK_WATCHER->at ($NEXT_TICK); 3119 $TICK_WATCHER->at ($NEXT_TICK);
2633 $TICK_WATCHER->start; 3120 $TICK_WATCHER->start;
3121
3122 $LOAD = ($NOW - $tick_start) / $TICK;
3123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3124
3125 _post_tick;
3126
3127
2634 }, 3128 },
2635); 3129);
2636 3130
2637{ 3131{
2638 BDB::max_poll_time $TICK * 0.1; 3132 BDB::max_poll_time $TICK * 0.1;
2666 3160
2667 cf::sync_job { 3161 cf::sync_job {
2668 eval { 3162 eval {
2669 BDB::db_env_open 3163 BDB::db_env_open
2670 $DB_ENV, 3164 $DB_ENV,
2671 $BDB_ENV_DIR, 3165 $BDBDIR,
2672 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3166 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2673 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3167 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2674 0666; 3168 0666;
2675 3169
2676 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3170 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2677 3171
2678 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3172 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2679 $DB_ENV->set_lk_detect; 3173 $DB_ENV->set_lk_detect;
2680 }; 3174 };
2681 3175
2697 prio => 6, 3191 prio => 6,
2698 cb => \&IO::AIO::poll_cb, 3192 cb => \&IO::AIO::poll_cb,
2699 ); 3193 );
2700} 3194}
2701 3195
3196my $_log_backtrace;
3197
3198sub _log_backtrace {
3199 my ($msg, @addr) = @_;
3200
3201 $msg =~ s/\n//;
3202
3203 # limit the # of concurrent backtraces
3204 if ($_log_backtrace < 2) {
3205 ++$_log_backtrace;
3206 async {
3207 my @bt = fork_call {
3208 @addr = map { sprintf "%x", $_ } @addr;
3209 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3210 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3211 or die "addr2line: $!";
3212
3213 my @funcs;
3214 my @res = <$fh>;
3215 chomp for @res;
3216 while (@res) {
3217 my ($func, $line) = splice @res, 0, 2, ();
3218 push @funcs, "[$func] $line";
3219 }
3220
3221 @funcs
3222 };
3223
3224 LOG llevInfo, "[ABT] $msg\n";
3225 LOG llevInfo, "[ABT] $_\n" for @bt;
3226 --$_log_backtrace;
3227 };
3228 } else {
3229 LOG llevInfo, "[ABT] $msg\n";
3230 LOG llevInfo, "[ABT] [suppressed]\n";
3231 }
3232}
3233
3234# load additional modules
3235use cf::pod;
3236
2702END { cf::emergency_save } 3237END { cf::emergency_save }
2703 3238
27041 32391
2705 3240

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines