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.246 by root, Tue Apr 17 10:38:28 2007 UTC vs.
Revision 1.303 by root, Wed Jul 11 15:57:31 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.61 (); 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;
21use Coro::Storable; 23use Coro::Storable;
22 24
25use JSON::XS 1.4 ();
23use BDB (); 26use BDB ();
24use Data::Dumper; 27use Data::Dumper;
25use Digest::MD5; 28use Digest::MD5;
26use Fcntl; 29use Fcntl;
27use YAML::Syck (); 30use YAML::Syck ();
28use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
29use Time::HiRes; 32use Time::HiRes;
30use Compress::LZF; 33use Compress::LZF;
34use Digest::MD5 ();
31 35
32# configure various modules to our taste 36# configure various modules to our taste
33# 37#
34$Storable::canonical = 1; # reduce rsync transfers 38$Storable::canonical = 1; # reduce rsync transfers
35Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
47our %COMMAND = (); 51our %COMMAND = ();
48our %COMMAND_TIME = (); 52our %COMMAND_TIME = ();
49 53
50our @EXTS = (); # list of extension package names 54our @EXTS = (); # list of extension package names
51our %EXTCMD = (); 55our %EXTCMD = ();
56our %EXTICMD = ();
52our %EXT_CORO = (); # coroutines bound to extensions 57our %EXT_CORO = (); # coroutines bound to extensions
53our %EXT_MAP = (); # pluggable maps 58our %EXT_MAP = (); # pluggable maps
54 59
55our $RELOAD; # number of reloads so far 60our $RELOAD; # number of reloads so far
56our @EVENT; 61our @EVENT;
57our $LIBDIR = datadir . "/ext"; 62
63our $CONFDIR = confdir;
64our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db";
58 74
59our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
60our $TICK_WATCHER; 76our $TICK_WATCHER;
61our $AIO_POLL_WATCHER; 77our $AIO_POLL_WATCHER;
62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
73our $RUNTIME; 89our $RUNTIME;
74 90
75our %PLAYER; # all users 91our %PLAYER; # all users
76our %MAP; # all maps 92our %MAP; # all maps
77our $LINK_MAP; # the special {link} map, which is always available 93our $LINK_MAP; # the special {link} map, which is always available
78our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db";
80 94
81# used to convert map paths into valid unix filenames by replacing / by ∕ 95# used to convert map paths into valid unix filenames by replacing / by ∕
82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
83 97
98our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing
100our $tick_start; # for load detecting purposes
101
84binmode STDOUT; 102binmode STDOUT;
85binmode STDERR; 103binmode STDERR;
86 104
87# read virtual server time, if available 105# read virtual server time, if available
88unless ($RUNTIME || !-e cf::localdir . "/runtime") { 106unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
89 open my $fh, "<", cf::localdir . "/runtime" 107 open my $fh, "<", "$LOCALDIR/runtime"
90 or die "unable to read runtime file: $!"; 108 or die "unable to read runtime file: $!";
91 $RUNTIME = <$fh> + 0.; 109 $RUNTIME = <$fh> + 0.;
92} 110}
93 111
94mkdir cf::localdir; 112mkdir $_
95mkdir cf::localdir . "/" . cf::playerdir; 113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
96mkdir cf::localdir . "/" . cf::tmpdir;
97mkdir cf::localdir . "/" . cf::uniquedir;
98mkdir $RANDOM_MAPS;
99mkdir $BDB_ENV_DIR;
100 114
101our $EMERGENCY_POSITION; 115our $EMERGENCY_POSITION;
102 116
103sub cf::map::normalise; 117sub cf::map::normalise;
104 118
115=item $cf::RUNTIME 129=item $cf::RUNTIME
116 130
117The time this server has run, starts at 0 and is increased by $cf::TICK on 131The time this server has run, starts at 0 and is increased by $cf::TICK on
118every server tick. 132every server tick.
119 133
120=item $cf::LIBDIR 134=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
135$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
136$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
121 137
122The perl library directory, where extensions and cf-specific modules can 138Various directories - "/etc", read-only install directory, perl-library
123be found. It will be added to C<@INC> automatically. 139directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
140unique-items directory, player file directory, random maps directory and
141database environment.
124 142
125=item $cf::NOW 143=item $cf::NOW
126 144
127The time of the last (current) server tick. 145The time of the last (current) server tick.
128 146
129=item $cf::TICK 147=item $cf::TICK
130 148
131The interval between server ticks, in seconds. 149The interval between server ticks, in seconds.
150
151=item $cf::LOADAVG
152
153The current CPU load on the server (alpha-smoothed), as a value between 0
154(none) and 1 (overloaded), indicating how much time is spent on processing
155objects per tick. Healthy values are < 0.5.
156
157=item $cf::LOAD
158
159The raw value load value from the last tick.
132 160
133=item %cf::CFG 161=item %cf::CFG
134 162
135Configuration for the server, loaded from C</etc/crossfire/config>, or 163Configuration for the server, loaded from C</etc/crossfire/config>, or
136from wherever your confdir points to. 164from wherever your confdir points to.
146=cut 174=cut
147 175
148BEGIN { 176BEGIN {
149 *CORE::GLOBAL::warn = sub { 177 *CORE::GLOBAL::warn = sub {
150 my $msg = join "", @_; 178 my $msg = join "", @_;
151 utf8::encode $msg;
152 179
153 $msg .= "\n" 180 $msg .= "\n"
154 unless $msg =~ /\n$/; 181 unless $msg =~ /\n$/;
155 182
183 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
184
185 utf8::encode $msg;
156 LOG llevError, $msg; 186 LOG llevError, $msg;
157 }; 187 };
158} 188}
159 189
160@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 190@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
161@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 191@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
162@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 192@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
163@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 193@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
164@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 194@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
195@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
165@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 196@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
166 197
167# we bless all objects into (empty) derived classes to force a method lookup 198# we bless all objects into (empty) derived classes to force a method lookup
168# within the Safe compartment. 199# within the Safe compartment.
169for my $pkg (qw( 200for my $pkg (qw(
170 cf::global cf::attachable 201 cf::global cf::attachable
178} 209}
179 210
180$Event::DIED = sub { 211$Event::DIED = sub {
181 warn "error in event callback: @_"; 212 warn "error in event callback: @_";
182}; 213};
214
215#############################################################################
183 216
184=head2 UTILITY FUNCTIONS 217=head2 UTILITY FUNCTIONS
185 218
186=over 4 219=over 4
187 220
206 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 239 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
207 $d 240 $d
208 } || "[unable to dump $_[0]: '$@']"; 241 } || "[unable to dump $_[0]: '$@']";
209} 242}
210 243
211use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
212
213=item $ref = cf::from_json $json 244=item $ref = cf::from_json $json
214 245
215Converts a JSON string into the corresponding perl data structure. 246Converts a JSON string into the corresponding perl data structure.
216 247
217=item $json = cf::to_json $ref 248=item $json = cf::to_json $ref
218 249
219Converts a perl data structure into its JSON representation. 250Converts a perl data structure into its JSON representation.
251
252=cut
253
254our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255
256sub to_json ($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) }
220 258
221=item cf::lock_wait $string 259=item cf::lock_wait $string
222 260
223Wait until the given lock is available. See cf::lock_acquire. 261Wait until the given lock is available. See cf::lock_acquire.
224 262
230returned. 268returned.
231 269
232Lock names should begin with a unique identifier (for example, cf::map::find 270Lock names should begin with a unique identifier (for example, cf::map::find
233uses map_find and cf::map::load uses map_load). 271uses map_find and cf::map::load uses map_load).
234 272
273=item $locked = cf::lock_active $string
274
275Return true if the lock is currently active, i.e. somebody has locked it.
276
235=cut 277=cut
236 278
237our %LOCK; 279our %LOCK;
238 280
239sub lock_wait($) { 281sub lock_wait($) {
256 298
257 Coro::guard { 299 Coro::guard {
258 # wake up all waiters, to be on the safe side 300 # wake up all waiters, to be on the safe side
259 $_->ready for @{ delete $LOCK{$key} }; 301 $_->ready for @{ delete $LOCK{$key} };
260 } 302 }
303}
304
305sub lock_active($) {
306 my ($key) = @_;
307
308 ! ! $LOCK{$key}
261} 309}
262 310
263sub freeze_mainloop { 311sub freeze_mainloop {
264 return unless $TICK_WATCHER->is_active; 312 return unless $TICK_WATCHER->is_active;
265 313
280 328
281BEGIN { *async = \&Coro::async_pool } 329BEGIN { *async = \&Coro::async_pool }
282 330
283=item cf::sync_job { BLOCK } 331=item cf::sync_job { BLOCK }
284 332
285The design of crossfire+ requires that the main coro ($Coro::main) is 333The design of Crossfire TRT requires that the main coroutine ($Coro::main)
286always able to handle events or runnable, as crossfire+ is only partly 334is always able to handle events or runnable, as Crossfire TRT is only
287reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 335partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336acceptable.
288 337
289If it must be done, put the blocking parts into C<sync_job>. This will run 338If it must be done, put the blocking parts into C<sync_job>. This will run
290the given BLOCK in another coroutine while waiting for the result. The 339the given BLOCK in another coroutine while waiting for the result. The
291server will be frozen during this time, so the block should either finish 340server will be frozen during this time, so the block should either finish
292fast or be very important. 341fast or be very important.
295 344
296sub sync_job(&) { 345sub sync_job(&) {
297 my ($job) = @_; 346 my ($job) = @_;
298 347
299 if ($Coro::current == $Coro::main) { 348 if ($Coro::current == $Coro::main) {
349 my $time = Event::time;
350
300 # this is the main coro, too bad, we have to block 351 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 352 # till the operation succeeds, freezing the server :/
302 353
303 # TODO: use suspend/resume instead 354 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 355 # (but this is cancel-safe)
315 366
316 while ($busy) { 367 while ($busy) {
317 Coro::cede or Event::one_event; 368 Coro::cede or Event::one_event;
318 } 369 }
319 370
371 $time = Event::time - $time;
372
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load
377
320 wantarray ? @res : $res[0] 378 wantarray ? @res : $res[0]
321 } else { 379 } else {
322 # we are in another coroutine, how wonderful, everything just works 380 # we are in another coroutine, how wonderful, everything just works
323 381
324 $job->() 382 $job->()
343 $EXT_CORO{$coro+0} = $coro; 401 $EXT_CORO{$coro+0} = $coro;
344 402
345 $coro 403 $coro
346} 404}
347 405
348sub write_runtime { 406=item fork_call { }, $args
349 my $guard = cf::lock_acquire "write_runtime";
350 407
351 my $runtime = cf::localdir . "/runtime"; 408Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling.
352 412
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 413=cut
354 or return;
355 414
356 my $value = $cf::RUNTIME + 90 + 10; 415sub _store_scalar {
357 # 10 is the runtime save interval, for a monotonic clock 416 open my $fh, ">", \my $buf
358 # 60 allows for the watchdog to kill the server. 417 or die "fork_call: cannot open fh-to-buf in child : $!";
359 418 Storable::store_fd $_[0], $fh;
360 (aio_write $fh, 0, (length $value), $value, 0) <= 0
361 and return;
362
363 # always fsync - this file is important
364 aio_fsync $fh
365 and return;
366
367 close $fh 419 close $fh;
368 or return;
369 420
370 aio_rename "$runtime~", $runtime 421 $buf
371 and return; 422}
372 423
424sub fork_call(&@) {
425 my ($cb, @args) = @_;
426
427# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
428# or die "socketpair: $!";
429 pipe my $fh1, my $fh2
430 or die "pipe: $!";
431
432 if (my $pid = fork) {
433 close $fh2;
434
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
437 $res = Coro::Storable::thaw $res;
438
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals;
446 local $SIG{__WARN__};
447 local $SIG{__DIE__};
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453
454 eval {
455 close $fh1;
456
457 my @res = eval { $cb->(@args) };
458
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460 close $fh2;
461 };
462
463 warn $@ if $@;
464 _exit 0;
373 1 465 }
466}
467
468=item $value = cf::db_get $family => $key
469
470Returns a single value from the environment database.
471
472=item cf::db_put $family => $key => $value
473
474Stores the given C<$value> in the family. It can currently store binary
475data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
476
477=cut
478
479our $DB;
480
481sub db_init {
482 unless ($DB) {
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job {
486 eval {
487 $DB->set_flags (BDB::CHKSUM);
488
489 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491 cf::cleanup "db_open(db): $!" if $!;
492 };
493 cf::cleanup "db_open(db): $@" if $@;
494 };
495 }
496}
497
498sub db_get($$) {
499 my $key = "$_[0]/$_[1]";
500
501 cf::sync_job {
502 BDB::db_get $DB, undef, $key, my $data;
503
504 $! ? ()
505 : $data
506 }
507}
508
509sub db_put($$$) {
510 BDB::dbreq_pri 4;
511 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
512}
513
514=item cf::cache $id => [$paths...], $processversion => $process
515
516Generic caching function that returns the value of the resource $id,
517caching and regenerating as required.
518
519This function can block.
520
521=cut
522
523sub cache {
524 my ($id, $src, $processversion, $process) = @_;
525
526 my $meta =
527 join "\x00",
528 $processversion,
529 map {
530 aio_stat $_
531 and Carp::croak "$_: $!";
532
533 ($_, (stat _)[7,9])
534 } @$src;
535
536 my $dbmeta = db_get cache => "$id/meta";
537 if ($dbmeta ne $meta) {
538 # changed, we may need to process
539
540 my @data;
541 my $md5;
542
543 for (0 .. $#$src) {
544 0 <= aio_load $src->[$_], $data[$_]
545 or Carp::croak "$src->[$_]: $!";
546 }
547
548 # if processing is expensive, check
549 # checksum first
550 if (1) {
551 $md5 =
552 join "\x00",
553 $processversion,
554 map {
555 Coro::cede;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src;
558
559
560 my $dbmd5 = db_get cache => "$id/md5";
561 if ($dbmd5 eq $md5) {
562 db_put cache => "$id/meta", $meta;
563
564 return db_get cache => "$id/data";
565 }
566 }
567
568 my $t1 = Time::HiRes::time;
569 my $data = $process->(\@data);
570 my $t2 = Time::HiRes::time;
571
572 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
573
574 db_put cache => "$id/data", $data;
575 db_put cache => "$id/md5" , $md5;
576 db_put cache => "$id/meta", $meta;
577
578 return $data;
579 }
580
581 db_get cache => "$id/data"
374} 582}
375 583
376=item cf::datalog type => key => value, ... 584=item cf::datalog type => key => value, ...
377 585
378Log a datalog packet of the given type with the given key-value pairs. 586Log a datalog packet of the given type with the given key-value pairs.
396attach callbacks/event handlers (a collection of which is called an "attachment") 604attach callbacks/event handlers (a collection of which is called an "attachment")
397to it. All such attachable objects support the following methods. 605to it. All such attachable objects support the following methods.
398 606
399In the following description, CLASS can be any of C<global>, C<object> 607In the following description, CLASS can be any of C<global>, C<object>
400C<player>, C<client> or C<map> (i.e. the attachable objects in 608C<player>, C<client> or C<map> (i.e. the attachable objects in
401crossfire+). 609Crossfire TRT).
402 610
403=over 4 611=over 4
404 612
405=item $attachable->attach ($attachment, key => $value...) 613=item $attachable->attach ($attachment, key => $value...)
406 614
569 $registry = $CB_TYPE[$object_type] ||= []; 777 $registry = $CB_TYPE[$object_type] ||= [];
570 778
571 } elsif ($type eq "subtype") { 779 } elsif ($type eq "subtype") {
572 defined $object_type or Carp::croak "subtype specified without type"; 780 defined $object_type or Carp::croak "subtype specified without type";
573 my $object_subtype = shift @arg; 781 my $object_subtype = shift @arg;
574 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 782 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
575 783
576 } elsif ($type eq "package") { 784 } elsif ($type eq "package") {
577 my $pkg = shift @arg; 785 my $pkg = shift @arg;
578 786
579 while (my ($name, $id) = each %cb_id) { 787 while (my ($name, $id) = each %cb_id) {
608 _attach $registry, $klass, @attach; 816 _attach $registry, $klass, @attach;
609 } 817 }
610 818
611 $obj->{$name} = \%arg; 819 $obj->{$name} = \%arg;
612 } else { 820 } else {
613 warn "object uses attachment '$name' that is not available, postponing.\n"; 821 warn "object uses attachment '$name' which is not available, postponing.\n";
614 } 822 }
615 823
616 $obj->{_attachment}{$name} = undef; 824 $obj->{_attachment}{$name} = undef;
617} 825}
618 826
620 if (ref $_[0]) { 828 if (ref $_[0]) {
621 _object_attach @_; 829 _object_attach @_;
622 } else { 830 } else {
623 _attach shift->_attach_registry, @_; 831 _attach shift->_attach_registry, @_;
624 } 832 }
833 _recalc_want;
625}; 834};
626 835
627# all those should be optimised 836# all those should be optimised
628sub cf::attachable::detach { 837sub cf::attachable::detach {
629 my ($obj, $name) = @_; 838 my ($obj, $name) = @_;
632 delete $obj->{_attachment}{$name}; 841 delete $obj->{_attachment}{$name};
633 reattach ($obj); 842 reattach ($obj);
634 } else { 843 } else {
635 Carp::croak "cannot, currently, detach class attachments"; 844 Carp::croak "cannot, currently, detach class attachments";
636 } 845 }
846 _recalc_want;
637}; 847};
638 848
639sub cf::attachable::attached { 849sub cf::attachable::attached {
640 my ($obj, $name) = @_; 850 my ($obj, $name) = @_;
641 851
814 or return; 1024 or return;
815 $av = eval { (Storable::thaw $av)->{objs} }; 1025 $av = eval { (Storable::thaw $av)->{objs} };
816 } 1026 }
817 1027
818 warn sprintf "loading %s (%d)\n", 1028 warn sprintf "loading %s (%d)\n",
819 $filename, length $data, scalar @{$av || []};#d# 1029 $filename, length $data, scalar @{$av || []};
820 return ($data, $av); 1030 return ($data, $av);
821} 1031}
1032
1033=head2 COMMAND CALLBACKS
1034
1035=over 4
1036
1037=cut
822 1038
823############################################################################# 1039#############################################################################
824# command handling &c 1040# command handling &c
825 1041
826=item cf::register_command $name => \&callback($ob,$args); 1042=item cf::register_command $name => \&callback($ob,$args);
839 push @{ $COMMAND{$name} }, [$caller, $cb]; 1055 push @{ $COMMAND{$name} }, [$caller, $cb];
840} 1056}
841 1057
842=item cf::register_extcmd $name => \&callback($pl,$packet); 1058=item cf::register_extcmd $name => \&callback($pl,$packet);
843 1059
844Register a callbackf ro execution when the client sends an extcmd packet. 1060Register a callback for execution when the client sends an (synchronous)
1061extcmd packet. Ext commands will be processed in the order they are
1062received by the server, like other user commands. The first argument is
1063the logged-in player. Ext commands can only be processed after a player
1064has logged in successfully.
845 1065
846If the callback returns something, it is sent back as if reply was being 1066If the callback returns something, it is sent back as if reply was being
847called. 1067called.
848 1068
1069=item cf::register_exticmd $name => \&callback($ns,$packet);
1070
1071Register a callback for execution when the client sends an (asynchronous)
1072exticmd packet. Exti commands are processed by the server as soon as they
1073are received, i.e. out of order w.r.t. other commands. The first argument
1074is a client socket. Exti commands can be received anytime, even before
1075log-in.
1076
1077If the callback returns something, it is sent back as if reply was being
1078called.
1079
849=cut 1080=cut
850 1081
851sub register_extcmd { 1082sub register_extcmd {
852 my ($name, $cb) = @_; 1083 my ($name, $cb) = @_;
853 1084
854 $EXTCMD{$name} = $cb; 1085 $EXTCMD{$name} = $cb;
1086}
1087
1088sub register_exticmd {
1089 my ($name, $cb) = @_;
1090
1091 $EXTICMD{$name} = $cb;
855} 1092}
856 1093
857cf::player->attach ( 1094cf::player->attach (
858 on_command => sub { 1095 on_command => sub {
859 my ($pl, $name, $params) = @_; 1096 my ($pl, $name, $params) = @_;
868 cf::override; 1105 cf::override;
869 }, 1106 },
870 on_extcmd => sub { 1107 on_extcmd => sub {
871 my ($pl, $buf) = @_; 1108 my ($pl, $buf) = @_;
872 1109
873 my $msg = eval { from_json $buf }; 1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
874 1111
875 if (ref $msg) { 1112 if (ref $msg) {
876 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
877 if (my %reply = $cb->($pl, $msg)) { 1114 if (my %reply = $cb->($pl, $msg)) {
878 $pl->ext_reply ($msg->{msgid}, %reply); 1115 $pl->ext_reply ($msg->{msgid}, %reply);
884 1121
885 cf::override; 1122 cf::override;
886 }, 1123 },
887); 1124);
888 1125
889sub load_extension {
890 my ($path) = @_;
891
892 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
893 my $base = $1;
894 my $pkg = $1;
895 $pkg =~ s/[^[:word:]]/_/g;
896 $pkg = "ext::$pkg";
897
898 warn "... loading '$path' into '$pkg'\n";
899
900 open my $fh, "<:utf8", $path
901 or die "$path: $!";
902
903 my $source =
904 "package $pkg; use strict; use utf8;\n"
905 . "#line 1 \"$path\"\n{\n"
906 . (do { local $/; <$fh> })
907 . "\n};\n1";
908
909 unless (eval $source) {
910 my $msg = $@ ? "$path: $@\n"
911 : "extension disabled.\n";
912 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
913 warn $@;
914 warn "mandatory extension failed to load, exiting.\n";
915 exit 1;
916 }
917 die $@;
918 }
919
920 push @EXTS, $pkg;
921}
922
923sub load_extensions { 1126sub load_extensions {
1127 cf::sync_job {
1128 my %todo;
1129
924 for my $ext (<$LIBDIR/*.ext>) { 1130 for my $path (<$LIBDIR/*.ext>) {
925 next unless -r $ext; 1131 next unless -r $path;
926 eval { 1132
927 load_extension $ext; 1133 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1134 my $base = $1;
1135 my $pkg = $1;
1136 $pkg =~ s/[^[:word:]]/_/g;
1137 $pkg = "ext::$pkg";
1138
1139 open my $fh, "<:utf8", $path
1140 or die "$path: $!";
1141
1142 my $source = do { local $/; <$fh> };
1143
1144 my %ext = (
1145 path => $path,
1146 base => $base,
1147 pkg => $pkg,
1148 );
1149
1150 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1151 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1152
1153 $ext{source} =
1154 "package $pkg; use strict; use utf8;\n"
1155 . "#line 1 \"$path\"\n{\n"
1156 . $source
1157 . "\n};\n1";
1158
1159 $todo{$base} = \%ext;
1160 }
1161
1162 my %done;
1163 while (%todo) {
1164 my $progress;
1165
1166 while (my ($k, $v) = each %todo) {
1167 for (split /,\s*/, $v->{meta}{depends}) {
1168 goto skip
1169 unless exists $done{$_};
1170 }
1171
1172 warn "... loading '$k' into '$v->{pkg}'\n";
1173
1174 unless (eval $v->{source}) {
1175 my $msg = $@ ? "$v->{path}: $@\n"
1176 : "$v->{base}: extension inactive.\n";
1177
1178 if (exists $v->{meta}{mandatory}) {
1179 warn $msg;
1180 warn "mandatory extension failed to load, exiting.\n";
1181 exit 1;
1182 }
1183
1184 warn $msg;
1185 }
1186
1187 $done{$k} = delete $todo{$k};
1188 push @EXTS, $v->{pkg};
1189 $progress = 1;
928 1 1190 }
929 } or warn "$ext not loaded: $@"; 1191
1192 skip:
1193 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1194 unless $progress;
1195 }
930 } 1196 };
931} 1197}
932 1198
933############################################################################# 1199#############################################################################
934 1200
1201=back
1202
935=head2 CORE EXTENSIONS 1203=head2 CORE EXTENSIONS
936 1204
937Functions and methods that extend core crossfire objects. 1205Functions and methods that extend core crossfire objects.
938 1206
939=cut 1207=cut
951Returns the given player object, loading it if necessary (might block). 1219Returns the given player object, loading it if necessary (might block).
952 1220
953=cut 1221=cut
954 1222
955sub playerdir($) { 1223sub playerdir($) {
956 cf::localdir 1224 "$PLAYERDIR/"
957 . "/"
958 . cf::playerdir
959 . "/"
960 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1225 . (ref $_[0] ? $_[0]->ob->name : $_[0])
961} 1226}
962 1227
963sub path($) { 1228sub path($) {
964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1229 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1084while and may block, so not sync_job-capable, ever. 1349while and may block, so not sync_job-capable, ever.
1085 1350
1086=cut 1351=cut
1087 1352
1088sub list_logins { 1353sub list_logins {
1089 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1354 my $dirs = aio_readdir $PLAYERDIR
1090 or return []; 1355 or return [];
1091 1356
1092 my @logins; 1357 my @logins;
1093 1358
1094 for my $login (@$dirs) { 1359 for my $login (@$dirs) {
1129 } 1394 }
1130 1395
1131 \@paths 1396 \@paths
1132} 1397}
1133 1398
1399=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1400
1401Expand crossfire pod fragments into protocol xml.
1402
1403=cut
1404
1405sub expand_cfpod {
1406 ((my $self), (local $_)) = @_;
1407
1408 # escape & and <
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411
1412 # this is buggy, it needs to properly take care of nested <'s
1413
1414 1 while
1415 # replace B<>, I<>, U<> etc.
1416 s/B<([^\>]*)>/<b>$1<\/b>/
1417 || s/I<([^\>]*)>/<i>$1<\/i>/
1418 || s/U<([^\>]*)>/<u>$1<\/u>/
1419 # replace G<male|female> tags
1420 || s{G<([^>|]*)\|([^>]*)>}{
1421 $self->gender ? $2 : $1
1422 }ge
1423 # replace H<hint text>
1424 || s{H<([^\>]*)>}
1425 {
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "")
1429 [$self->{hintmode}]
1430 }ge;
1431
1432 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g;
1434
1435 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines
1440
1441 $_
1442}
1443
1444sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode}
1447}
1448
1134=item $player->ext_reply ($msgid, %msg) 1449=item $player->ext_reply ($msgid, %msg)
1135 1450
1136Sends an ext reply to the player. 1451Sends an ext reply to the player.
1137 1452
1138=cut 1453=cut
1139 1454
1140sub ext_reply($$%) { 1455sub ext_reply($$%) {
1141 my ($self, $id, %msg) = @_; 1456 my ($self, $id, %msg) = @_;
1142 1457
1143 $msg{msgid} = $id; 1458 $msg{msgid} = $id;
1144 1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1145 $self->send ("ext " . cf::to_json \%msg);
1146} 1460}
1147 1461
1148=item $player->ext_event ($type, %msg) 1462=item $player->ext_event ($type, %msg)
1149 1463
1150Sends an ext event to the client. 1464Sends an ext event to the client.
1165 1479
1166package cf::region; 1480package cf::region;
1167 1481
1168=item cf::region::find_by_path $path 1482=item cf::region::find_by_path $path
1169 1483
1170Tries to decuce the probable region for a map knowing only its path. 1484Tries to decuce the likely region for a map knowing only its path.
1171 1485
1172=cut 1486=cut
1173 1487
1174sub find_by_path($) { 1488sub find_by_path($) {
1175 my ($path) = @_; 1489 my ($path) = @_;
1249 my ($self, $merge) = @_; 1563 my ($self, $merge) = @_;
1250 1564
1251 # we have to keep some variables in memory intact 1565 # we have to keep some variables in memory intact
1252 local $self->{path}; 1566 local $self->{path};
1253 local $self->{load_path}; 1567 local $self->{load_path};
1254 local $self->{deny_save};
1255 local $self->{deny_reset};
1256 1568
1257 $self->SUPER::thawer_merge ($merge); 1569 $self->SUPER::thawer_merge ($merge);
1258} 1570}
1259 1571
1260sub normalise { 1572sub normalise {
1332 1644
1333# the original (read-only) location 1645# the original (read-only) location
1334sub load_path { 1646sub load_path {
1335 my ($self) = @_; 1647 my ($self) = @_;
1336 1648
1337 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1649 "$MAPDIR/$self->{path}.map"
1338} 1650}
1339 1651
1340# the temporary/swap location 1652# the temporary/swap location
1341sub save_path { 1653sub save_path {
1342 my ($self) = @_; 1654 my ($self) = @_;
1343 1655
1344 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1345 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1657 "$TMPDIR/$path.map"
1346} 1658}
1347 1659
1348# the unique path, undef == no special unique path 1660# the unique path, undef == no special unique path
1349sub uniq_path { 1661sub uniq_path {
1350 my ($self) = @_; 1662 my ($self) = @_;
1351 1663
1352 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1353 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1665 "$UNIQUEDIR/$path"
1354} 1666}
1355 1667
1356# and all this just because we cannot iterate over 1668# and all this just because we cannot iterate over
1357# all maps in C++... 1669# all maps in C++...
1358sub change_all_map_light { 1670sub change_all_map_light {
1359 my ($change) = @_; 1671 my ($change) = @_;
1360 1672
1361 $_->change_map_light ($change) 1673 $_->change_map_light ($change)
1362 for grep $_->outdoor, values %cf::MAP; 1674 for grep $_->outdoor, values %cf::MAP;
1675}
1676
1677sub decay_objects {
1678 my ($self) = @_;
1679
1680 return if $self->{deny_reset};
1681
1682 $self->do_decay_objects;
1363} 1683}
1364 1684
1365sub unlink_save { 1685sub unlink_save {
1366 my ($self) = @_; 1686 my ($self) = @_;
1367 1687
1425 $self->load_header_orig 1745 $self->load_header_orig
1426 or return; 1746 or return;
1427 $self->prepare_orig; 1747 $self->prepare_orig;
1428 } 1748 }
1429 1749
1750 $self->{deny_reset} = 1
1751 if $self->no_reset;
1752
1430 $self->default_region (cf::region::find_by_path $self->{path}) 1753 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region; 1754 unless $self->default_region;
1432 1755
1433 1 1756 1
1434} 1757}
1449 $map->{last_save} = $cf::RUNTIME; 1772 $map->{last_save} = $cf::RUNTIME;
1450 1773
1451 $map->load_header 1774 $map->load_header
1452 or return; 1775 or return;
1453 1776
1454 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1455 # doing this can freeze the server in a sync job, obviously 1778 # doing this can freeze the server in a sync job, obviously
1456 #$cf::WAIT_FOR_TICK->wait; 1779 #$cf::WAIT_FOR_TICK->wait;
1457 $map->reset; 1780 $map->reset;
1458 undef $guard; 1781 undef $guard;
1459 return find $path; 1782 return find $path;
1470 my ($self) = @_; 1793 my ($self) = @_;
1471 1794
1472 local $self->{deny_reset} = 1; # loading can take a long time 1795 local $self->{deny_reset} = 1; # loading can take a long time
1473 1796
1474 my $path = $self->{path}; 1797 my $path = $self->{path};
1798
1799 {
1475 my $guard = cf::lock_acquire "map_load:$path"; 1800 my $guard = cf::lock_acquire "map_load:$path";
1476 1801
1477 return if $self->in_memory != cf::MAP_SWAPPED; 1802 return if $self->in_memory != cf::MAP_SWAPPED;
1478 1803
1479 $self->in_memory (cf::MAP_LOADING); 1804 $self->in_memory (cf::MAP_LOADING);
1480 1805
1481 $self->alloc; 1806 $self->alloc;
1482 1807
1483 $self->pre_load; 1808 $self->pre_load;
1484 Coro::cede;
1485
1486 $self->_load_objects ($self->{load_path}, 1)
1487 or return;
1488
1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1490 if delete $self->{load_original};
1491
1492 if (my $uniq = $self->uniq_path) {
1493 utf8::encode $uniq;
1494 if (aio_open $uniq, O_RDONLY, 0) {
1495 $self->clear_unique_items;
1496 $self->_load_objects ($uniq, 0);
1497 }
1498 }
1499
1500 Coro::cede;
1501 # now do the right thing for maps
1502 $self->link_multipart_objects;
1503 Coro::cede;
1504
1505 unless ($self->{deny_activate}) {
1506 $self->decay_objects;
1507 $self->fix_auto_apply;
1508 $self->update_buttons;
1509 Coro::cede; 1809 Coro::cede;
1510 $self->set_darkness_map; 1810
1811 $self->_load_objects ($self->{load_path}, 1)
1812 or return;
1813
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815 if delete $self->{load_original};
1816
1817 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) {
1820 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0);
1822 }
1823 }
1824
1825 Coro::cede;
1826 # now do the right thing for maps
1827 $self->link_multipart_objects;
1511 $self->difficulty ($self->estimate_difficulty) 1828 $self->difficulty ($self->estimate_difficulty)
1512 unless $self->difficulty; 1829 unless $self->difficulty;
1513 Coro::cede; 1830 Coro::cede;
1831
1832 unless ($self->{deny_activate}) {
1833 $self->decay_objects;
1834 $self->fix_auto_apply;
1835 $self->update_buttons;
1836 Coro::cede;
1837 $self->set_darkness_map;
1838 Coro::cede;
1514 $self->activate; 1839 $self->activate;
1515 Coro::cede; 1840 }
1841
1842 $self->in_memory (cf::MAP_IN_MEMORY);
1516 } 1843 }
1517 1844
1518 $self->post_load; 1845 $self->post_load;
1519 Coro::cede;
1520
1521 $self->in_memory (cf::MAP_IN_MEMORY);
1522} 1846}
1523 1847
1524sub customise_for { 1848sub customise_for {
1525 my ($self, $ob) = @_; 1849 my ($self, $ob) = @_;
1526 1850
1527 return find "~" . $ob->name . "/" . $self->{path} 1851 return find "~" . $ob->name . "/" . $self->{path}
1528 if $self->per_player; 1852 if $self->per_player;
1853
1854# return find "?party/" . $ob->name . "/" . $self->{path}
1855# if $self->per_party;
1529 1856
1530 $self 1857 $self
1531} 1858}
1532 1859
1533# find and load all maps in the 3x3 area around a map 1860# find and load all maps in the 3x3 area around a map
1644 1971
1645sub reset_at { 1972sub reset_at {
1646 my ($self) = @_; 1973 my ($self) = @_;
1647 1974
1648 # TODO: safety, remove and allow resettable per-player maps 1975 # TODO: safety, remove and allow resettable per-player maps
1649 return 1e99 if $self->isa ("ext::map_per_player");#d#
1650 return 1e99 if $self->{deny_reset}; 1976 return 1e99 if $self->{deny_reset};
1651 1977
1652 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1978 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1653 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1979 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1654 1980
1665 my ($self) = @_; 1991 my ($self) = @_;
1666 1992
1667 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1993 my $lock = cf::lock_acquire "map_data:$self->{path}";
1668 1994
1669 return if $self->players; 1995 return if $self->players;
1670 return if $self->isa ("ext::map_per_player");#d#
1671 1996
1672 warn "resetting map ", $self->path;#d# 1997 warn "resetting map ", $self->path;
1673 1998
1674 $self->in_memory (cf::MAP_SWAPPED); 1999 $self->in_memory (cf::MAP_SWAPPED);
1675 2000
1676 # need to save uniques path 2001 # need to save uniques path
1677 unless ($self->{deny_save}) { 2002 unless ($self->{deny_save}) {
1709 $cf::MAP{$self->path} = $self; 2034 $cf::MAP{$self->path} = $self;
1710 2035
1711 $self->reset; # polite request, might not happen 2036 $self->reset; # polite request, might not happen
1712} 2037}
1713 2038
2039=item $maps = cf::map::tmp_maps
2040
2041Returns an arrayref with all map paths of currently instantiated and saved
2042maps. May block.
2043
2044=cut
2045
2046sub tmp_maps() {
2047 [
2048 map {
2049 utf8::decode $_;
2050 /\.map$/
2051 ? normalise $_
2052 : ()
2053 } @{ aio_readdir $TMPDIR or [] }
2054 ]
2055}
2056
2057=item $maps = cf::map::random_maps
2058
2059Returns an arrayref with all map paths of currently instantiated and saved
2060random maps. May block.
2061
2062=cut
2063
2064sub random_maps() {
2065 [
2066 map {
2067 utf8::decode $_;
2068 /\.map$/
2069 ? normalise "?random/$_"
2070 : ()
2071 } @{ aio_readdir $RANDOMDIR or [] }
2072 ]
2073}
2074
1714=item cf::map::unique_maps 2075=item cf::map::unique_maps
1715 2076
1716Returns an arrayref of paths of all shared maps that have 2077Returns an arrayref of paths of all shared maps that have
1717instantiated unique items. May block. 2078instantiated unique items. May block.
1718 2079
1719=cut 2080=cut
1720 2081
1721sub unique_maps() { 2082sub unique_maps() {
1722 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2083 [
1723 or return; 2084 map {
1724
1725 my @paths;
1726
1727 for (@$files) {
1728 utf8::decode $_; 2085 utf8::decode $_;
1729 next if /\.pst$/; 2086 /\.map$/
1730 next unless /^$PATH_SEP/o; 2087 ? normalise $_
1731 2088 : ()
1732 push @paths, cf::map::normalise $_; 2089 } @{ aio_readdir $UNIQUEDIR or [] }
1733 } 2090 ]
1734
1735 \@paths
1736} 2091}
1737 2092
1738package cf; 2093package cf;
1739 2094
1740=back 2095=back
1786 2141
1787 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2142 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1788 2143
1789 if ($self->{record_replies}) { 2144 if ($self->{record_replies}) {
1790 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2145 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2146
1791 } else { 2147 } else {
2148 my $pl = $self->contr;
2149
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply (
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158
2159 } else {
1792 $msg = $npc->name . " says: $msg" if $npc; 2160 $msg = $npc->name . " says: $msg" if $npc;
1793 $self->message ($msg, $flags); 2161 $self->message ($msg, $flags);
2162 }
1794 } 2163 }
1795} 2164}
1796 2165
1797=item $player_object->may ("access") 2166=item $player_object->may ("access")
1798 2167
1846 $self->deactivate_recursive; 2215 $self->deactivate_recursive;
1847 2216
1848 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2217 return if UNIVERSAL::isa $self->map, "ext::map_link";
1849 2218
1850 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2219 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1851 if $self->map; 2220 if $self->map && $self->map->{path} ne "{link}";
1852 2221
1853 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2222 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1854} 2223}
1855 2224
1856sub cf::object::player::leave_link { 2225sub cf::object::player::leave_link {
1857 my ($self, $map, $x, $y) = @_; 2226 my ($self, $map, $x, $y) = @_;
2227
2228 return unless $self->contr->active;
1858 2229
1859 my $link_pos = delete $self->{_link_pos}; 2230 my $link_pos = delete $self->{_link_pos};
1860 2231
1861 unless ($map) { 2232 unless ($map) {
1862 # restore original map position 2233 # restore original map position
1885 2256
1886 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1887 $self->enter_map ($map, $x, $y); 2258 $self->enter_map ($map, $x, $y);
1888} 2259}
1889 2260
1890cf::player->attach (
1891 on_logout => sub {
1892 my ($pl) = @_;
1893
1894 # abort map switching before logout
1895 if ($pl->ob->{_link_pos}) {
1896 cf::sync_job {
1897 $pl->ob->leave_link
1898 };
1899 }
1900 },
1901 on_login => sub {
1902 my ($pl) = @_;
1903
1904 # try to abort aborted map switching on player login :)
1905 # should happen only on crashes
1906 if ($pl->ob->{_link_pos}) {
1907 $pl->ob->enter_link;
1908 (async {
1909 $pl->ob->reply (undef,
1910 "There was an internal problem at your last logout, "
1911 . "the server will try to bring you to your intended destination in a second.",
1912 cf::NDI_RED);
1913 # we need this sleep as the login has a concurrent enter_exit running
1914 # and this sleep increases chances of the player not ending up in scorn
1915 Coro::Timer::sleep 1;
1916 $pl->ob->leave_link;
1917 })->prio (2);
1918 }
1919 },
1920);
1921
1922=item $player_object->goto ($path, $x, $y) 2261=item $player_object->goto ($path, $x, $y[, $check->($map)])
1923 2262
2263Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position.
2267
1924=cut 2268=cut
2269
2270our $GOTOGEN;
1925 2271
1926sub cf::object::player::goto { 2272sub cf::object::player::goto {
1927 my ($self, $path, $x, $y) = @_; 2273 my ($self, $path, $x, $y, $check) = @_;
2274
2275 # do generation counting so two concurrent goto's will be executed in-order
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1928 2277
1929 $self->enter_link; 2278 $self->enter_link;
1930 2279
1931 (async { 2280 (async {
1932 my $map = eval { 2281 my $map = eval {
1933 my $map = cf::map::find $path; 2282 my $map = cf::map::find $path;
2283
2284 if ($map) {
1934 $map = $map->customise_for ($self) if $map; 2285 $map = $map->customise_for ($self);
2286 $map = $check->($map) if $check && $map;
2287 } else {
2288 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2289 }
2290
1935 $map 2291 $map
2292 };
2293
2294 if ($@) {
2295 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2296 LOG llevError | logBacktrace, Carp::longmess $@;
1936 } or 2297 }
1937 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1938 2298
2299 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation};
1939 $self->leave_link ($map, $x, $y); 2301 $self->leave_link ($map, $x, $y);
2302 }
1940 })->prio (1); 2303 })->prio (1);
1941} 2304}
1942 2305
1943=item $player_object->enter_exit ($exit_object) 2306=item $player_object->enter_exit ($exit_object)
1944 2307
1983 2346
1984 $rmp->{random_seed} ||= $exit->random_seed; 2347 $rmp->{random_seed} ||= $exit->random_seed;
1985 2348
1986 my $data = cf::to_json $rmp; 2349 my $data = cf::to_json $rmp;
1987 my $md5 = Digest::MD5::md5_hex $data; 2350 my $md5 = Digest::MD5::md5_hex $data;
1988 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2351 my $meta = "$RANDOMDIR/$md5.meta";
1989 2352
1990 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2353 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1991 aio_write $fh, 0, (length $data), $data, 0; 2354 aio_write $fh, 0, (length $data), $data, 0;
1992 undef $fh; 2355 undef $fh;
1993 aio_rename "$meta~", $meta; 2356 aio_rename "$meta~", $meta;
2012 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2375 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2013 my $hp = $exit->stats->hp; 2376 my $hp = $exit->stats->hp;
2014 my $sp = $exit->stats->sp; 2377 my $sp = $exit->stats->sp;
2015 2378
2016 $self->enter_link; 2379 $self->enter_link;
2380
2381 # if exit is damned, update players death & WoR home-position
2382 $self->contr->savebed ($slaying, $hp, $sp)
2383 if $exit->flag (FLAG_DAMNED);
2017 2384
2018 (async { 2385 (async {
2019 $self->deactivate_recursive; # just to be sure 2386 $self->deactivate_recursive; # just to be sure
2020 unless (eval { 2387 unless (eval {
2021 $self->goto ($slaying, $hp, $sp); 2388 $self->goto ($slaying, $hp, $sp);
2049 2416
2050 utf8::encode $text; 2417 utf8::encode $text;
2051 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2418 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2052} 2419}
2053 2420
2421=item $client->send_msg ($color, $type, $msg, [extra...])
2422
2423Send a drawinfo or msg packet to the client, formatting the msg for the
2424client if neccessary. C<$type> should be a string identifying the type of
2425the message, with C<log> being the default. If C<$color> is negative, suppress
2426the message unless the client supports the msg packet.
2427
2428=cut
2429
2430sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_;
2432
2433 $msg = $self->pl->expand_cfpod ($msg);
2434
2435 return unless @extra || length $msg;
2436
2437 if ($self->can_msg) {
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2439 } else {
2440 # replace some tags by gcfclient-compatible ones
2441 for ($msg) {
2442 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448 }
2449
2450 if ($color >= 0) {
2451 if (0 && $msg =~ /\[/) {
2452 $self->send_packet ("drawextinfo $color 4 0 $msg")
2453 } else {
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg")
2456 }
2457 }
2458 }
2459}
2460
2054=item $client->ext_event ($type, %msg) 2461=item $client->ext_event ($type, %msg)
2055 2462
2056Sends an exti event to the client. 2463Sends an ext event to the client.
2057 2464
2058=cut 2465=cut
2059 2466
2060sub cf::client::ext_event($$%) { 2467sub cf::client::ext_event($$%) {
2061 my ($self, $type, %msg) = @_; 2468 my ($self, $type, %msg) = @_;
2062 2469
2063 $msg{msgtype} = "event_$type"; 2470 $msg{msgtype} = "event_$type";
2064 $self->send_packet ("ext " . cf::to_json \%msg); 2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2065} 2472}
2066 2473
2067=item $success = $client->query ($flags, "text", \&cb) 2474=item $success = $client->query ($flags, "text", \&cb)
2068 2475
2069Queues a query to the client, calling the given callback with 2476Queues a query to the client, calling the given callback with
2070the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2477the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2071C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2478C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2072 2479
2073Queries can fail, so check the return code. Or don't, as queries will become 2480Queries can fail, so check the return code. Or don't, as queries will
2074reliable at some point in the future. 2481become reliable at some point in the future.
2075 2482
2076=cut 2483=cut
2077 2484
2078sub cf::client::query { 2485sub cf::client::query {
2079 my ($self, $flags, $text, $cb) = @_; 2486 my ($self, $flags, $text, $cb) = @_;
2087 utf8::encode $text; 2494 utf8::encode $text;
2088 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2495 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2089 2496
2090 $self->send_packet ($self->{query_queue}[0][0]) 2497 $self->send_packet ($self->{query_queue}[0][0])
2091 if @{ $self->{query_queue} } == 1; 2498 if @{ $self->{query_queue} } == 1;
2499
2500 1
2092} 2501}
2093 2502
2094cf::client->attach ( 2503cf::client->attach (
2504 on_connect => sub {
2505 my ($ns) = @_;
2506
2507 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2508 },
2095 on_reply => sub { 2509 on_reply => sub {
2096 my ($ns, $msg) = @_; 2510 my ($ns, $msg) = @_;
2097 2511
2098 # this weird shuffling is so that direct followup queries 2512 # this weird shuffling is so that direct followup queries
2099 # get handled first 2513 # get handled first
2111 } else { 2525 } else {
2112 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2526 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2113 } 2527 }
2114 } 2528 }
2115 }, 2529 },
2530 on_exticmd => sub {
2531 my ($ns, $buf) = @_;
2532
2533 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534
2535 if (ref $msg) {
2536 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2537 if (my %reply = $cb->($ns, $msg)) {
2538 $reply{msgid} = $msg->{msgid};
2539 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540 }
2541 }
2542 } else {
2543 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544 }
2545
2546 cf::override;
2547 },
2116); 2548);
2117 2549
2118=item $client->async (\&cb) 2550=item $client->async (\&cb)
2119 2551
2120Create a new coroutine, running the specified callback. The coroutine will 2552Create a new coroutine, running the specified callback. The coroutine will
2169 2601
2170=pod 2602=pod
2171 2603
2172The following functions and methods are available within a safe environment: 2604The following functions and methods are available within a safe environment:
2173 2605
2174 cf::object contr pay_amount pay_player map 2606 cf::object
2607 contr pay_amount pay_player map x y force_find force_add
2608 insert remove
2609
2175 cf::object::player player 2610 cf::object::player
2176 cf::player peaceful 2611 player
2177 cf::map trigger 2612
2613 cf::player
2614 peaceful
2615
2616 cf::map
2617 trigger
2178 2618
2179=cut 2619=cut
2180 2620
2181for ( 2621for (
2182 ["cf::object" => qw(contr pay_amount pay_player map)], 2622 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2623 insert remove)],
2183 ["cf::object::player" => qw(player)], 2624 ["cf::object::player" => qw(player)],
2184 ["cf::player" => qw(peaceful)], 2625 ["cf::player" => qw(peaceful)],
2185 ["cf::map" => qw(trigger)], 2626 ["cf::map" => qw(trigger)],
2186) { 2627) {
2187 no strict 'refs'; 2628 no strict 'refs';
2258=back 2699=back
2259 2700
2260=cut 2701=cut
2261 2702
2262############################################################################# 2703#############################################################################
2263
2264=head2 EXTENSION DATABASE SUPPORT
2265
2266Crossfire maintains a very simple database for extension use. It can
2267currently store anything that can be serialised using Storable, which
2268excludes objects.
2269
2270The parameter C<$family> should best start with the name of the extension
2271using it, it should be unique.
2272
2273=over 4
2274
2275=item $value = cf::db_get $family => $key
2276
2277Returns a single value from the database.
2278
2279=item cf::db_put $family => $key => $value
2280
2281Stores the given C<$value> in the family.
2282
2283=cut
2284
2285our $DB;
2286
2287sub db_init {
2288 unless ($DB) {
2289 $DB = BDB::db_create $DB_ENV;
2290
2291 cf::sync_job {
2292 eval {
2293 $DB->set_flags (BDB::CHKSUM);
2294
2295 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!;
2298 };
2299 cf::cleanup "db_open(db): $@" if $@;
2300 };
2301
2302 my $path = cf::localdir . "/database.pst";
2303 if (stat $path) {
2304 cf::sync_job {
2305 my $pst = Storable::retrieve $path;
2306
2307 cf::db_put (board => data => $pst->{board});
2308 cf::db_put (guildrules => data => $pst->{guildrules});
2309 cf::db_put (rent => balance => $pst->{rent}{balance});
2310 BDB::db_env_txn_checkpoint $DB_ENV;
2311
2312 unlink $path;
2313 };
2314 }
2315 }
2316}
2317
2318sub db_get($$) {
2319 my $key = "$_[0]/$_[1]";
2320
2321 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data;
2323
2324 $! ? ()
2325 : Compress::LZF::sthaw $data
2326 }
2327}
2328
2329sub db_put($$$) {
2330 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2332}
2333
2334#############################################################################
2335# the server's init and main functions 2704# the server's init and main functions
2336 2705
2337sub load_facedata($) { 2706sub load_facedata($) {
2338 my ($path) = @_; 2707 my ($path) = @_;
2339 2708
2351 { 2720 {
2352 my $faces = $facedata->{faceinfo}; 2721 my $faces = $facedata->{faceinfo};
2353 2722
2354 while (my ($face, $info) = each %$faces) { 2723 while (my ($face, $info) = each %$faces) {
2355 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2724 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2356 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2725 cf::face::set_visibility $idx, $info->{visibility};
2726 cf::face::set_magicmap $idx, $info->{magicmap};
2357 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2727 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2358 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2728 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2359 Coro::cede; 2729
2730 cf::cede_to_tick;
2360 } 2731 }
2361 2732
2362 while (my ($face, $info) = each %$faces) { 2733 while (my ($face, $info) = each %$faces) {
2363 next unless $info->{smooth}; 2734 next unless $info->{smooth};
2364 my $idx = cf::face::find $face 2735 my $idx = cf::face::find $face
2365 or next; 2736 or next;
2366 if (my $smooth = cf::face::find $info->{smooth}) { 2737 if (my $smooth = cf::face::find $info->{smooth}) {
2738 cf::face::set_smooth $idx, $smooth;
2367 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2739 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2368 } else { 2740 } else {
2369 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2741 warn "smooth face '$info->{smooth}' not found for face '$face'";
2370 } 2742 }
2371 Coro::cede; 2743
2744 cf::cede_to_tick;
2372 } 2745 }
2373 } 2746 }
2374 2747
2375 { 2748 {
2376 my $anims = $facedata->{animinfo}; 2749 my $anims = $facedata->{animinfo};
2377 2750
2378 while (my ($anim, $info) = each %$anims) { 2751 while (my ($anim, $info) = each %$anims) {
2379 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2752 cf::anim::set $anim, $info->{frames}, $info->{facings};
2380 Coro::cede; 2753 cf::cede_to_tick;
2381 } 2754 }
2382 2755
2383 cf::anim::invalidate_all; # d'oh 2756 cf::anim::invalidate_all; # d'oh
2384 } 2757 }
2385 2758
2759 {
2760 # TODO: for gcfclient pleasure, we should give resources
2761 # that gcfclient doesn't grok a >10000 face index.
2762 my $res = $facedata->{resource};
2763 my $enc = JSON::XS->new->utf8->canonical;
2764
2765 while (my ($name, $info) = each %$res) {
2766 my $meta = $enc->encode ({
2767 name => $name,
2768 type => $info->{type},
2769 copyright => $info->{copyright}, #TODO#
2770 });
2771 my $data = pack "(w/a*)*", $meta, $info->{data};
2772 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2773
2774 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2775 cf::face::set_type $idx, 1;
2776 cf::face::set_data $idx, 0, $data, $chk;
2777
2778 cf::cede_to_tick;
2779 }
2780 }
2781
2386 1 2782 1
2387} 2783}
2388 2784
2785sub reload_regions {
2786 load_resource_file "$MAPDIR/regions"
2787 or die "unable to load regions file\n";
2788}
2789
2389sub reload_facedata { 2790sub reload_facedata {
2390 load_facedata sprintf "%s/facedata", cf::datadir 2791 load_facedata "$DATADIR/facedata"
2391 or die "unable to load facedata\n"; 2792 or die "unable to load facedata\n";
2392} 2793}
2393 2794
2394sub reload_regions {
2395 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2396 or die "unable to load regions file\n";
2397}
2398
2399sub reload_archetypes { 2795sub reload_archetypes {
2400 load_archetype_file sprintf "%s/archetypes", cf::datadir 2796 load_resource_file "$DATADIR/archetypes"
2401 or die "unable to load archetypes\n"; 2797 or die "unable to load archetypes\n";
2798 #d# NEED to laod twice to resolve forward references
2799 # this really needs to be done in an extra post-pass
2800 # (which needs to be synchronous, so solve it differently)
2801 load_resource_file "$DATADIR/archetypes"
2802 or die "unable to load archetypes\n";
2402} 2803}
2403 2804
2404sub reload_treasures { 2805sub reload_treasures {
2405 load_treasure_file sprintf "%s/treasures", cf::datadir 2806 load_resource_file "$DATADIR/treasures"
2406 or die "unable to load treasurelists\n"; 2807 or die "unable to load treasurelists\n";
2407} 2808}
2408 2809
2409sub reload_resources { 2810sub reload_resources {
2410 warn "reloading resource files...\n"; 2811 warn "reloading resource files...\n";
2411 2812
2412 reload_regions; 2813 reload_regions;
2413 reload_facedata; 2814 reload_facedata;
2815 #reload_archetypes;#d#
2414 reload_archetypes; 2816 reload_archetypes;
2415 reload_treasures; 2817 reload_treasures;
2416 2818
2417 warn "finished reloading resource files\n"; 2819 warn "finished reloading resource files\n";
2418} 2820}
2420sub init { 2822sub init {
2421 reload_resources; 2823 reload_resources;
2422} 2824}
2423 2825
2424sub cfg_load { 2826sub cfg_load {
2425 open my $fh, "<:utf8", cf::confdir . "/config" 2827 open my $fh, "<:utf8", "$CONFDIR/config"
2426 or return; 2828 or return;
2427 2829
2428 local $/; 2830 local $/;
2429 *CFG = YAML::Syck::Load <$fh>; 2831 *CFG = YAML::Syck::Load <$fh>;
2430 2832
2475 }, 2877 },
2476 ); 2878 );
2477 } 2879 }
2478} 2880}
2479 2881
2882sub write_runtime {
2883 my $runtime = "$LOCALDIR/runtime";
2884
2885 # first touch the runtime file to show we are still running:
2886 # the fsync below can take a very very long time.
2887
2888 IO::AIO::aio_utime $runtime, undef, undef;
2889
2890 my $guard = cf::lock_acquire "write_runtime";
2891
2892 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2893 or return;
2894
2895 my $value = $cf::RUNTIME + 90 + 10;
2896 # 10 is the runtime save interval, for a monotonic clock
2897 # 60 allows for the watchdog to kill the server.
2898
2899 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2900 and return;
2901
2902 # always fsync - this file is important
2903 aio_fsync $fh
2904 and return;
2905
2906 # touch it again to show we are up-to-date
2907 aio_utime $fh, undef, undef;
2908
2909 close $fh
2910 or return;
2911
2912 aio_rename "$runtime~", $runtime
2913 and return;
2914
2915 warn "runtime file written.\n";
2916
2917 1
2918}
2919
2480sub emergency_save() { 2920sub emergency_save() {
2481 my $freeze_guard = cf::freeze_mainloop; 2921 my $freeze_guard = cf::freeze_mainloop;
2482 2922
2483 warn "enter emergency perl save\n"; 2923 warn "enter emergency perl save\n";
2484 2924
2559 %EXT_CORO = (); 2999 %EXT_CORO = ();
2560 3000
2561 warn "removing commands"; 3001 warn "removing commands";
2562 %COMMAND = (); 3002 %COMMAND = ();
2563 3003
2564 warn "removing ext commands"; 3004 warn "removing ext/exti commands";
2565 %EXTCMD = (); 3005 %EXTCMD = ();
3006 %EXTICMD = ();
2566 3007
2567 warn "unloading/nuking all extensions"; 3008 warn "unloading/nuking all extensions";
2568 for my $pkg (@EXTS) { 3009 for my $pkg (@EXTS) {
2569 warn "... unloading $pkg"; 3010 warn "... unloading $pkg";
2570 3011
2600 Symbol::delete_package "safe::$_" 3041 Symbol::delete_package "safe::$_"
2601 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3042 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2602 3043
2603 warn "unloading cf.pm \"a bit\""; 3044 warn "unloading cf.pm \"a bit\"";
2604 delete $INC{"cf.pm"}; 3045 delete $INC{"cf.pm"};
3046 delete $INC{"cf/pod.pm"};
2605 3047
2606 # don't, removes xs symbols, too, 3048 # don't, removes xs symbols, too,
2607 # and global variables created in xs 3049 # and global variables created in xs
2608 #Symbol::delete_package __PACKAGE__; 3050 #Symbol::delete_package __PACKAGE__;
2609 3051
2687 my $signal = new Coro::Signal; 3129 my $signal = new Coro::Signal;
2688 push @WAIT_FOR_TICK_BEGIN, $signal; 3130 push @WAIT_FOR_TICK_BEGIN, $signal;
2689 $signal->wait; 3131 $signal->wait;
2690} 3132}
2691 3133
3134 my $min = 1e6;#d#
3135 my $avg = 10;
2692$TICK_WATCHER = Event->timer ( 3136$TICK_WATCHER = Event->timer (
2693 reentrant => 0, 3137 reentrant => 0,
2694 parked => 1, 3138 parked => 1,
2695 prio => 0, 3139 prio => 0,
2696 at => $NEXT_TICK || $TICK, 3140 at => $NEXT_TICK || $TICK,
2700 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3144 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2701 unless ++$bug_warning > 10; 3145 unless ++$bug_warning > 10;
2702 return; 3146 return;
2703 } 3147 }
2704 3148
2705 $NOW = Event::time; 3149 $NOW = $tick_start = Event::time;
2706 3150
2707 cf::server_tick; # one server iteration 3151 cf::server_tick; # one server iteration
3152
3153 0 && sync_job {#d#
3154 for(1..10) {
3155 my $t = Event::time;
3156 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3157 or die;
3158
3159 $map->width (50);
3160 $map->height (50);
3161 $map->alloc;
3162 $map->_load_objects ("/tmp/x.map", 1);
3163 my $t = Event::time - $t;
3164
3165 #next unless $t < 0.0013;#d#
3166 if ($t < $min) {
3167 $min = $t;
3168 }
3169 $avg = $avg * 0.99 + $t * 0.01;
3170 }
3171 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3172 exit 0;
3173 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3174 };
2708 3175
2709 $RUNTIME += $TICK; 3176 $RUNTIME += $TICK;
2710 $NEXT_TICK += $TICK; 3177 $NEXT_TICK += $TICK;
2711 3178
2712 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3179 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2718 } 3185 }
2719 3186
2720# my $AFTER = Event::time; 3187# my $AFTER = Event::time;
2721# warn $AFTER - $NOW;#d# 3188# warn $AFTER - $NOW;#d#
2722 3189
3190 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3191 $sig->send;
3192 }
3193 while (my $sig = shift @WAIT_FOR_TICK) {
3194 $sig->send;
3195 }
3196
3197 $NOW = Event::time;
3198
2723 # if we are delayed by four ticks or more, skip them all 3199 # if we are delayed by four ticks or more, skip them all
2724 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3200 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2725 3201
2726 $TICK_WATCHER->at ($NEXT_TICK); 3202 $TICK_WATCHER->at ($NEXT_TICK);
2727 $TICK_WATCHER->start; 3203 $TICK_WATCHER->start;
2728 3204
2729 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3205 $LOAD = ($NOW - $tick_start) / $TICK;
2730 $sig->send; 3206 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2731 }
2732 while (my $sig = shift @WAIT_FOR_TICK) {
2733 $sig->send;
2734 }
2735 3207
2736 _post_tick; 3208 _post_tick;
3209
3210
2737 }, 3211 },
2738); 3212);
2739 3213
2740{ 3214{
2741 BDB::max_poll_time $TICK * 0.1; 3215 BDB::max_poll_time $TICK * 0.1;
2769 3243
2770 cf::sync_job { 3244 cf::sync_job {
2771 eval { 3245 eval {
2772 BDB::db_env_open 3246 BDB::db_env_open
2773 $DB_ENV, 3247 $DB_ENV,
2774 $BDB_ENV_DIR, 3248 $BDBDIR,
2775 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3249 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2776 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3250 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2777 0666; 3251 0666;
2778 3252
2779 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3253 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2780 3254
2781 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3255 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2782 $DB_ENV->set_lk_detect; 3256 $DB_ENV->set_lk_detect;
2783 }; 3257 };
2784 3258
2800 prio => 6, 3274 prio => 6,
2801 cb => \&IO::AIO::poll_cb, 3275 cb => \&IO::AIO::poll_cb,
2802 ); 3276 );
2803} 3277}
2804 3278
3279my $_log_backtrace;
3280
3281sub _log_backtrace {
3282 my ($msg, @addr) = @_;
3283
3284 $msg =~ s/\n//;
3285
3286 # limit the # of concurrent backtraces
3287 if ($_log_backtrace < 2) {
3288 ++$_log_backtrace;
3289 async {
3290 my @bt = fork_call {
3291 @addr = map { sprintf "%x", $_ } @addr;
3292 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3293 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3294 or die "addr2line: $!";
3295
3296 my @funcs;
3297 my @res = <$fh>;
3298 chomp for @res;
3299 while (@res) {
3300 my ($func, $line) = splice @res, 0, 2, ();
3301 push @funcs, "[$func] $line";
3302 }
3303
3304 @funcs
3305 };
3306
3307 LOG llevInfo, "[ABT] $msg\n";
3308 LOG llevInfo, "[ABT] $_\n" for @bt;
3309 --$_log_backtrace;
3310 };
3311 } else {
3312 LOG llevInfo, "[ABT] $msg\n";
3313 LOG llevInfo, "[ABT] [suppressed]\n";
3314 }
3315}
3316
3317# load additional modules
3318use cf::pod;
3319
2805END { cf::emergency_save } 3320END { cf::emergency_save }
2806 3321
28071 33221
2808 3323

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines