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.245 by root, Tue Apr 17 10:06:33 2007 UTC vs.
Revision 1.299 by root, Sun Jul 8 14:56:05 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 ();
47our %COMMAND = (); 50our %COMMAND = ();
48our %COMMAND_TIME = (); 51our %COMMAND_TIME = ();
49 52
50our @EXTS = (); # list of extension package names 53our @EXTS = (); # list of extension package names
51our %EXTCMD = (); 54our %EXTCMD = ();
55our %EXTICMD = ();
52our %EXT_CORO = (); # coroutines bound to extensions 56our %EXT_CORO = (); # coroutines bound to extensions
53our %EXT_MAP = (); # pluggable maps 57our %EXT_MAP = (); # pluggable maps
54 58
55our $RELOAD; # number of reloads so far 59our $RELOAD; # number of reloads so far
56our @EVENT; 60our @EVENT;
57our $LIBDIR = datadir . "/ext"; 61
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";
58 73
59our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
60our $TICK_WATCHER; 75our $TICK_WATCHER;
61our $AIO_POLL_WATCHER; 76our $AIO_POLL_WATCHER;
62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
73our $RUNTIME; 88our $RUNTIME;
74 89
75our %PLAYER; # all users 90our %PLAYER; # all users
76our %MAP; # all maps 91our %MAP; # all maps
77our $LINK_MAP; # the special {link} map, which is always available 92our $LINK_MAP; # the special {link} map, which is always available
78our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db";
80 93
81# 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 ∕
82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
83 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
84binmode STDOUT; 101binmode STDOUT;
85binmode STDERR; 102binmode STDERR;
86 103
87# read virtual server time, if available 104# read virtual server time, if available
88unless ($RUNTIME || !-e cf::localdir . "/runtime") { 105unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
89 open my $fh, "<", cf::localdir . "/runtime" 106 open my $fh, "<", "$LOCALDIR/runtime"
90 or die "unable to read runtime file: $!"; 107 or die "unable to read runtime file: $!";
91 $RUNTIME = <$fh> + 0.; 108 $RUNTIME = <$fh> + 0.;
92} 109}
93 110
94mkdir cf::localdir; 111mkdir $_
95mkdir cf::localdir . "/" . cf::playerdir; 112 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 113
101our $EMERGENCY_POSITION; 114our $EMERGENCY_POSITION;
102 115
103sub cf::map::normalise; 116sub cf::map::normalise;
104 117
115=item $cf::RUNTIME 128=item $cf::RUNTIME
116 129
117The 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
118every server tick. 131every server tick.
119 132
120=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
121 136
122The perl library directory, where extensions and cf-specific modules can 137Various directories - "/etc", read-only install directory, perl-library
123be 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.
124 141
125=item $cf::NOW 142=item $cf::NOW
126 143
127The time of the last (current) server tick. 144The time of the last (current) server tick.
128 145
129=item $cf::TICK 146=item $cf::TICK
130 147
131The 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.
132 159
133=item %cf::CFG 160=item %cf::CFG
134 161
135Configuration for the server, loaded from C</etc/crossfire/config>, or 162Configuration for the server, loaded from C</etc/crossfire/config>, or
136from wherever your confdir points to. 163from wherever your confdir points to.
146=cut 173=cut
147 174
148BEGIN { 175BEGIN {
149 *CORE::GLOBAL::warn = sub { 176 *CORE::GLOBAL::warn = sub {
150 my $msg = join "", @_; 177 my $msg = join "", @_;
151 utf8::encode $msg;
152 178
153 $msg .= "\n" 179 $msg .= "\n"
154 unless $msg =~ /\n$/; 180 unless $msg =~ /\n$/;
155 181
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183
184 utf8::encode $msg;
156 LOG llevError, $msg; 185 LOG llevError, $msg;
157 }; 186 };
158} 187}
159 188
160@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
161@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
162@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
163@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
164@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';
165@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)
166 196
167# 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
168# within the Safe compartment. 198# within the Safe compartment.
169for my $pkg (qw( 199for my $pkg (qw(
170 cf::global cf::attachable 200 cf::global cf::attachable
178} 208}
179 209
180$Event::DIED = sub { 210$Event::DIED = sub {
181 warn "error in event callback: @_"; 211 warn "error in event callback: @_";
182}; 212};
213
214#############################################################################
183 215
184=head2 UTILITY FUNCTIONS 216=head2 UTILITY FUNCTIONS
185 217
186=over 4 218=over 4
187 219
206 $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;
207 $d 239 $d
208 } || "[unable to dump $_[0]: '$@']"; 240 } || "[unable to dump $_[0]: '$@']";
209} 241}
210 242
211use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
212
213=item $ref = cf::from_json $json 243=item $ref = cf::from_json $json
214 244
215Converts a JSON string into the corresponding perl data structure. 245Converts a JSON string into the corresponding perl data structure.
216 246
217=item $json = cf::to_json $ref 247=item $json = cf::to_json $ref
218 248
219Converts a perl data structure into its JSON representation. 249Converts a perl data structure into its JSON representation.
250
251=cut
252
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254
255sub to_json ($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) }
220 257
221=item cf::lock_wait $string 258=item cf::lock_wait $string
222 259
223Wait until the given lock is available. See cf::lock_acquire. 260Wait until the given lock is available. See cf::lock_acquire.
224 261
230returned. 267returned.
231 268
232Lock 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
233uses map_find and cf::map::load uses map_load). 270uses map_find and cf::map::load uses map_load).
234 271
272=item $locked = cf::lock_active $string
273
274Return true if the lock is currently active, i.e. somebody has locked it.
275
235=cut 276=cut
236 277
237our %LOCK; 278our %LOCK;
238 279
239sub lock_wait($) { 280sub lock_wait($) {
256 297
257 Coro::guard { 298 Coro::guard {
258 # wake up all waiters, to be on the safe side 299 # wake up all waiters, to be on the safe side
259 $_->ready for @{ delete $LOCK{$key} }; 300 $_->ready for @{ delete $LOCK{$key} };
260 } 301 }
302}
303
304sub lock_active($) {
305 my ($key) = @_;
306
307 ! ! $LOCK{$key}
261} 308}
262 309
263sub freeze_mainloop { 310sub freeze_mainloop {
264 return unless $TICK_WATCHER->is_active; 311 return unless $TICK_WATCHER->is_active;
265 312
280 327
281BEGIN { *async = \&Coro::async_pool } 328BEGIN { *async = \&Coro::async_pool }
282 329
283=item cf::sync_job { BLOCK } 330=item cf::sync_job { BLOCK }
284 331
285The design of crossfire+ requires that the main coro ($Coro::main) is 332The design of Crossfire TRT requires that the main coroutine ($Coro::main)
286always able to handle events or runnable, as crossfire+ is only partly 333is 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. 334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable.
288 336
289If 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
290the given BLOCK in another coroutine while waiting for the result. The 338the given BLOCK in another coroutine while waiting for the result. The
291server 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
292fast or be very important. 340fast or be very important.
295 343
296sub sync_job(&) { 344sub sync_job(&) {
297 my ($job) = @_; 345 my ($job) = @_;
298 346
299 if ($Coro::current == $Coro::main) { 347 if ($Coro::current == $Coro::main) {
348 my $time = Event::time;
349
300 # this is the main coro, too bad, we have to block 350 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 351 # till the operation succeeds, freezing the server :/
302 352
303 # TODO: use suspend/resume instead 353 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 354 # (but this is cancel-safe)
315 365
316 while ($busy) { 366 while ($busy) {
317 Coro::cede or Event::one_event; 367 Coro::cede or Event::one_event;
318 } 368 }
319 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
320 wantarray ? @res : $res[0] 377 wantarray ? @res : $res[0]
321 } else { 378 } else {
322 # we are in another coroutine, how wonderful, everything just works 379 # we are in another coroutine, how wonderful, everything just works
323 380
324 $job->() 381 $job->()
343 $EXT_CORO{$coro+0} = $coro; 400 $EXT_CORO{$coro+0} = $coro;
344 401
345 $coro 402 $coro
346} 403}
347 404
348sub write_runtime { 405=item fork_call { }, $args
349 my $guard = cf::lock_acquire "write_runtime";
350 406
351 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.
352 411
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 412=cut
354 or return;
355 413
356 my $value = $cf::RUNTIME + 90 + 10; 414sub _store_scalar {
357 # 10 is the runtime save interval, for a monotonic clock 415 open my $fh, ">", \my $buf
358 # 60 allows for the watchdog to kill the server. 416 or die "fork_call: cannot open fh-to-buf in child : $!";
359 417 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 418 close $fh;
368 or return;
369 419
370 aio_rename "$runtime~", $runtime 420 $buf
371 and return; 421}
372 422
423sub fork_call(&@) {
424 my ($cb, @args) = @_;
425
426# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
427# or die "socketpair: $!";
428 pipe my $fh1, my $fh2
429 or die "pipe: $!";
430
431 if (my $pid = fork) {
432 close $fh2;
433
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
436 $res = Coro::Storable::thaw $res;
437
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals;
445 local $SIG{__WARN__};
446 local $SIG{__DIE__};
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452
453 eval {
454 close $fh1;
455
456 my @res = eval { $cb->(@args) };
457
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459 close $fh2;
460 };
461
462 warn $@ if $@;
463 _exit 0;
373 1 464 }
465}
466
467=item $value = cf::db_get $family => $key
468
469Returns a single value from the environment database.
470
471=item cf::db_put $family => $key => $value
472
473Stores the given C<$value> in the family. It can currently store binary
474data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
475
476=cut
477
478our $DB;
479
480sub db_init {
481 unless ($DB) {
482 $DB = BDB::db_create $DB_ENV;
483
484 cf::sync_job {
485 eval {
486 $DB->set_flags (BDB::CHKSUM);
487
488 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
489 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
490 cf::cleanup "db_open(db): $!" if $!;
491 };
492 cf::cleanup "db_open(db): $@" if $@;
493 };
494 }
495}
496
497sub db_get($$) {
498 my $key = "$_[0]/$_[1]";
499
500 cf::sync_job {
501 BDB::db_get $DB, undef, $key, my $data;
502
503 $! ? ()
504 : $data
505 }
506}
507
508sub db_put($$$) {
509 BDB::dbreq_pri 4;
510 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
511}
512
513=item cf::cache $id => [$paths...], $processversion => $process
514
515Generic caching function that returns the value of the resource $id,
516caching and regenerating as required.
517
518This function can block.
519
520=cut
521
522sub cache {
523 my ($id, $src, $processversion, $process) = @_;
524
525 my $meta =
526 join "\x00",
527 $processversion,
528 map {
529 aio_stat $_
530 and Carp::croak "$_: $!";
531
532 ($_, (stat _)[7,9])
533 } @$src;
534
535 my $dbmeta = db_get cache => "$id/meta";
536 if ($dbmeta ne $meta) {
537 # changed, we may need to process
538
539 my @data;
540 my $md5;
541
542 for (0 .. $#$src) {
543 0 <= aio_load $src->[$_], $data[$_]
544 or Carp::croak "$src->[$_]: $!";
545 }
546
547 # if processing is expensive, check
548 # checksum first
549 if (1) {
550 $md5 =
551 join "\x00",
552 $processversion,
553 map {
554 Coro::cede;
555 ($src->[$_], Digest::MD5::md5_hex $data[$_])
556 } 0.. $#$src;
557
558
559 my $dbmd5 = db_get cache => "$id/md5";
560 if ($dbmd5 eq $md5) {
561 db_put cache => "$id/meta", $meta;
562
563 return db_get cache => "$id/data";
564 }
565 }
566
567 my $t1 = Time::HiRes::time;
568 my $data = $process->(\@data);
569 my $t2 = Time::HiRes::time;
570
571 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
572
573 db_put cache => "$id/data", $data;
574 db_put cache => "$id/md5" , $md5;
575 db_put cache => "$id/meta", $meta;
576
577 return $data;
578 }
579
580 db_get cache => "$id/data"
374} 581}
375 582
376=item cf::datalog type => key => value, ... 583=item cf::datalog type => key => value, ...
377 584
378Log a datalog packet of the given type with the given key-value pairs. 585Log 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") 603attach callbacks/event handlers (a collection of which is called an "attachment")
397to it. All such attachable objects support the following methods. 604to it. All such attachable objects support the following methods.
398 605
399In the following description, CLASS can be any of C<global>, C<object> 606In 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 607C<player>, C<client> or C<map> (i.e. the attachable objects in
401crossfire+). 608Crossfire TRT).
402 609
403=over 4 610=over 4
404 611
405=item $attachable->attach ($attachment, key => $value...) 612=item $attachable->attach ($attachment, key => $value...)
406 613
569 $registry = $CB_TYPE[$object_type] ||= []; 776 $registry = $CB_TYPE[$object_type] ||= [];
570 777
571 } elsif ($type eq "subtype") { 778 } elsif ($type eq "subtype") {
572 defined $object_type or Carp::croak "subtype specified without type"; 779 defined $object_type or Carp::croak "subtype specified without type";
573 my $object_subtype = shift @arg; 780 my $object_subtype = shift @arg;
574 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 781 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
575 782
576 } elsif ($type eq "package") { 783 } elsif ($type eq "package") {
577 my $pkg = shift @arg; 784 my $pkg = shift @arg;
578 785
579 while (my ($name, $id) = each %cb_id) { 786 while (my ($name, $id) = each %cb_id) {
608 _attach $registry, $klass, @attach; 815 _attach $registry, $klass, @attach;
609 } 816 }
610 817
611 $obj->{$name} = \%arg; 818 $obj->{$name} = \%arg;
612 } else { 819 } else {
613 warn "object uses attachment '$name' that is not available, postponing.\n"; 820 warn "object uses attachment '$name' which is not available, postponing.\n";
614 } 821 }
615 822
616 $obj->{_attachment}{$name} = undef; 823 $obj->{_attachment}{$name} = undef;
617} 824}
618 825
620 if (ref $_[0]) { 827 if (ref $_[0]) {
621 _object_attach @_; 828 _object_attach @_;
622 } else { 829 } else {
623 _attach shift->_attach_registry, @_; 830 _attach shift->_attach_registry, @_;
624 } 831 }
832 _recalc_want;
625}; 833};
626 834
627# all those should be optimised 835# all those should be optimised
628sub cf::attachable::detach { 836sub cf::attachable::detach {
629 my ($obj, $name) = @_; 837 my ($obj, $name) = @_;
632 delete $obj->{_attachment}{$name}; 840 delete $obj->{_attachment}{$name};
633 reattach ($obj); 841 reattach ($obj);
634 } else { 842 } else {
635 Carp::croak "cannot, currently, detach class attachments"; 843 Carp::croak "cannot, currently, detach class attachments";
636 } 844 }
845 _recalc_want;
637}; 846};
638 847
639sub cf::attachable::attached { 848sub cf::attachable::attached {
640 my ($obj, $name) = @_; 849 my ($obj, $name) = @_;
641 850
814 or return; 1023 or return;
815 $av = eval { (Storable::thaw $av)->{objs} }; 1024 $av = eval { (Storable::thaw $av)->{objs} };
816 } 1025 }
817 1026
818 warn sprintf "loading %s (%d)\n", 1027 warn sprintf "loading %s (%d)\n",
819 $filename, length $data, scalar @{$av || []};#d# 1028 $filename, length $data, scalar @{$av || []};
820 return ($data, $av); 1029 return ($data, $av);
821} 1030}
1031
1032=head2 COMMAND CALLBACKS
1033
1034=over 4
1035
1036=cut
822 1037
823############################################################################# 1038#############################################################################
824# command handling &c 1039# command handling &c
825 1040
826=item cf::register_command $name => \&callback($ob,$args); 1041=item cf::register_command $name => \&callback($ob,$args);
839 push @{ $COMMAND{$name} }, [$caller, $cb]; 1054 push @{ $COMMAND{$name} }, [$caller, $cb];
840} 1055}
841 1056
842=item cf::register_extcmd $name => \&callback($pl,$packet); 1057=item cf::register_extcmd $name => \&callback($pl,$packet);
843 1058
844Register a callbackf ro execution when the client sends an extcmd packet. 1059Register a callback for execution when the client sends an (synchronous)
1060extcmd packet. Ext commands will be processed in the order they are
1061received by the server, like other user commands. The first argument is
1062the logged-in player. Ext commands can only be processed after a player
1063has logged in successfully.
845 1064
846If the callback returns something, it is sent back as if reply was being 1065If the callback returns something, it is sent back as if reply was being
847called. 1066called.
848 1067
1068=item cf::register_exticmd $name => \&callback($ns,$packet);
1069
1070Register a callback for execution when the client sends an (asynchronous)
1071exticmd packet. Exti commands are processed by the server as soon as they
1072are received, i.e. out of order w.r.t. other commands. The first argument
1073is a client socket. Exti commands can be received anytime, even before
1074log-in.
1075
1076If the callback returns something, it is sent back as if reply was being
1077called.
1078
849=cut 1079=cut
850 1080
851sub register_extcmd { 1081sub register_extcmd {
852 my ($name, $cb) = @_; 1082 my ($name, $cb) = @_;
853 1083
854 $EXTCMD{$name} = $cb; 1084 $EXTCMD{$name} = $cb;
1085}
1086
1087sub register_exticmd {
1088 my ($name, $cb) = @_;
1089
1090 $EXTICMD{$name} = $cb;
855} 1091}
856 1092
857cf::player->attach ( 1093cf::player->attach (
858 on_command => sub { 1094 on_command => sub {
859 my ($pl, $name, $params) = @_; 1095 my ($pl, $name, $params) = @_;
868 cf::override; 1104 cf::override;
869 }, 1105 },
870 on_extcmd => sub { 1106 on_extcmd => sub {
871 my ($pl, $buf) = @_; 1107 my ($pl, $buf) = @_;
872 1108
873 my $msg = eval { from_json $buf }; 1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
874 1110
875 if (ref $msg) { 1111 if (ref $msg) {
876 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
877 if (my %reply = $cb->($pl, $msg)) { 1113 if (my %reply = $cb->($pl, $msg)) {
878 $pl->ext_reply ($msg->{msgid}, %reply); 1114 $pl->ext_reply ($msg->{msgid}, %reply);
884 1120
885 cf::override; 1121 cf::override;
886 }, 1122 },
887); 1123);
888 1124
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 { 1125sub load_extensions {
1126 cf::sync_job {
1127 my %todo;
1128
924 for my $ext (<$LIBDIR/*.ext>) { 1129 for my $path (<$LIBDIR/*.ext>) {
925 next unless -r $ext; 1130 next unless -r $path;
926 eval { 1131
927 load_extension $ext; 1132 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1133 my $base = $1;
1134 my $pkg = $1;
1135 $pkg =~ s/[^[:word:]]/_/g;
1136 $pkg = "ext::$pkg";
1137
1138 open my $fh, "<:utf8", $path
1139 or die "$path: $!";
1140
1141 my $source = do { local $/; <$fh> };
1142
1143 my %ext = (
1144 path => $path,
1145 base => $base,
1146 pkg => $pkg,
1147 );
1148
1149 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1150 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1151
1152 $ext{source} =
1153 "package $pkg; use strict; use utf8;\n"
1154 . "#line 1 \"$path\"\n{\n"
1155 . $source
1156 . "\n};\n1";
1157
1158 $todo{$base} = \%ext;
1159 }
1160
1161 my %done;
1162 while (%todo) {
1163 my $progress;
1164
1165 while (my ($k, $v) = each %todo) {
1166 for (split /,\s*/, $v->{meta}{depends}) {
1167 goto skip
1168 unless exists $done{$_};
1169 }
1170
1171 warn "... loading '$k' into '$v->{pkg}'\n";
1172
1173 unless (eval $v->{source}) {
1174 my $msg = $@ ? "$v->{path}: $@\n"
1175 : "$v->{base}: extension inactive.\n";
1176
1177 if (exists $v->{meta}{mandatory}) {
1178 warn $msg;
1179 warn "mandatory extension failed to load, exiting.\n";
1180 exit 1;
1181 }
1182
1183 warn $msg;
1184 }
1185
1186 $done{$k} = delete $todo{$k};
1187 push @EXTS, $v->{pkg};
1188 $progress = 1;
928 1 1189 }
929 } or warn "$ext not loaded: $@"; 1190
1191 skip:
1192 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1193 unless $progress;
1194 }
930 } 1195 };
931} 1196}
932 1197
933############################################################################# 1198#############################################################################
934 1199
1200=back
1201
935=head2 CORE EXTENSIONS 1202=head2 CORE EXTENSIONS
936 1203
937Functions and methods that extend core crossfire objects. 1204Functions and methods that extend core crossfire objects.
938 1205
939=cut 1206=cut
951Returns the given player object, loading it if necessary (might block). 1218Returns the given player object, loading it if necessary (might block).
952 1219
953=cut 1220=cut
954 1221
955sub playerdir($) { 1222sub playerdir($) {
956 cf::localdir 1223 "$PLAYERDIR/"
957 . "/"
958 . cf::playerdir
959 . "/"
960 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1224 . (ref $_[0] ? $_[0]->ob->name : $_[0])
961} 1225}
962 1226
963sub path($) { 1227sub path($) {
964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1228 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1084while and may block, so not sync_job-capable, ever. 1348while and may block, so not sync_job-capable, ever.
1085 1349
1086=cut 1350=cut
1087 1351
1088sub list_logins { 1352sub list_logins {
1089 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1353 my $dirs = aio_readdir $PLAYERDIR
1090 or return []; 1354 or return [];
1091 1355
1092 my @logins; 1356 my @logins;
1093 1357
1094 for my $login (@$dirs) { 1358 for my $login (@$dirs) {
1129 } 1393 }
1130 1394
1131 \@paths 1395 \@paths
1132} 1396}
1133 1397
1398=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1399
1400Expand crossfire pod fragments into protocol xml.
1401
1402=cut
1403
1404sub expand_cfpod {
1405 ((my $self), (local $_)) = @_;
1406
1407 # escape & and <
1408 s/&/&amp;/g;
1409 s/(?<![BIUGH])</&lt;/g;
1410
1411 # this is buggy, it needs to properly take care of nested <'s
1412
1413 1 while
1414 # replace B<>, I<>, U<> etc.
1415 s/B<([^\>]*)>/<b>$1<\/b>/
1416 || s/I<([^\>]*)>/<i>$1<\/i>/
1417 || s/U<([^\>]*)>/<u>$1<\/u>/
1418 # replace G<male|female> tags
1419 || s{G<([^>|]*)\|([^>]*)>}{
1420 $self->gender ? $2 : $1
1421 }ge
1422 # replace H<hint text>
1423 || s{H<([^\>]*)>}
1424 {
1425 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1426 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1427 "")
1428 [$self->{hintmode}]
1429 }ge;
1430
1431 # create single paragraphs (very hackish)
1432 s/(?<=\S)\n(?=\w)/ /g;
1433
1434 # compress some whitespace
1435 s/\s+\n/\n/g; # ws line-ends
1436 s/\n\n+/\n/g; # double lines
1437 s/^\n+//; # beginning lines
1438 s/\n+$//; # ending lines
1439
1440 $_
1441}
1442
1443sub hintmode {
1444 $_[0]{hintmode} = $_[1] if @_ > 1;
1445 $_[0]{hintmode}
1446}
1447
1134=item $player->ext_reply ($msgid, %msg) 1448=item $player->ext_reply ($msgid, %msg)
1135 1449
1136Sends an ext reply to the player. 1450Sends an ext reply to the player.
1137 1451
1138=cut 1452=cut
1139 1453
1140sub ext_reply($$%) { 1454sub ext_reply($$%) {
1141 my ($self, $id, %msg) = @_; 1455 my ($self, $id, %msg) = @_;
1142 1456
1143 $msg{msgid} = $id; 1457 $msg{msgid} = $id;
1144 1458 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1145 $self->send ("ext " . cf::to_json \%msg);
1146} 1459}
1147 1460
1148=item $player->ext_event ($type, %msg) 1461=item $player->ext_event ($type, %msg)
1149 1462
1150Sends an ext event to the client. 1463Sends an ext event to the client.
1165 1478
1166package cf::region; 1479package cf::region;
1167 1480
1168=item cf::region::find_by_path $path 1481=item cf::region::find_by_path $path
1169 1482
1170Tries to decuce the probable region for a map knowing only its path. 1483Tries to decuce the likely region for a map knowing only its path.
1171 1484
1172=cut 1485=cut
1173 1486
1174sub find_by_path($) { 1487sub find_by_path($) {
1175 my ($path) = @_; 1488 my ($path) = @_;
1249 my ($self, $merge) = @_; 1562 my ($self, $merge) = @_;
1250 1563
1251 # we have to keep some variables in memory intact 1564 # we have to keep some variables in memory intact
1252 local $self->{path}; 1565 local $self->{path};
1253 local $self->{load_path}; 1566 local $self->{load_path};
1254 local $self->{deny_save};
1255 local $self->{deny_reset};
1256 1567
1257 $self->SUPER::thawer_merge ($merge); 1568 $self->SUPER::thawer_merge ($merge);
1258} 1569}
1259 1570
1260sub normalise { 1571sub normalise {
1332 1643
1333# the original (read-only) location 1644# the original (read-only) location
1334sub load_path { 1645sub load_path {
1335 my ($self) = @_; 1646 my ($self) = @_;
1336 1647
1337 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1648 "$MAPDIR/$self->{path}.map"
1338} 1649}
1339 1650
1340# the temporary/swap location 1651# the temporary/swap location
1341sub save_path { 1652sub save_path {
1342 my ($self) = @_; 1653 my ($self) = @_;
1343 1654
1344 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1655 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1345 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1656 "$TMPDIR/$path.map"
1346} 1657}
1347 1658
1348# the unique path, undef == no special unique path 1659# the unique path, undef == no special unique path
1349sub uniq_path { 1660sub uniq_path {
1350 my ($self) = @_; 1661 my ($self) = @_;
1351 1662
1352 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1663 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1353 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1664 "$UNIQUEDIR/$path"
1354} 1665}
1355 1666
1356# and all this just because we cannot iterate over 1667# and all this just because we cannot iterate over
1357# all maps in C++... 1668# all maps in C++...
1358sub change_all_map_light { 1669sub change_all_map_light {
1359 my ($change) = @_; 1670 my ($change) = @_;
1360 1671
1361 $_->change_map_light ($change) 1672 $_->change_map_light ($change)
1362 for grep $_->outdoor, values %cf::MAP; 1673 for grep $_->outdoor, values %cf::MAP;
1674}
1675
1676sub decay_objects {
1677 my ($self) = @_;
1678
1679 return if $self->{deny_reset};
1680
1681 $self->do_decay_objects;
1363} 1682}
1364 1683
1365sub unlink_save { 1684sub unlink_save {
1366 my ($self) = @_; 1685 my ($self) = @_;
1367 1686
1425 $self->load_header_orig 1744 $self->load_header_orig
1426 or return; 1745 or return;
1427 $self->prepare_orig; 1746 $self->prepare_orig;
1428 } 1747 }
1429 1748
1749 $self->{deny_reset} = 1
1750 if $self->no_reset;
1751
1430 $self->default_region (cf::region::find_by_path $self->{path}) 1752 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region; 1753 unless $self->default_region;
1432 1754
1433 1 1755 1
1434} 1756}
1449 $map->{last_save} = $cf::RUNTIME; 1771 $map->{last_save} = $cf::RUNTIME;
1450 1772
1451 $map->load_header 1773 $map->load_header
1452 or return; 1774 or return;
1453 1775
1454 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1776 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1455 # doing this can freeze the server in a sync job, obviously 1777 # doing this can freeze the server in a sync job, obviously
1456 #$cf::WAIT_FOR_TICK->wait; 1778 #$cf::WAIT_FOR_TICK->wait;
1457 $map->reset; 1779 $map->reset;
1458 undef $guard; 1780 undef $guard;
1459 return find $path; 1781 return find $path;
1470 my ($self) = @_; 1792 my ($self) = @_;
1471 1793
1472 local $self->{deny_reset} = 1; # loading can take a long time 1794 local $self->{deny_reset} = 1; # loading can take a long time
1473 1795
1474 my $path = $self->{path}; 1796 my $path = $self->{path};
1797
1798 {
1475 my $guard = cf::lock_acquire "map_load:$path"; 1799 my $guard = cf::lock_acquire "map_load:$path";
1476 1800
1477 return if $self->in_memory != cf::MAP_SWAPPED; 1801 return if $self->in_memory != cf::MAP_SWAPPED;
1478 1802
1479 $self->in_memory (cf::MAP_LOADING); 1803 $self->in_memory (cf::MAP_LOADING);
1480 1804
1481 $self->alloc; 1805 $self->alloc;
1482 1806
1483 $self->pre_load; 1807 $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; 1808 Coro::cede;
1510 $self->set_darkness_map; 1809
1810 $self->_load_objects ($self->{load_path}, 1)
1811 or return;
1812
1813 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1814 if delete $self->{load_original};
1815
1816 if (my $uniq = $self->uniq_path) {
1817 utf8::encode $uniq;
1818 if (aio_open $uniq, O_RDONLY, 0) {
1819 $self->clear_unique_items;
1820 $self->_load_objects ($uniq, 0);
1821 }
1822 }
1823
1824 Coro::cede;
1825 # now do the right thing for maps
1826 $self->link_multipart_objects;
1511 $self->difficulty ($self->estimate_difficulty) 1827 $self->difficulty ($self->estimate_difficulty)
1512 unless $self->difficulty; 1828 unless $self->difficulty;
1513 Coro::cede; 1829 Coro::cede;
1830
1831 unless ($self->{deny_activate}) {
1832 $self->decay_objects;
1833 $self->fix_auto_apply;
1834 $self->update_buttons;
1835 Coro::cede;
1836 $self->set_darkness_map;
1837 Coro::cede;
1514 $self->activate; 1838 $self->activate;
1515 Coro::cede; 1839 }
1840
1841 $self->in_memory (cf::MAP_IN_MEMORY);
1516 } 1842 }
1517 1843
1518 $self->post_load; 1844 $self->post_load;
1519 Coro::cede;
1520
1521 $self->in_memory (cf::MAP_IN_MEMORY);
1522} 1845}
1523 1846
1524sub customise_for { 1847sub customise_for {
1525 my ($self, $ob) = @_; 1848 my ($self, $ob) = @_;
1526 1849
1527 return find "~" . $ob->name . "/" . $self->{path} 1850 return find "~" . $ob->name . "/" . $self->{path}
1528 if $self->per_player; 1851 if $self->per_player;
1852
1853# return find "?party/" . $ob->name . "/" . $self->{path}
1854# if $self->per_party;
1529 1855
1530 $self 1856 $self
1531} 1857}
1532 1858
1533# find and load all maps in the 3x3 area around a map 1859# find and load all maps in the 3x3 area around a map
1644 1970
1645sub reset_at { 1971sub reset_at {
1646 my ($self) = @_; 1972 my ($self) = @_;
1647 1973
1648 # TODO: safety, remove and allow resettable per-player maps 1974 # 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}; 1975 return 1e99 if $self->{deny_reset};
1651 1976
1652 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1977 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1653 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1978 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1654 1979
1665 my ($self) = @_; 1990 my ($self) = @_;
1666 1991
1667 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1992 my $lock = cf::lock_acquire "map_data:$self->{path}";
1668 1993
1669 return if $self->players; 1994 return if $self->players;
1670 return if $self->isa ("ext::map_per_player");#d#
1671 1995
1672 warn "resetting map ", $self->path;#d# 1996 warn "resetting map ", $self->path;
1673 1997
1674 $self->in_memory (cf::MAP_SWAPPED); 1998 $self->in_memory (cf::MAP_SWAPPED);
1675 1999
1676 # need to save uniques path 2000 # need to save uniques path
1677 unless ($self->{deny_save}) { 2001 unless ($self->{deny_save}) {
1709 $cf::MAP{$self->path} = $self; 2033 $cf::MAP{$self->path} = $self;
1710 2034
1711 $self->reset; # polite request, might not happen 2035 $self->reset; # polite request, might not happen
1712} 2036}
1713 2037
2038=item $maps = cf::map::tmp_maps
2039
2040Returns an arrayref with all map paths of currently instantiated and saved
2041maps. May block.
2042
2043=cut
2044
2045sub tmp_maps() {
2046 [
2047 map {
2048 utf8::decode $_;
2049 /\.map$/
2050 ? normalise $_
2051 : ()
2052 } @{ aio_readdir $TMPDIR or [] }
2053 ]
2054}
2055
2056=item $maps = cf::map::random_maps
2057
2058Returns an arrayref with all map paths of currently instantiated and saved
2059random maps. May block.
2060
2061=cut
2062
2063sub random_maps() {
2064 [
2065 map {
2066 utf8::decode $_;
2067 /\.map$/
2068 ? normalise "?random/$_"
2069 : ()
2070 } @{ aio_readdir $RANDOMDIR or [] }
2071 ]
2072}
2073
1714=item cf::map::unique_maps 2074=item cf::map::unique_maps
1715 2075
1716Returns an arrayref of paths of all shared maps that have 2076Returns an arrayref of paths of all shared maps that have
1717instantiated unique items. May block. 2077instantiated unique items. May block.
1718 2078
1719=cut 2079=cut
1720 2080
1721sub unique_maps() { 2081sub unique_maps() {
1722 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2082 [
1723 or return; 2083 map {
1724
1725 my @paths;
1726
1727 for (@$files) {
1728 utf8::decode $_; 2084 utf8::decode $_;
1729 next if /\.pst$/; 2085 /\.map$/
1730 next unless /^$PATH_SEP/o; 2086 ? normalise $_
1731 2087 : ()
1732 push @paths, cf::map::normalise $_; 2088 } @{ aio_readdir $UNIQUEDIR or [] }
1733 } 2089 ]
1734
1735 \@paths
1736} 2090}
1737 2091
1738package cf; 2092package cf;
1739 2093
1740=back 2094=back
1786 2140
1787 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2141 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1788 2142
1789 if ($self->{record_replies}) { 2143 if ($self->{record_replies}) {
1790 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2144 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2145
1791 } else { 2146 } else {
2147 my $pl = $self->contr;
2148
2149 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2150 my $diag = $pl->{npc_dialog};
2151 $diag->{pl}->ext_reply (
2152 $diag->{id},
2153 msgtype => "reply",
2154 msg => $diag->{pl}->expand_cfpod ($msg),
2155 add_topics => []
2156 );
2157
2158 } else {
1792 $msg = $npc->name . " says: $msg" if $npc; 2159 $msg = $npc->name . " says: $msg" if $npc;
1793 $self->message ($msg, $flags); 2160 $self->message ($msg, $flags);
2161 }
1794 } 2162 }
1795} 2163}
1796 2164
1797=item $player_object->may ("access") 2165=item $player_object->may ("access")
1798 2166
1846 $self->deactivate_recursive; 2214 $self->deactivate_recursive;
1847 2215
1848 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2216 return if UNIVERSAL::isa $self->map, "ext::map_link";
1849 2217
1850 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2218 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1851 if $self->map; 2219 if $self->map && $self->map->{path} ne "{link}";
1852 2220
1853 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2221 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1854} 2222}
1855 2223
1856sub cf::object::player::leave_link { 2224sub cf::object::player::leave_link {
1857 my ($self, $map, $x, $y) = @_; 2225 my ($self, $map, $x, $y) = @_;
2226
2227 return unless $self->contr->active;
1858 2228
1859 my $link_pos = delete $self->{_link_pos}; 2229 my $link_pos = delete $self->{_link_pos};
1860 2230
1861 unless ($map) { 2231 unless ($map) {
1862 # restore original map position 2232 # restore original map position
1885 2255
1886 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2256 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1887 $self->enter_map ($map, $x, $y); 2257 $self->enter_map ($map, $x, $y);
1888} 2258}
1889 2259
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) 2260=item $player_object->goto ($path, $x, $y[, $check->($map)])
1923 2261
2262Moves the player to the given map-path and coordinates by first freezing
2263her, loading and preparing them map, calling the provided $check callback
2264that has to return the map if sucecssful, and then unfreezes the player on
2265the new (success) or old (failed) map position.
2266
1924=cut 2267=cut
2268
2269our $GOTOGEN;
1925 2270
1926sub cf::object::player::goto { 2271sub cf::object::player::goto {
1927 my ($self, $path, $x, $y) = @_; 2272 my ($self, $path, $x, $y, $check) = @_;
2273
2274 # do generation counting so two concurrent goto's will be executed in-order
2275 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1928 2276
1929 $self->enter_link; 2277 $self->enter_link;
1930 2278
1931 (async { 2279 (async {
1932 my $map = eval { 2280 my $map = eval {
1933 my $map = cf::map::find $path; 2281 my $map = cf::map::find $path;
2282
2283 if ($map) {
1934 $map = $map->customise_for ($self) if $map; 2284 $map = $map->customise_for ($self);
2285 $map = $check->($map) if $check && $map;
2286 } else {
2287 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2288 }
2289
1935 $map 2290 $map
2291 };
2292
2293 if ($@) {
2294 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2295 LOG llevError | logBacktrace, Carp::longmess $@;
1936 } or 2296 }
1937 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1938 2297
2298 if ($gen == $self->{_goto_generation}) {
2299 delete $self->{_goto_generation};
1939 $self->leave_link ($map, $x, $y); 2300 $self->leave_link ($map, $x, $y);
2301 }
1940 })->prio (1); 2302 })->prio (1);
1941} 2303}
1942 2304
1943=item $player_object->enter_exit ($exit_object) 2305=item $player_object->enter_exit ($exit_object)
1944 2306
1983 2345
1984 $rmp->{random_seed} ||= $exit->random_seed; 2346 $rmp->{random_seed} ||= $exit->random_seed;
1985 2347
1986 my $data = cf::to_json $rmp; 2348 my $data = cf::to_json $rmp;
1987 my $md5 = Digest::MD5::md5_hex $data; 2349 my $md5 = Digest::MD5::md5_hex $data;
1988 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2350 my $meta = "$RANDOMDIR/$md5.meta";
1989 2351
1990 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2352 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1991 aio_write $fh, 0, (length $data), $data, 0; 2353 aio_write $fh, 0, (length $data), $data, 0;
1992 undef $fh; 2354 undef $fh;
1993 aio_rename "$meta~", $meta; 2355 aio_rename "$meta~", $meta;
2012 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2374 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2013 my $hp = $exit->stats->hp; 2375 my $hp = $exit->stats->hp;
2014 my $sp = $exit->stats->sp; 2376 my $sp = $exit->stats->sp;
2015 2377
2016 $self->enter_link; 2378 $self->enter_link;
2379
2380 # if exit is damned, update players death & WoR home-position
2381 $self->contr->savebed ($slaying, $hp, $sp)
2382 if $exit->flag (FLAG_DAMNED);
2017 2383
2018 (async { 2384 (async {
2019 $self->deactivate_recursive; # just to be sure 2385 $self->deactivate_recursive; # just to be sure
2020 unless (eval { 2386 unless (eval {
2021 $self->goto ($slaying, $hp, $sp); 2387 $self->goto ($slaying, $hp, $sp);
2049 2415
2050 utf8::encode $text; 2416 utf8::encode $text;
2051 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2417 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2052} 2418}
2053 2419
2420=item $client->send_msg ($color, $type, $msg, [extra...])
2421
2422Send a drawinfo or msg packet to the client, formatting the msg for the
2423client if neccessary. C<$type> should be a string identifying the type of
2424the message, with C<log> being the default. If C<$color> is negative, suppress
2425the message unless the client supports the msg packet.
2426
2427=cut
2428
2429sub cf::client::send_msg {
2430 my ($self, $color, $type, $msg, @extra) = @_;
2431
2432 $msg = $self->pl->expand_cfpod ($msg);
2433
2434 return unless @extra || length $msg;
2435
2436 if ($self->can_msg) {
2437 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2438 } else {
2439 # replace some tags by gcfclient-compatible ones
2440 for ($msg) {
2441 1 while
2442 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2443 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2444 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2445 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2446 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2447 }
2448
2449 if ($color >= 0) {
2450 if (0 && $msg =~ /\[/) {
2451 $self->send_packet ("drawextinfo $color 4 0 $msg")
2452 } else {
2453 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2454 $self->send_packet ("drawinfo $color $msg")
2455 }
2456 }
2457 }
2458}
2459
2054=item $client->ext_event ($type, %msg) 2460=item $client->ext_event ($type, %msg)
2055 2461
2056Sends an exti event to the client. 2462Sends an ext event to the client.
2057 2463
2058=cut 2464=cut
2059 2465
2060sub cf::client::ext_event($$%) { 2466sub cf::client::ext_event($$%) {
2061 my ($self, $type, %msg) = @_; 2467 my ($self, $type, %msg) = @_;
2062 2468
2063 $msg{msgtype} = "event_$type"; 2469 $msg{msgtype} = "event_$type";
2064 $self->send_packet ("ext " . cf::to_json \%msg); 2470 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2065} 2471}
2066 2472
2067=item $success = $client->query ($flags, "text", \&cb) 2473=item $success = $client->query ($flags, "text", \&cb)
2068 2474
2069Queues a query to the client, calling the given callback with 2475Queues a query to the client, calling the given callback with
2070the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2476the 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>. 2477C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2072 2478
2073Queries can fail, so check the return code. Or don't, as queries will become 2479Queries can fail, so check the return code. Or don't, as queries will
2074reliable at some point in the future. 2480become reliable at some point in the future.
2075 2481
2076=cut 2482=cut
2077 2483
2078sub cf::client::query { 2484sub cf::client::query {
2079 my ($self, $flags, $text, $cb) = @_; 2485 my ($self, $flags, $text, $cb) = @_;
2087 utf8::encode $text; 2493 utf8::encode $text;
2088 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2494 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2089 2495
2090 $self->send_packet ($self->{query_queue}[0][0]) 2496 $self->send_packet ($self->{query_queue}[0][0])
2091 if @{ $self->{query_queue} } == 1; 2497 if @{ $self->{query_queue} } == 1;
2498
2499 1
2092} 2500}
2093 2501
2094cf::client->attach ( 2502cf::client->attach (
2503 on_connect => sub {
2504 my ($ns) = @_;
2505
2506 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2507 },
2095 on_reply => sub { 2508 on_reply => sub {
2096 my ($ns, $msg) = @_; 2509 my ($ns, $msg) = @_;
2097 2510
2098 # this weird shuffling is so that direct followup queries 2511 # this weird shuffling is so that direct followup queries
2099 # get handled first 2512 # get handled first
2111 } else { 2524 } else {
2112 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2525 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2113 } 2526 }
2114 } 2527 }
2115 }, 2528 },
2529 on_exticmd => sub {
2530 my ($ns, $buf) = @_;
2531
2532 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2533
2534 if (ref $msg) {
2535 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2536 if (my %reply = $cb->($ns, $msg)) {
2537 $reply{msgid} = $msg->{msgid};
2538 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2539 }
2540 }
2541 } else {
2542 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2543 }
2544
2545 cf::override;
2546 },
2116); 2547);
2117 2548
2118=item $client->async (\&cb) 2549=item $client->async (\&cb)
2119 2550
2120Create a new coroutine, running the specified callback. The coroutine will 2551Create a new coroutine, running the specified callback. The coroutine will
2169 2600
2170=pod 2601=pod
2171 2602
2172The following functions and methods are available within a safe environment: 2603The following functions and methods are available within a safe environment:
2173 2604
2174 cf::object contr pay_amount pay_player map 2605 cf::object
2606 contr pay_amount pay_player map x y force_find force_add
2607 insert remove
2608
2175 cf::object::player player 2609 cf::object::player
2176 cf::player peaceful 2610 player
2177 cf::map trigger 2611
2612 cf::player
2613 peaceful
2614
2615 cf::map
2616 trigger
2178 2617
2179=cut 2618=cut
2180 2619
2181for ( 2620for (
2182 ["cf::object" => qw(contr pay_amount pay_player map)], 2621 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2622 insert remove)],
2183 ["cf::object::player" => qw(player)], 2623 ["cf::object::player" => qw(player)],
2184 ["cf::player" => qw(peaceful)], 2624 ["cf::player" => qw(peaceful)],
2185 ["cf::map" => qw(trigger)], 2625 ["cf::map" => qw(trigger)],
2186) { 2626) {
2187 no strict 'refs'; 2627 no strict 'refs';
2258=back 2698=back
2259 2699
2260=cut 2700=cut
2261 2701
2262############################################################################# 2702#############################################################################
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 2703# the server's init and main functions
2336 2704
2337sub load_facedata { 2705sub load_facedata($) {
2338 my $path = sprintf "%s/facedata", cf::datadir; 2706 my ($path) = @_;
2339 2707
2340 warn "loading facedata from $path\n"; 2708 warn "loading facedata from $path\n";
2341 2709
2342 my $facedata; 2710 my $facedata;
2343 0 < aio_load $path, $facedata 2711 0 < aio_load $path, $facedata
2384 } 2752 }
2385 2753
2386 1 2754 1
2387} 2755}
2388 2756
2757sub reload_regions {
2758 load_resource_file "$MAPDIR/regions"
2759 or die "unable to load regions file\n";
2760}
2761
2762sub reload_facedata {
2763 load_facedata "$DATADIR/facedata"
2764 or die "unable to load facedata\n";
2765}
2766
2389sub load_archetypes { 2767sub reload_archetypes {
2390 load_archetype_file sprintf "%s/archetypes", cf::datadir; # remove when stable 2768 load_resource_file "$DATADIR/archetypes"
2391 load_archetype_file sprintf "%s/archetypes", cf::datadir 2769 or die "unable to load archetypes\n";
2770 #d# NEED to laod twice to resolve forward references
2771 # this really needs to be done in an extra post-pass
2772 # (which needs to be synchronous, so solve it differently)
2773 load_resource_file "$DATADIR/archetypes"
2774 or die "unable to load archetypes\n";
2392} 2775}
2393 2776
2394sub load_treasures { 2777sub reload_treasures {
2395 load_treasure_file sprintf "%s/treasures", cf::datadir 2778 load_resource_file "$DATADIR/treasures"
2779 or die "unable to load treasurelists\n";
2396} 2780}
2397 2781
2398sub reload_resources { 2782sub reload_resources {
2399 warn "reloading resource files...\n"; 2783 warn "reloading resource files...\n";
2400 2784
2401 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2785 reload_regions;
2402 or die "unable to load regions file\n";
2403 load_facedata 2786 reload_facedata;
2404 or die "unable to load facedata\n"; 2787 #reload_archetypes;#d#
2405 load_archetypes 2788 reload_archetypes;
2406 or die "unable to load archetypes\n";
2407 load_treasures 2789 reload_treasures;
2408 or die "unable to load treasurelists\n";
2409 2790
2410 warn "finished reloading resource files\n"; 2791 warn "finished reloading resource files\n";
2411} 2792}
2412 2793
2413sub init { 2794sub init {
2414 reload_resources; 2795 reload_resources;
2415} 2796}
2416 2797
2417sub cfg_load { 2798sub cfg_load {
2418 open my $fh, "<:utf8", cf::confdir . "/config" 2799 open my $fh, "<:utf8", "$CONFDIR/config"
2419 or return; 2800 or return;
2420 2801
2421 local $/; 2802 local $/;
2422 *CFG = YAML::Syck::Load <$fh>; 2803 *CFG = YAML::Syck::Load <$fh>;
2423 2804
2468 }, 2849 },
2469 ); 2850 );
2470 } 2851 }
2471} 2852}
2472 2853
2854sub write_runtime {
2855 my $runtime = "$LOCALDIR/runtime";
2856
2857 # first touch the runtime file to show we are still running:
2858 # the fsync below can take a very very long time.
2859
2860 IO::AIO::aio_utime $runtime, undef, undef;
2861
2862 my $guard = cf::lock_acquire "write_runtime";
2863
2864 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2865 or return;
2866
2867 my $value = $cf::RUNTIME + 90 + 10;
2868 # 10 is the runtime save interval, for a monotonic clock
2869 # 60 allows for the watchdog to kill the server.
2870
2871 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2872 and return;
2873
2874 # always fsync - this file is important
2875 aio_fsync $fh
2876 and return;
2877
2878 # touch it again to show we are up-to-date
2879 aio_utime $fh, undef, undef;
2880
2881 close $fh
2882 or return;
2883
2884 aio_rename "$runtime~", $runtime
2885 and return;
2886
2887 warn "runtime file written.\n";
2888
2889 1
2890}
2891
2473sub emergency_save() { 2892sub emergency_save() {
2474 my $freeze_guard = cf::freeze_mainloop; 2893 my $freeze_guard = cf::freeze_mainloop;
2475 2894
2476 warn "enter emergency perl save\n"; 2895 warn "enter emergency perl save\n";
2477 2896
2508 2927
2509 warn Carp::longmess "post_cleanup backtrace" 2928 warn Carp::longmess "post_cleanup backtrace"
2510 if $make_core; 2929 if $make_core;
2511} 2930}
2512 2931
2513sub reload() { 2932sub do_reload_perl() {
2514 # can/must only be called in main 2933 # can/must only be called in main
2515 if ($Coro::current != $Coro::main) { 2934 if ($Coro::current != $Coro::main) {
2516 warn "can only reload from main coroutine"; 2935 warn "can only reload from main coroutine";
2517 return; 2936 return;
2518 } 2937 }
2552 %EXT_CORO = (); 2971 %EXT_CORO = ();
2553 2972
2554 warn "removing commands"; 2973 warn "removing commands";
2555 %COMMAND = (); 2974 %COMMAND = ();
2556 2975
2557 warn "removing ext commands"; 2976 warn "removing ext/exti commands";
2558 %EXTCMD = (); 2977 %EXTCMD = ();
2978 %EXTICMD = ();
2559 2979
2560 warn "unloading/nuking all extensions"; 2980 warn "unloading/nuking all extensions";
2561 for my $pkg (@EXTS) { 2981 for my $pkg (@EXTS) {
2562 warn "... unloading $pkg"; 2982 warn "... unloading $pkg";
2563 2983
2593 Symbol::delete_package "safe::$_" 3013 Symbol::delete_package "safe::$_"
2594 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3014 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2595 3015
2596 warn "unloading cf.pm \"a bit\""; 3016 warn "unloading cf.pm \"a bit\"";
2597 delete $INC{"cf.pm"}; 3017 delete $INC{"cf.pm"};
3018 delete $INC{"cf/pod.pm"};
2598 3019
2599 # don't, removes xs symbols, too, 3020 # don't, removes xs symbols, too,
2600 # and global variables created in xs 3021 # and global variables created in xs
2601 #Symbol::delete_package __PACKAGE__; 3022 #Symbol::delete_package __PACKAGE__;
2602 3023
2617 warn "reattaching attachments to maps"; 3038 warn "reattaching attachments to maps";
2618 reattach $_ for values %MAP; 3039 reattach $_ for values %MAP;
2619 warn "reattaching attachments to players"; 3040 warn "reattaching attachments to players";
2620 reattach $_ for values %PLAYER; 3041 reattach $_ for values %PLAYER;
2621 3042
2622 warn "loading reloadable resources";
2623 reload_resources;
2624
2625 warn "leaving sync_job"; 3043 warn "leaving sync_job";
2626 3044
2627 1 3045 1
2628 } or do { 3046 } or do {
2629 warn $@; 3047 warn $@;
2634 warn "reloaded"; 3052 warn "reloaded";
2635}; 3053};
2636 3054
2637our $RELOAD_WATCHER; # used only during reload 3055our $RELOAD_WATCHER; # used only during reload
2638 3056
3057sub reload_perl() {
3058 # doing reload synchronously and two reloads happen back-to-back,
3059 # coro crashes during coro_state_free->destroy here.
3060
3061 $RELOAD_WATCHER ||= Event->timer (
3062 reentrant => 0,
3063 after => 0,
3064 data => WF_AUTOCANCEL,
3065 cb => sub {
3066 do_reload_perl;
3067 undef $RELOAD_WATCHER;
3068 },
3069 );
3070}
3071
2639register_command "reload" => sub { 3072register_command "reload" => sub {
2640 my ($who, $arg) = @_; 3073 my ($who, $arg) = @_;
2641 3074
2642 if ($who->flag (FLAG_WIZ)) { 3075 if ($who->flag (FLAG_WIZ)) {
2643 $who->message ("reloading server."); 3076 $who->message ("reloading server.");
2644 3077 async { reload_perl };
2645 # doing reload synchronously and two reloads happen back-to-back,
2646 # coro crashes during coro_state_free->destroy here.
2647
2648 $RELOAD_WATCHER ||= Event->timer (
2649 reentrant => 0,
2650 after => 0,
2651 data => WF_AUTOCANCEL,
2652 cb => sub {
2653 reload;
2654 undef $RELOAD_WATCHER;
2655 },
2656 );
2657 } 3078 }
2658}; 3079};
2659 3080
2660unshift @INC, $LIBDIR; 3081unshift @INC, $LIBDIR;
2661 3082
2680 my $signal = new Coro::Signal; 3101 my $signal = new Coro::Signal;
2681 push @WAIT_FOR_TICK_BEGIN, $signal; 3102 push @WAIT_FOR_TICK_BEGIN, $signal;
2682 $signal->wait; 3103 $signal->wait;
2683} 3104}
2684 3105
3106 my $min = 1e6;#d#
3107 my $avg = 10;
2685$TICK_WATCHER = Event->timer ( 3108$TICK_WATCHER = Event->timer (
2686 reentrant => 0, 3109 reentrant => 0,
2687 parked => 1, 3110 parked => 1,
2688 prio => 0, 3111 prio => 0,
2689 at => $NEXT_TICK || $TICK, 3112 at => $NEXT_TICK || $TICK,
2693 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3116 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2694 unless ++$bug_warning > 10; 3117 unless ++$bug_warning > 10;
2695 return; 3118 return;
2696 } 3119 }
2697 3120
2698 $NOW = Event::time; 3121 $NOW = $tick_start = Event::time;
2699 3122
2700 cf::server_tick; # one server iteration 3123 cf::server_tick; # one server iteration
3124
3125 0 && sync_job {#d#
3126 for(1..10) {
3127 my $t = Event::time;
3128 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3129 or die;
3130
3131 $map->width (50);
3132 $map->height (50);
3133 $map->alloc;
3134 $map->_load_objects ("/tmp/x.map", 1);
3135 my $t = Event::time - $t;
3136
3137 #next unless $t < 0.0013;#d#
3138 if ($t < $min) {
3139 $min = $t;
3140 }
3141 $avg = $avg * 0.99 + $t * 0.01;
3142 }
3143 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3144 exit 0;
3145 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3146 };
2701 3147
2702 $RUNTIME += $TICK; 3148 $RUNTIME += $TICK;
2703 $NEXT_TICK += $TICK; 3149 $NEXT_TICK += $TICK;
2704 3150
2705 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3151 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2711 } 3157 }
2712 3158
2713# my $AFTER = Event::time; 3159# my $AFTER = Event::time;
2714# warn $AFTER - $NOW;#d# 3160# warn $AFTER - $NOW;#d#
2715 3161
3162 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3163 $sig->send;
3164 }
3165 while (my $sig = shift @WAIT_FOR_TICK) {
3166 $sig->send;
3167 }
3168
3169 $NOW = Event::time;
3170
2716 # if we are delayed by four ticks or more, skip them all 3171 # if we are delayed by four ticks or more, skip them all
2717 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3172 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2718 3173
2719 $TICK_WATCHER->at ($NEXT_TICK); 3174 $TICK_WATCHER->at ($NEXT_TICK);
2720 $TICK_WATCHER->start; 3175 $TICK_WATCHER->start;
2721 3176
2722 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3177 $LOAD = ($NOW - $tick_start) / $TICK;
2723 $sig->send; 3178 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2724 }
2725 while (my $sig = shift @WAIT_FOR_TICK) {
2726 $sig->send;
2727 }
2728 3179
2729 _post_tick; 3180 _post_tick;
3181
3182
2730 }, 3183 },
2731); 3184);
2732 3185
2733{ 3186{
2734 BDB::max_poll_time $TICK * 0.1; 3187 BDB::max_poll_time $TICK * 0.1;
2762 3215
2763 cf::sync_job { 3216 cf::sync_job {
2764 eval { 3217 eval {
2765 BDB::db_env_open 3218 BDB::db_env_open
2766 $DB_ENV, 3219 $DB_ENV,
2767 $BDB_ENV_DIR, 3220 $BDBDIR,
2768 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3221 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2769 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3222 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2770 0666; 3223 0666;
2771 3224
2772 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3225 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2773 3226
2774 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3227 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2775 $DB_ENV->set_lk_detect; 3228 $DB_ENV->set_lk_detect;
2776 }; 3229 };
2777 3230
2793 prio => 6, 3246 prio => 6,
2794 cb => \&IO::AIO::poll_cb, 3247 cb => \&IO::AIO::poll_cb,
2795 ); 3248 );
2796} 3249}
2797 3250
3251my $_log_backtrace;
3252
3253sub _log_backtrace {
3254 my ($msg, @addr) = @_;
3255
3256 $msg =~ s/\n//;
3257
3258 # limit the # of concurrent backtraces
3259 if ($_log_backtrace < 2) {
3260 ++$_log_backtrace;
3261 async {
3262 my @bt = fork_call {
3263 @addr = map { sprintf "%x", $_ } @addr;
3264 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3265 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3266 or die "addr2line: $!";
3267
3268 my @funcs;
3269 my @res = <$fh>;
3270 chomp for @res;
3271 while (@res) {
3272 my ($func, $line) = splice @res, 0, 2, ();
3273 push @funcs, "[$func] $line";
3274 }
3275
3276 @funcs
3277 };
3278
3279 LOG llevInfo, "[ABT] $msg\n";
3280 LOG llevInfo, "[ABT] $_\n" for @bt;
3281 --$_log_backtrace;
3282 };
3283 } else {
3284 LOG llevInfo, "[ABT] $msg\n";
3285 LOG llevInfo, "[ABT] [suppressed]\n";
3286 }
3287}
3288
3289# load additional modules
3290use cf::pod;
3291
2798END { cf::emergency_save } 3292END { cf::emergency_save }
2799 3293
28001 32941
2801 3295

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines