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.252 by root, Wed Apr 18 15:28:18 2007 UTC vs.
Revision 1.300 by root, Tue Jul 10 06:44:29 2007 UTC

20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24 24
25use JSON::XS 1.4 ();
25use BDB (); 26use BDB ();
26use Data::Dumper; 27use Data::Dumper;
27use Digest::MD5; 28use Digest::MD5;
28use Fcntl; 29use Fcntl;
29use YAML::Syck (); 30use YAML::Syck ();
49our %COMMAND = (); 50our %COMMAND = ();
50our %COMMAND_TIME = (); 51our %COMMAND_TIME = ();
51 52
52our @EXTS = (); # list of extension package names 53our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 54our %EXTCMD = ();
55our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 56our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 57our %EXT_MAP = (); # pluggable maps
56 58
57our $RELOAD; # number of reloads so far 59our $RELOAD; # number of reloads so far
58our @EVENT; 60our @EVENT;
59our $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";
60 73
61our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
62our $TICK_WATCHER; 75our $TICK_WATCHER;
63our $AIO_POLL_WATCHER; 76our $AIO_POLL_WATCHER;
64our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
75our $RUNTIME; 88our $RUNTIME;
76 89
77our %PLAYER; # all users 90our %PLAYER; # all users
78our %MAP; # all maps 91our %MAP; # all maps
79our $LINK_MAP; # the special {link} map, which is always available 92our $LINK_MAP; # the special {link} map, which is always available
80our $RANDOM_MAPS = cf::localdir . "/random";
81our $BDB_ENV_DIR = cf::localdir . "/db";
82 93
83# 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 ∕
84our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
85 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
86binmode STDOUT; 101binmode STDOUT;
87binmode STDERR; 102binmode STDERR;
88 103
89# read virtual server time, if available 104# read virtual server time, if available
90unless ($RUNTIME || !-e cf::localdir . "/runtime") { 105unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
91 open my $fh, "<", cf::localdir . "/runtime" 106 open my $fh, "<", "$LOCALDIR/runtime"
92 or die "unable to read runtime file: $!"; 107 or die "unable to read runtime file: $!";
93 $RUNTIME = <$fh> + 0.; 108 $RUNTIME = <$fh> + 0.;
94} 109}
95 110
96mkdir cf::localdir; 111mkdir $_
97mkdir cf::localdir . "/" . cf::playerdir; 112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
98mkdir cf::localdir . "/" . cf::tmpdir;
99mkdir cf::localdir . "/" . cf::uniquedir;
100mkdir $RANDOM_MAPS;
101mkdir $BDB_ENV_DIR;
102 113
103our $EMERGENCY_POSITION; 114our $EMERGENCY_POSITION;
104 115
105sub cf::map::normalise; 116sub cf::map::normalise;
106 117
117=item $cf::RUNTIME 128=item $cf::RUNTIME
118 129
119The 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
120every server tick. 131every server tick.
121 132
122=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
123 136
124The perl library directory, where extensions and cf-specific modules can 137Various directories - "/etc", read-only install directory, perl-library
125be 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.
126 141
127=item $cf::NOW 142=item $cf::NOW
128 143
129The time of the last (current) server tick. 144The time of the last (current) server tick.
130 145
131=item $cf::TICK 146=item $cf::TICK
132 147
133The 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.
134 159
135=item %cf::CFG 160=item %cf::CFG
136 161
137Configuration for the server, loaded from C</etc/crossfire/config>, or 162Configuration for the server, loaded from C</etc/crossfire/config>, or
138from wherever your confdir points to. 163from wherever your confdir points to.
152 my $msg = join "", @_; 177 my $msg = join "", @_;
153 178
154 $msg .= "\n" 179 $msg .= "\n"
155 unless $msg =~ /\n$/; 180 unless $msg =~ /\n$/;
156 181
157 $msg =~ s/([\x00-\x09\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
158 183
159 utf8::encode $msg; 184 utf8::encode $msg;
160 LOG llevError, $msg; 185 LOG llevError, $msg;
161 }; 186 };
162} 187}
164@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
165@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
166@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
167@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
168@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';
169@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)
170 196
171# 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
172# within the Safe compartment. 198# within the Safe compartment.
173for my $pkg (qw( 199for my $pkg (qw(
174 cf::global cf::attachable 200 cf::global cf::attachable
182} 208}
183 209
184$Event::DIED = sub { 210$Event::DIED = sub {
185 warn "error in event callback: @_"; 211 warn "error in event callback: @_";
186}; 212};
213
214#############################################################################
187 215
188=head2 UTILITY FUNCTIONS 216=head2 UTILITY FUNCTIONS
189 217
190=over 4 218=over 4
191 219
210 $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;
211 $d 239 $d
212 } || "[unable to dump $_[0]: '$@']"; 240 } || "[unable to dump $_[0]: '$@']";
213} 241}
214 242
215use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
216
217=item $ref = cf::from_json $json 243=item $ref = cf::from_json $json
218 244
219Converts a JSON string into the corresponding perl data structure. 245Converts a JSON string into the corresponding perl data structure.
220 246
221=item $json = cf::to_json $ref 247=item $json = cf::to_json $ref
222 248
223Converts 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]) }
224 257
225=item cf::lock_wait $string 258=item cf::lock_wait $string
226 259
227Wait until the given lock is available. See cf::lock_acquire. 260Wait until the given lock is available. See cf::lock_acquire.
228 261
234returned. 267returned.
235 268
236Lock 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
237uses map_find and cf::map::load uses map_load). 270uses map_find and cf::map::load uses map_load).
238 271
272=item $locked = cf::lock_active $string
273
274Return true if the lock is currently active, i.e. somebody has locked it.
275
239=cut 276=cut
240 277
241our %LOCK; 278our %LOCK;
242 279
243sub lock_wait($) { 280sub lock_wait($) {
260 297
261 Coro::guard { 298 Coro::guard {
262 # wake up all waiters, to be on the safe side 299 # wake up all waiters, to be on the safe side
263 $_->ready for @{ delete $LOCK{$key} }; 300 $_->ready for @{ delete $LOCK{$key} };
264 } 301 }
302}
303
304sub lock_active($) {
305 my ($key) = @_;
306
307 ! ! $LOCK{$key}
265} 308}
266 309
267sub freeze_mainloop { 310sub freeze_mainloop {
268 return unless $TICK_WATCHER->is_active; 311 return unless $TICK_WATCHER->is_active;
269 312
284 327
285BEGIN { *async = \&Coro::async_pool } 328BEGIN { *async = \&Coro::async_pool }
286 329
287=item cf::sync_job { BLOCK } 330=item cf::sync_job { BLOCK }
288 331
289The design of crossfire+ requires that the main coro ($Coro::main) is 332The design of Crossfire TRT requires that the main coroutine ($Coro::main)
290always able to handle events or runnable, as crossfire+ is only partly 333is always able to handle events or runnable, as Crossfire TRT is only
291reentrant. 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.
292 336
293If 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
294the given BLOCK in another coroutine while waiting for the result. The 338the given BLOCK in another coroutine while waiting for the result. The
295server 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
296fast or be very important. 340fast or be very important.
299 343
300sub sync_job(&) { 344sub sync_job(&) {
301 my ($job) = @_; 345 my ($job) = @_;
302 346
303 if ($Coro::current == $Coro::main) { 347 if ($Coro::current == $Coro::main) {
348 my $time = Event::time;
349
304 # this is the main coro, too bad, we have to block 350 # this is the main coro, too bad, we have to block
305 # till the operation succeeds, freezing the server :/ 351 # till the operation succeeds, freezing the server :/
306 352
307 # TODO: use suspend/resume instead 353 # TODO: use suspend/resume instead
308 # (but this is cancel-safe) 354 # (but this is cancel-safe)
319 365
320 while ($busy) { 366 while ($busy) {
321 Coro::cede or Event::one_event; 367 Coro::cede or Event::one_event;
322 } 368 }
323 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
324 wantarray ? @res : $res[0] 377 wantarray ? @res : $res[0]
325 } else { 378 } else {
326 # we are in another coroutine, how wonderful, everything just works 379 # we are in another coroutine, how wonderful, everything just works
327 380
328 $job->() 381 $job->()
347 $EXT_CORO{$coro+0} = $coro; 400 $EXT_CORO{$coro+0} = $coro;
348 401
349 $coro 402 $coro
350} 403}
351 404
352sub write_runtime { 405=item fork_call { }, $args
353 my $guard = cf::lock_acquire "write_runtime";
354 406
355 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.
356 411
357 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 412=cut
358 or return;
359 413
360 my $value = $cf::RUNTIME + 90 + 10; 414sub _store_scalar {
361 # 10 is the runtime save interval, for a monotonic clock 415 open my $fh, ">", \my $buf
362 # 60 allows for the watchdog to kill the server. 416 or die "fork_call: cannot open fh-to-buf in child : $!";
363 417 Storable::store_fd $_[0], $fh;
364 (aio_write $fh, 0, (length $value), $value, 0) <= 0
365 and return;
366
367 # always fsync - this file is important
368 aio_fsync $fh
369 and return;
370
371 close $fh 418 close $fh;
372 or return;
373 419
374 aio_rename "$runtime~", $runtime 420 $buf
375 and return; 421}
376 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;
377 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"
378} 581}
379 582
380=item cf::datalog type => key => value, ... 583=item cf::datalog type => key => value, ...
381 584
382Log 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.
400attach callbacks/event handlers (a collection of which is called an "attachment") 603attach callbacks/event handlers (a collection of which is called an "attachment")
401to it. All such attachable objects support the following methods. 604to it. All such attachable objects support the following methods.
402 605
403In 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>
404C<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
405crossfire+). 608Crossfire TRT).
406 609
407=over 4 610=over 4
408 611
409=item $attachable->attach ($attachment, key => $value...) 612=item $attachable->attach ($attachment, key => $value...)
410 613
573 $registry = $CB_TYPE[$object_type] ||= []; 776 $registry = $CB_TYPE[$object_type] ||= [];
574 777
575 } elsif ($type eq "subtype") { 778 } elsif ($type eq "subtype") {
576 defined $object_type or Carp::croak "subtype specified without type"; 779 defined $object_type or Carp::croak "subtype specified without type";
577 my $object_subtype = shift @arg; 780 my $object_subtype = shift @arg;
578 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 781 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
579 782
580 } elsif ($type eq "package") { 783 } elsif ($type eq "package") {
581 my $pkg = shift @arg; 784 my $pkg = shift @arg;
582 785
583 while (my ($name, $id) = each %cb_id) { 786 while (my ($name, $id) = each %cb_id) {
612 _attach $registry, $klass, @attach; 815 _attach $registry, $klass, @attach;
613 } 816 }
614 817
615 $obj->{$name} = \%arg; 818 $obj->{$name} = \%arg;
616 } else { 819 } else {
617 warn "object uses attachment '$name' that is not available, postponing.\n"; 820 warn "object uses attachment '$name' which is not available, postponing.\n";
618 } 821 }
619 822
620 $obj->{_attachment}{$name} = undef; 823 $obj->{_attachment}{$name} = undef;
621} 824}
622 825
624 if (ref $_[0]) { 827 if (ref $_[0]) {
625 _object_attach @_; 828 _object_attach @_;
626 } else { 829 } else {
627 _attach shift->_attach_registry, @_; 830 _attach shift->_attach_registry, @_;
628 } 831 }
832 _recalc_want;
629}; 833};
630 834
631# all those should be optimised 835# all those should be optimised
632sub cf::attachable::detach { 836sub cf::attachable::detach {
633 my ($obj, $name) = @_; 837 my ($obj, $name) = @_;
636 delete $obj->{_attachment}{$name}; 840 delete $obj->{_attachment}{$name};
637 reattach ($obj); 841 reattach ($obj);
638 } else { 842 } else {
639 Carp::croak "cannot, currently, detach class attachments"; 843 Carp::croak "cannot, currently, detach class attachments";
640 } 844 }
845 _recalc_want;
641}; 846};
642 847
643sub cf::attachable::attached { 848sub cf::attachable::attached {
644 my ($obj, $name) = @_; 849 my ($obj, $name) = @_;
645 850
818 or return; 1023 or return;
819 $av = eval { (Storable::thaw $av)->{objs} }; 1024 $av = eval { (Storable::thaw $av)->{objs} };
820 } 1025 }
821 1026
822 warn sprintf "loading %s (%d)\n", 1027 warn sprintf "loading %s (%d)\n",
823 $filename, length $data, scalar @{$av || []};#d# 1028 $filename, length $data, scalar @{$av || []};
824 return ($data, $av); 1029 return ($data, $av);
825} 1030}
1031
1032=head2 COMMAND CALLBACKS
1033
1034=over 4
1035
1036=cut
826 1037
827############################################################################# 1038#############################################################################
828# command handling &c 1039# command handling &c
829 1040
830=item cf::register_command $name => \&callback($ob,$args); 1041=item cf::register_command $name => \&callback($ob,$args);
843 push @{ $COMMAND{$name} }, [$caller, $cb]; 1054 push @{ $COMMAND{$name} }, [$caller, $cb];
844} 1055}
845 1056
846=item cf::register_extcmd $name => \&callback($pl,$packet); 1057=item cf::register_extcmd $name => \&callback($pl,$packet);
847 1058
848Register 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.
849 1064
850If 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
851called. 1066called.
852 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
853=cut 1079=cut
854 1080
855sub register_extcmd { 1081sub register_extcmd {
856 my ($name, $cb) = @_; 1082 my ($name, $cb) = @_;
857 1083
858 $EXTCMD{$name} = $cb; 1084 $EXTCMD{$name} = $cb;
1085}
1086
1087sub register_exticmd {
1088 my ($name, $cb) = @_;
1089
1090 $EXTICMD{$name} = $cb;
859} 1091}
860 1092
861cf::player->attach ( 1093cf::player->attach (
862 on_command => sub { 1094 on_command => sub {
863 my ($pl, $name, $params) = @_; 1095 my ($pl, $name, $params) = @_;
872 cf::override; 1104 cf::override;
873 }, 1105 },
874 on_extcmd => sub { 1106 on_extcmd => sub {
875 my ($pl, $buf) = @_; 1107 my ($pl, $buf) = @_;
876 1108
877 my $msg = eval { from_json $buf }; 1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
878 1110
879 if (ref $msg) { 1111 if (ref $msg) {
880 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
881 if (my %reply = $cb->($pl, $msg)) { 1113 if (my %reply = $cb->($pl, $msg)) {
882 $pl->ext_reply ($msg->{msgid}, %reply); 1114 $pl->ext_reply ($msg->{msgid}, %reply);
888 1120
889 cf::override; 1121 cf::override;
890 }, 1122 },
891); 1123);
892 1124
893sub load_extension {
894 my ($path) = @_;
895
896 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
897 my $base = $1;
898 my $pkg = $1;
899 $pkg =~ s/[^[:word:]]/_/g;
900 $pkg = "ext::$pkg";
901
902 warn "... loading '$path' into '$pkg'\n";
903
904 open my $fh, "<:utf8", $path
905 or die "$path: $!";
906
907 my $source =
908 "package $pkg; use strict; use utf8;\n"
909 . "#line 1 \"$path\"\n{\n"
910 . (do { local $/; <$fh> })
911 . "\n};\n1";
912
913 unless (eval $source) {
914 my $msg = $@ ? "$path: $@\n"
915 : "extension disabled.\n";
916 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
917 warn $@;
918 warn "mandatory extension failed to load, exiting.\n";
919 exit 1;
920 }
921 die $@;
922 }
923
924 push @EXTS, $pkg;
925}
926
927sub load_extensions { 1125sub load_extensions {
1126 cf::sync_job {
1127 my %todo;
1128
928 for my $ext (<$LIBDIR/*.ext>) { 1129 for my $path (<$LIBDIR/*.ext>) {
929 next unless -r $ext; 1130 next unless -r $path;
930 eval { 1131
931 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;
932 1 1189 }
933 } or warn "$ext not loaded: $@"; 1190
1191 skip:
1192 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1193 unless $progress;
1194 }
934 } 1195 };
935} 1196}
936 1197
937############################################################################# 1198#############################################################################
938 1199
1200=back
1201
939=head2 CORE EXTENSIONS 1202=head2 CORE EXTENSIONS
940 1203
941Functions and methods that extend core crossfire objects. 1204Functions and methods that extend core crossfire objects.
942 1205
943=cut 1206=cut
955Returns the given player object, loading it if necessary (might block). 1218Returns the given player object, loading it if necessary (might block).
956 1219
957=cut 1220=cut
958 1221
959sub playerdir($) { 1222sub playerdir($) {
960 cf::localdir 1223 "$PLAYERDIR/"
961 . "/"
962 . cf::playerdir
963 . "/"
964 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1224 . (ref $_[0] ? $_[0]->ob->name : $_[0])
965} 1225}
966 1226
967sub path($) { 1227sub path($) {
968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1228 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1088while and may block, so not sync_job-capable, ever. 1348while and may block, so not sync_job-capable, ever.
1089 1349
1090=cut 1350=cut
1091 1351
1092sub list_logins { 1352sub list_logins {
1093 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1353 my $dirs = aio_readdir $PLAYERDIR
1094 or return []; 1354 or return [];
1095 1355
1096 my @logins; 1356 my @logins;
1097 1357
1098 for my $login (@$dirs) { 1358 for my $login (@$dirs) {
1133 } 1393 }
1134 1394
1135 \@paths 1395 \@paths
1136} 1396}
1137 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 warn $_;#d#
1441 $_
1442}
1443
1444sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode}
1447}
1448
1138=item $player->ext_reply ($msgid, %msg) 1449=item $player->ext_reply ($msgid, %msg)
1139 1450
1140Sends an ext reply to the player. 1451Sends an ext reply to the player.
1141 1452
1142=cut 1453=cut
1143 1454
1144sub ext_reply($$%) { 1455sub ext_reply($$%) {
1145 my ($self, $id, %msg) = @_; 1456 my ($self, $id, %msg) = @_;
1146 1457
1147 $msg{msgid} = $id; 1458 $msg{msgid} = $id;
1148 1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1149 $self->send ("ext " . cf::to_json \%msg);
1150} 1460}
1151 1461
1152=item $player->ext_event ($type, %msg) 1462=item $player->ext_event ($type, %msg)
1153 1463
1154Sends an ext event to the client. 1464Sends an ext event to the client.
1169 1479
1170package cf::region; 1480package cf::region;
1171 1481
1172=item cf::region::find_by_path $path 1482=item cf::region::find_by_path $path
1173 1483
1174Tries 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.
1175 1485
1176=cut 1486=cut
1177 1487
1178sub find_by_path($) { 1488sub find_by_path($) {
1179 my ($path) = @_; 1489 my ($path) = @_;
1253 my ($self, $merge) = @_; 1563 my ($self, $merge) = @_;
1254 1564
1255 # we have to keep some variables in memory intact 1565 # we have to keep some variables in memory intact
1256 local $self->{path}; 1566 local $self->{path};
1257 local $self->{load_path}; 1567 local $self->{load_path};
1258 local $self->{deny_save};
1259 local $self->{deny_reset};
1260 1568
1261 $self->SUPER::thawer_merge ($merge); 1569 $self->SUPER::thawer_merge ($merge);
1262} 1570}
1263 1571
1264sub normalise { 1572sub normalise {
1336 1644
1337# the original (read-only) location 1645# the original (read-only) location
1338sub load_path { 1646sub load_path {
1339 my ($self) = @_; 1647 my ($self) = @_;
1340 1648
1341 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1649 "$MAPDIR/$self->{path}.map"
1342} 1650}
1343 1651
1344# the temporary/swap location 1652# the temporary/swap location
1345sub save_path { 1653sub save_path {
1346 my ($self) = @_; 1654 my ($self) = @_;
1347 1655
1348 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1349 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1657 "$TMPDIR/$path.map"
1350} 1658}
1351 1659
1352# the unique path, undef == no special unique path 1660# the unique path, undef == no special unique path
1353sub uniq_path { 1661sub uniq_path {
1354 my ($self) = @_; 1662 my ($self) = @_;
1355 1663
1356 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1357 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1665 "$UNIQUEDIR/$path"
1358} 1666}
1359 1667
1360# and all this just because we cannot iterate over 1668# and all this just because we cannot iterate over
1361# all maps in C++... 1669# all maps in C++...
1362sub change_all_map_light { 1670sub change_all_map_light {
1363 my ($change) = @_; 1671 my ($change) = @_;
1364 1672
1365 $_->change_map_light ($change) 1673 $_->change_map_light ($change)
1366 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;
1367} 1683}
1368 1684
1369sub unlink_save { 1685sub unlink_save {
1370 my ($self) = @_; 1686 my ($self) = @_;
1371 1687
1429 $self->load_header_orig 1745 $self->load_header_orig
1430 or return; 1746 or return;
1431 $self->prepare_orig; 1747 $self->prepare_orig;
1432 } 1748 }
1433 1749
1750 $self->{deny_reset} = 1
1751 if $self->no_reset;
1752
1434 $self->default_region (cf::region::find_by_path $self->{path}) 1753 $self->default_region (cf::region::find_by_path $self->{path})
1435 unless $self->default_region; 1754 unless $self->default_region;
1436 1755
1437 1 1756 1
1438} 1757}
1453 $map->{last_save} = $cf::RUNTIME; 1772 $map->{last_save} = $cf::RUNTIME;
1454 1773
1455 $map->load_header 1774 $map->load_header
1456 or return; 1775 or return;
1457 1776
1458 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1459 # doing this can freeze the server in a sync job, obviously 1778 # doing this can freeze the server in a sync job, obviously
1460 #$cf::WAIT_FOR_TICK->wait; 1779 #$cf::WAIT_FOR_TICK->wait;
1461 $map->reset; 1780 $map->reset;
1462 undef $guard; 1781 undef $guard;
1463 return find $path; 1782 return find $path;
1474 my ($self) = @_; 1793 my ($self) = @_;
1475 1794
1476 local $self->{deny_reset} = 1; # loading can take a long time 1795 local $self->{deny_reset} = 1; # loading can take a long time
1477 1796
1478 my $path = $self->{path}; 1797 my $path = $self->{path};
1798
1799 {
1479 my $guard = cf::lock_acquire "map_load:$path"; 1800 my $guard = cf::lock_acquire "map_load:$path";
1480 1801
1481 return if $self->in_memory != cf::MAP_SWAPPED; 1802 return if $self->in_memory != cf::MAP_SWAPPED;
1482 1803
1483 $self->in_memory (cf::MAP_LOADING); 1804 $self->in_memory (cf::MAP_LOADING);
1484 1805
1485 $self->alloc; 1806 $self->alloc;
1486 1807
1487 $self->pre_load; 1808 $self->pre_load;
1488 Coro::cede;
1489
1490 $self->_load_objects ($self->{load_path}, 1)
1491 or return;
1492
1493 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1494 if delete $self->{load_original};
1495
1496 if (my $uniq = $self->uniq_path) {
1497 utf8::encode $uniq;
1498 if (aio_open $uniq, O_RDONLY, 0) {
1499 $self->clear_unique_items;
1500 $self->_load_objects ($uniq, 0);
1501 }
1502 }
1503
1504 Coro::cede;
1505 # now do the right thing for maps
1506 $self->link_multipart_objects;
1507 Coro::cede;
1508
1509 unless ($self->{deny_activate}) {
1510 $self->decay_objects;
1511 $self->fix_auto_apply;
1512 $self->update_buttons;
1513 Coro::cede; 1809 Coro::cede;
1514 $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;
1515 $self->difficulty ($self->estimate_difficulty) 1828 $self->difficulty ($self->estimate_difficulty)
1516 unless $self->difficulty; 1829 unless $self->difficulty;
1517 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;
1518 $self->activate; 1839 $self->activate;
1519 Coro::cede; 1840 }
1841
1842 $self->in_memory (cf::MAP_IN_MEMORY);
1520 } 1843 }
1521 1844
1522 $self->post_load; 1845 $self->post_load;
1523 Coro::cede;
1524
1525 $self->in_memory (cf::MAP_IN_MEMORY);
1526} 1846}
1527 1847
1528sub customise_for { 1848sub customise_for {
1529 my ($self, $ob) = @_; 1849 my ($self, $ob) = @_;
1530 1850
1531 return find "~" . $ob->name . "/" . $self->{path} 1851 return find "~" . $ob->name . "/" . $self->{path}
1532 if $self->per_player; 1852 if $self->per_player;
1853
1854# return find "?party/" . $ob->name . "/" . $self->{path}
1855# if $self->per_party;
1533 1856
1534 $self 1857 $self
1535} 1858}
1536 1859
1537# 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
1648 1971
1649sub reset_at { 1972sub reset_at {
1650 my ($self) = @_; 1973 my ($self) = @_;
1651 1974
1652 # TODO: safety, remove and allow resettable per-player maps 1975 # TODO: safety, remove and allow resettable per-player maps
1653 return 1e99 if $self->isa ("ext::map_per_player");#d#
1654 return 1e99 if $self->{deny_reset}; 1976 return 1e99 if $self->{deny_reset};
1655 1977
1656 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1978 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1657 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;
1658 1980
1669 my ($self) = @_; 1991 my ($self) = @_;
1670 1992
1671 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1993 my $lock = cf::lock_acquire "map_data:$self->{path}";
1672 1994
1673 return if $self->players; 1995 return if $self->players;
1674 return if $self->isa ("ext::map_per_player");#d#
1675 1996
1676 warn "resetting map ", $self->path;#d# 1997 warn "resetting map ", $self->path;
1677 1998
1678 $self->in_memory (cf::MAP_SWAPPED); 1999 $self->in_memory (cf::MAP_SWAPPED);
1679 2000
1680 # need to save uniques path 2001 # need to save uniques path
1681 unless ($self->{deny_save}) { 2002 unless ($self->{deny_save}) {
1713 $cf::MAP{$self->path} = $self; 2034 $cf::MAP{$self->path} = $self;
1714 2035
1715 $self->reset; # polite request, might not happen 2036 $self->reset; # polite request, might not happen
1716} 2037}
1717 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
1718=item cf::map::unique_maps 2075=item cf::map::unique_maps
1719 2076
1720Returns an arrayref of paths of all shared maps that have 2077Returns an arrayref of paths of all shared maps that have
1721instantiated unique items. May block. 2078instantiated unique items. May block.
1722 2079
1723=cut 2080=cut
1724 2081
1725sub unique_maps() { 2082sub unique_maps() {
1726 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2083 [
1727 or return; 2084 map {
1728
1729 my @paths;
1730
1731 for (@$files) {
1732 utf8::decode $_; 2085 utf8::decode $_;
1733 next if /\.pst$/; 2086 /\.map$/
1734 next unless /^$PATH_SEP/o; 2087 ? normalise $_
1735 2088 : ()
1736 push @paths, cf::map::normalise $_; 2089 } @{ aio_readdir $UNIQUEDIR or [] }
1737 } 2090 ]
1738
1739 \@paths
1740} 2091}
1741 2092
1742package cf; 2093package cf;
1743 2094
1744=back 2095=back
1790 2141
1791 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2142 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1792 2143
1793 if ($self->{record_replies}) { 2144 if ($self->{record_replies}) {
1794 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2145 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2146
1795 } 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 {
1796 $msg = $npc->name . " says: $msg" if $npc; 2160 $msg = $npc->name . " says: $msg" if $npc;
1797 $self->message ($msg, $flags); 2161 $self->message ($msg, $flags);
2162 }
1798 } 2163 }
1799} 2164}
1800 2165
1801=item $player_object->may ("access") 2166=item $player_object->may ("access")
1802 2167
1850 $self->deactivate_recursive; 2215 $self->deactivate_recursive;
1851 2216
1852 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2217 return if UNIVERSAL::isa $self->map, "ext::map_link";
1853 2218
1854 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2219 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1855 if $self->map; 2220 if $self->map && $self->map->{path} ne "{link}";
1856 2221
1857 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2222 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1858} 2223}
1859 2224
1860sub cf::object::player::leave_link { 2225sub cf::object::player::leave_link {
1861 my ($self, $map, $x, $y) = @_; 2226 my ($self, $map, $x, $y) = @_;
2227
2228 return unless $self->contr->active;
1862 2229
1863 my $link_pos = delete $self->{_link_pos}; 2230 my $link_pos = delete $self->{_link_pos};
1864 2231
1865 unless ($map) { 2232 unless ($map) {
1866 # restore original map position 2233 # restore original map position
1889 2256
1890 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1891 $self->enter_map ($map, $x, $y); 2258 $self->enter_map ($map, $x, $y);
1892} 2259}
1893 2260
1894cf::player->attach (
1895 on_logout => sub {
1896 my ($pl) = @_;
1897
1898 # abort map switching before logout
1899 if ($pl->ob->{_link_pos}) {
1900 cf::sync_job {
1901 $pl->ob->leave_link
1902 };
1903 }
1904 },
1905 on_login => sub {
1906 my ($pl) = @_;
1907
1908 # try to abort aborted map switching on player login :)
1909 # should happen only on crashes
1910 if ($pl->ob->{_link_pos}) {
1911 $pl->ob->enter_link;
1912 (async {
1913 $pl->ob->reply (undef,
1914 "There was an internal problem at your last logout, "
1915 . "the server will try to bring you to your intended destination in a second.",
1916 cf::NDI_RED);
1917 # we need this sleep as the login has a concurrent enter_exit running
1918 # and this sleep increases chances of the player not ending up in scorn
1919 Coro::Timer::sleep 1;
1920 $pl->ob->leave_link;
1921 })->prio (2);
1922 }
1923 },
1924);
1925
1926=item $player_object->goto ($path, $x, $y) 2261=item $player_object->goto ($path, $x, $y[, $check->($map)])
1927 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
1928=cut 2268=cut
2269
2270our $GOTOGEN;
1929 2271
1930sub cf::object::player::goto { 2272sub cf::object::player::goto {
1931 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;
1932 2277
1933 $self->enter_link; 2278 $self->enter_link;
1934 2279
1935 (async { 2280 (async {
1936 my $map = eval { 2281 my $map = eval {
1937 my $map = cf::map::find $path; 2282 my $map = cf::map::find $path;
2283
2284 if ($map) {
1938 $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
1939 $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 $@;
1940 } or 2297 }
1941 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1942 2298
2299 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation};
1943 $self->leave_link ($map, $x, $y); 2301 $self->leave_link ($map, $x, $y);
2302 }
1944 })->prio (1); 2303 })->prio (1);
1945} 2304}
1946 2305
1947=item $player_object->enter_exit ($exit_object) 2306=item $player_object->enter_exit ($exit_object)
1948 2307
1987 2346
1988 $rmp->{random_seed} ||= $exit->random_seed; 2347 $rmp->{random_seed} ||= $exit->random_seed;
1989 2348
1990 my $data = cf::to_json $rmp; 2349 my $data = cf::to_json $rmp;
1991 my $md5 = Digest::MD5::md5_hex $data; 2350 my $md5 = Digest::MD5::md5_hex $data;
1992 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2351 my $meta = "$RANDOMDIR/$md5.meta";
1993 2352
1994 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2353 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1995 aio_write $fh, 0, (length $data), $data, 0; 2354 aio_write $fh, 0, (length $data), $data, 0;
1996 undef $fh; 2355 undef $fh;
1997 aio_rename "$meta~", $meta; 2356 aio_rename "$meta~", $meta;
2016 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;
2017 my $hp = $exit->stats->hp; 2376 my $hp = $exit->stats->hp;
2018 my $sp = $exit->stats->sp; 2377 my $sp = $exit->stats->sp;
2019 2378
2020 $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);
2021 2384
2022 (async { 2385 (async {
2023 $self->deactivate_recursive; # just to be sure 2386 $self->deactivate_recursive; # just to be sure
2024 unless (eval { 2387 unless (eval {
2025 $self->goto ($slaying, $hp, $sp); 2388 $self->goto ($slaying, $hp, $sp);
2053 2416
2054 utf8::encode $text; 2417 utf8::encode $text;
2055 $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);
2056} 2419}
2057 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
2058=item $client->ext_event ($type, %msg) 2461=item $client->ext_event ($type, %msg)
2059 2462
2060Sends an exti event to the client. 2463Sends an ext event to the client.
2061 2464
2062=cut 2465=cut
2063 2466
2064sub cf::client::ext_event($$%) { 2467sub cf::client::ext_event($$%) {
2065 my ($self, $type, %msg) = @_; 2468 my ($self, $type, %msg) = @_;
2066 2469
2067 $msg{msgtype} = "event_$type"; 2470 $msg{msgtype} = "event_$type";
2068 $self->send_packet ("ext " . cf::to_json \%msg); 2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2069} 2472}
2070 2473
2071=item $success = $client->query ($flags, "text", \&cb) 2474=item $success = $client->query ($flags, "text", \&cb)
2072 2475
2073Queues a query to the client, calling the given callback with 2476Queues a query to the client, calling the given callback with
2074the 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>,
2075C<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>.
2076 2479
2077Queries 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
2078reliable at some point in the future. 2481become reliable at some point in the future.
2079 2482
2080=cut 2483=cut
2081 2484
2082sub cf::client::query { 2485sub cf::client::query {
2083 my ($self, $flags, $text, $cb) = @_; 2486 my ($self, $flags, $text, $cb) = @_;
2091 utf8::encode $text; 2494 utf8::encode $text;
2092 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2495 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2093 2496
2094 $self->send_packet ($self->{query_queue}[0][0]) 2497 $self->send_packet ($self->{query_queue}[0][0])
2095 if @{ $self->{query_queue} } == 1; 2498 if @{ $self->{query_queue} } == 1;
2499
2500 1
2096} 2501}
2097 2502
2098cf::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 },
2099 on_reply => sub { 2509 on_reply => sub {
2100 my ($ns, $msg) = @_; 2510 my ($ns, $msg) = @_;
2101 2511
2102 # this weird shuffling is so that direct followup queries 2512 # this weird shuffling is so that direct followup queries
2103 # get handled first 2513 # get handled first
2115 } else { 2525 } else {
2116 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2526 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2117 } 2527 }
2118 } 2528 }
2119 }, 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 },
2120); 2548);
2121 2549
2122=item $client->async (\&cb) 2550=item $client->async (\&cb)
2123 2551
2124Create a new coroutine, running the specified callback. The coroutine will 2552Create a new coroutine, running the specified callback. The coroutine will
2173 2601
2174=pod 2602=pod
2175 2603
2176The following functions and methods are available within a safe environment: 2604The following functions and methods are available within a safe environment:
2177 2605
2178 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
2179 cf::object::player player 2610 cf::object::player
2180 cf::player peaceful 2611 player
2181 cf::map trigger 2612
2613 cf::player
2614 peaceful
2615
2616 cf::map
2617 trigger
2182 2618
2183=cut 2619=cut
2184 2620
2185for ( 2621for (
2186 ["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)],
2187 ["cf::object::player" => qw(player)], 2624 ["cf::object::player" => qw(player)],
2188 ["cf::player" => qw(peaceful)], 2625 ["cf::player" => qw(peaceful)],
2189 ["cf::map" => qw(trigger)], 2626 ["cf::map" => qw(trigger)],
2190) { 2627) {
2191 no strict 'refs'; 2628 no strict 'refs';
2260} 2697}
2261 2698
2262=back 2699=back
2263 2700
2264=cut 2701=cut
2265
2266#############################################################################
2267
2268=head2 EXTENSION DATABASE SUPPORT
2269
2270Crossfire maintains a very simple database for extension use. It can
2271currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2272convert to/from binary).
2273
2274The parameter C<$family> should best start with the name of the extension
2275using it, it should be unique.
2276
2277=over 4
2278
2279=item $value = cf::db_get $family => $key
2280
2281Returns a single value from the database.
2282
2283=item cf::db_put $family => $key => $value
2284
2285Stores the given C<$value> in the family.
2286
2287=cut
2288
2289our $DB;
2290
2291sub db_init {
2292 unless ($DB) {
2293 $DB = BDB::db_create $DB_ENV;
2294
2295 cf::sync_job {
2296 eval {
2297 $DB->set_flags (BDB::CHKSUM);
2298
2299 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2300 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2301 cf::cleanup "db_open(db): $!" if $!;
2302 };
2303 cf::cleanup "db_open(db): $@" if $@;
2304 };
2305 }
2306}
2307
2308sub db_get($$) {
2309 my $key = "$_[0]/$_[1]";
2310
2311 cf::sync_job {
2312 BDB::db_get $DB, undef, $key, my $data;
2313
2314 $! ? ()
2315 : $data
2316 }
2317}
2318
2319sub db_put($$$) {
2320 BDB::dbreq_pri 4;
2321 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2322}
2323
2324=item cf::cache $id => [$paths...], $processversion => $process
2325
2326Generic caching function that returns the value of the resource $id,
2327caching and regenerating as required.
2328
2329This function can block.
2330
2331=cut
2332
2333sub cache {
2334 my ($id, $src, $processversion, $process) = @_;
2335
2336 my $meta =
2337 join "\x00",
2338 $processversion,
2339 map {
2340 aio_stat $_
2341 and Carp::croak "$_: $!";
2342
2343 ($_, (stat _)[7,9])
2344 } @$src;
2345
2346 my $dbmeta = db_get cache => "$id/meta";
2347 if ($dbmeta ne $meta) {
2348 # changed, we may need to process
2349
2350 my @data;
2351 my $md5;
2352
2353 for (0 .. $#$src) {
2354 0 <= aio_load $src->[$_], $data[$_]
2355 or Carp::croak "$src->[$_]: $!";
2356 }
2357
2358 # if processing is expensive, check
2359 # checksum first
2360 if (1) {
2361 $md5 =
2362 join "\x00",
2363 $processversion,
2364 map {
2365 Coro::cede;
2366 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2367 } 0.. $#$src;
2368
2369
2370 my $dbmd5 = db_get cache => "$id/md5";
2371 if ($dbmd5 eq $md5) {
2372 db_put cache => "$id/meta", $meta;
2373
2374 return db_get cache => "$id/data";
2375 }
2376 }
2377
2378 my $data = $process->(\@data);
2379
2380 db_put cache => "$id/data", $data;
2381 db_put cache => "$id/md5" , $md5;
2382 db_put cache => "$id/meta", $meta;
2383
2384 return $data;
2385 }
2386
2387 db_get cache => "$id/data"
2388}
2389
2390=item fork_call { }, $args
2391
2392Executes the given code block with the given arguments in a seperate
2393process, returning the results. Everything must be serialisable with
2394Coro::Storable. May, of course, block. Note that the executed sub may
2395never block itself or use any form of Event handling.
2396
2397=cut
2398
2399sub fork_call(&@) {
2400 my ($cb, @args) = @_;
2401
2402# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2403# or die "socketpair: $!";
2404 pipe my $fh1, my $fh2
2405 or die "pipe: $!";
2406
2407 if (my $pid = fork) {
2408 close $fh2;
2409
2410 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2411 $res = Coro::Storable::thaw $res;
2412
2413 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2414
2415 die $$res unless "ARRAY" eq ref $res;
2416
2417 return wantarray ? @$res : $res->[-1];
2418 } else {
2419 local $SIG{__WARN__};
2420 eval {
2421 local $SIG{__DIE__};
2422 close $fh1;
2423
2424 my @res = eval { $cb->(@args) };
2425 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2426 };
2427
2428 warn $@ if $@;
2429 _exit 0;
2430 }
2431}
2432
2433
2434 2702
2435############################################################################# 2703#############################################################################
2436# the server's init and main functions 2704# the server's init and main functions
2437 2705
2438sub load_facedata($) { 2706sub load_facedata($) {
2485 } 2753 }
2486 2754
2487 1 2755 1
2488} 2756}
2489 2757
2758sub reload_regions {
2759 load_resource_file "$MAPDIR/regions"
2760 or die "unable to load regions file\n";
2761}
2762
2490sub reload_facedata { 2763sub reload_facedata {
2491 load_facedata sprintf "%s/facedata", cf::datadir 2764 load_facedata "$DATADIR/facedata"
2492 or die "unable to load facedata\n"; 2765 or die "unable to load facedata\n";
2493} 2766}
2494 2767
2495sub reload_regions {
2496 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2497 or die "unable to load regions file\n";
2498}
2499
2500sub reload_archetypes { 2768sub reload_archetypes {
2501 load_resource_file sprintf "%s/archetypes", cf::datadir 2769 load_resource_file "$DATADIR/archetypes"
2502 or die "unable to load archetypes\n"; 2770 or die "unable to load archetypes\n";
2771 #d# NEED to laod twice to resolve forward references
2772 # this really needs to be done in an extra post-pass
2773 # (which needs to be synchronous, so solve it differently)
2774 load_resource_file "$DATADIR/archetypes"
2775 or die "unable to load archetypes\n";
2503} 2776}
2504 2777
2505sub reload_treasures { 2778sub reload_treasures {
2506 load_resource_file sprintf "%s/treasures", cf::datadir 2779 load_resource_file "$DATADIR/treasures"
2507 or die "unable to load treasurelists\n"; 2780 or die "unable to load treasurelists\n";
2508} 2781}
2509 2782
2510sub reload_resources { 2783sub reload_resources {
2511 warn "reloading resource files...\n"; 2784 warn "reloading resource files...\n";
2512 2785
2513 reload_regions; 2786 reload_regions;
2514 reload_facedata; 2787 reload_facedata;
2788 #reload_archetypes;#d#
2515 reload_archetypes; 2789 reload_archetypes;
2516 reload_treasures; 2790 reload_treasures;
2517 2791
2518 warn "finished reloading resource files\n"; 2792 warn "finished reloading resource files\n";
2519} 2793}
2521sub init { 2795sub init {
2522 reload_resources; 2796 reload_resources;
2523} 2797}
2524 2798
2525sub cfg_load { 2799sub cfg_load {
2526 open my $fh, "<:utf8", cf::confdir . "/config" 2800 open my $fh, "<:utf8", "$CONFDIR/config"
2527 or return; 2801 or return;
2528 2802
2529 local $/; 2803 local $/;
2530 *CFG = YAML::Syck::Load <$fh>; 2804 *CFG = YAML::Syck::Load <$fh>;
2531 2805
2576 }, 2850 },
2577 ); 2851 );
2578 } 2852 }
2579} 2853}
2580 2854
2855sub write_runtime {
2856 my $runtime = "$LOCALDIR/runtime";
2857
2858 # first touch the runtime file to show we are still running:
2859 # the fsync below can take a very very long time.
2860
2861 IO::AIO::aio_utime $runtime, undef, undef;
2862
2863 my $guard = cf::lock_acquire "write_runtime";
2864
2865 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2866 or return;
2867
2868 my $value = $cf::RUNTIME + 90 + 10;
2869 # 10 is the runtime save interval, for a monotonic clock
2870 # 60 allows for the watchdog to kill the server.
2871
2872 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2873 and return;
2874
2875 # always fsync - this file is important
2876 aio_fsync $fh
2877 and return;
2878
2879 # touch it again to show we are up-to-date
2880 aio_utime $fh, undef, undef;
2881
2882 close $fh
2883 or return;
2884
2885 aio_rename "$runtime~", $runtime
2886 and return;
2887
2888 warn "runtime file written.\n";
2889
2890 1
2891}
2892
2581sub emergency_save() { 2893sub emergency_save() {
2582 my $freeze_guard = cf::freeze_mainloop; 2894 my $freeze_guard = cf::freeze_mainloop;
2583 2895
2584 warn "enter emergency perl save\n"; 2896 warn "enter emergency perl save\n";
2585 2897
2660 %EXT_CORO = (); 2972 %EXT_CORO = ();
2661 2973
2662 warn "removing commands"; 2974 warn "removing commands";
2663 %COMMAND = (); 2975 %COMMAND = ();
2664 2976
2665 warn "removing ext commands"; 2977 warn "removing ext/exti commands";
2666 %EXTCMD = (); 2978 %EXTCMD = ();
2979 %EXTICMD = ();
2667 2980
2668 warn "unloading/nuking all extensions"; 2981 warn "unloading/nuking all extensions";
2669 for my $pkg (@EXTS) { 2982 for my $pkg (@EXTS) {
2670 warn "... unloading $pkg"; 2983 warn "... unloading $pkg";
2671 2984
2789 my $signal = new Coro::Signal; 3102 my $signal = new Coro::Signal;
2790 push @WAIT_FOR_TICK_BEGIN, $signal; 3103 push @WAIT_FOR_TICK_BEGIN, $signal;
2791 $signal->wait; 3104 $signal->wait;
2792} 3105}
2793 3106
3107 my $min = 1e6;#d#
3108 my $avg = 10;
2794$TICK_WATCHER = Event->timer ( 3109$TICK_WATCHER = Event->timer (
2795 reentrant => 0, 3110 reentrant => 0,
2796 parked => 1, 3111 parked => 1,
2797 prio => 0, 3112 prio => 0,
2798 at => $NEXT_TICK || $TICK, 3113 at => $NEXT_TICK || $TICK,
2802 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3117 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2803 unless ++$bug_warning > 10; 3118 unless ++$bug_warning > 10;
2804 return; 3119 return;
2805 } 3120 }
2806 3121
2807 $NOW = Event::time; 3122 $NOW = $tick_start = Event::time;
2808 3123
2809 cf::server_tick; # one server iteration 3124 cf::server_tick; # one server iteration
3125
3126 0 && sync_job {#d#
3127 for(1..10) {
3128 my $t = Event::time;
3129 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3130 or die;
3131
3132 $map->width (50);
3133 $map->height (50);
3134 $map->alloc;
3135 $map->_load_objects ("/tmp/x.map", 1);
3136 my $t = Event::time - $t;
3137
3138 #next unless $t < 0.0013;#d#
3139 if ($t < $min) {
3140 $min = $t;
3141 }
3142 $avg = $avg * 0.99 + $t * 0.01;
3143 }
3144 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3145 exit 0;
3146 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3147 };
2810 3148
2811 $RUNTIME += $TICK; 3149 $RUNTIME += $TICK;
2812 $NEXT_TICK += $TICK; 3150 $NEXT_TICK += $TICK;
2813 3151
2814 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3152 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2820 } 3158 }
2821 3159
2822# my $AFTER = Event::time; 3160# my $AFTER = Event::time;
2823# warn $AFTER - $NOW;#d# 3161# warn $AFTER - $NOW;#d#
2824 3162
3163 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3164 $sig->send;
3165 }
3166 while (my $sig = shift @WAIT_FOR_TICK) {
3167 $sig->send;
3168 }
3169
3170 $NOW = Event::time;
3171
2825 # if we are delayed by four ticks or more, skip them all 3172 # if we are delayed by four ticks or more, skip them all
2826 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3173 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2827 3174
2828 $TICK_WATCHER->at ($NEXT_TICK); 3175 $TICK_WATCHER->at ($NEXT_TICK);
2829 $TICK_WATCHER->start; 3176 $TICK_WATCHER->start;
2830 3177
2831 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3178 $LOAD = ($NOW - $tick_start) / $TICK;
2832 $sig->send; 3179 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2833 }
2834 while (my $sig = shift @WAIT_FOR_TICK) {
2835 $sig->send;
2836 }
2837 3180
2838 _post_tick; 3181 _post_tick;
3182
3183
2839 }, 3184 },
2840); 3185);
2841 3186
2842{ 3187{
2843 BDB::max_poll_time $TICK * 0.1; 3188 BDB::max_poll_time $TICK * 0.1;
2871 3216
2872 cf::sync_job { 3217 cf::sync_job {
2873 eval { 3218 eval {
2874 BDB::db_env_open 3219 BDB::db_env_open
2875 $DB_ENV, 3220 $DB_ENV,
2876 $BDB_ENV_DIR, 3221 $BDBDIR,
2877 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3222 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2878 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3223 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2879 0666; 3224 0666;
2880 3225
2881 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3226 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2882 3227
2883 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3228 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2884 $DB_ENV->set_lk_detect; 3229 $DB_ENV->set_lk_detect;
2885 }; 3230 };
2886 3231
2902 prio => 6, 3247 prio => 6,
2903 cb => \&IO::AIO::poll_cb, 3248 cb => \&IO::AIO::poll_cb,
2904 ); 3249 );
2905} 3250}
2906 3251
3252my $_log_backtrace;
3253
3254sub _log_backtrace {
3255 my ($msg, @addr) = @_;
3256
3257 $msg =~ s/\n//;
3258
3259 # limit the # of concurrent backtraces
3260 if ($_log_backtrace < 2) {
3261 ++$_log_backtrace;
3262 async {
3263 my @bt = fork_call {
3264 @addr = map { sprintf "%x", $_ } @addr;
3265 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3266 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3267 or die "addr2line: $!";
3268
3269 my @funcs;
3270 my @res = <$fh>;
3271 chomp for @res;
3272 while (@res) {
3273 my ($func, $line) = splice @res, 0, 2, ();
3274 push @funcs, "[$func] $line";
3275 }
3276
3277 @funcs
3278 };
3279
3280 LOG llevInfo, "[ABT] $msg\n";
3281 LOG llevInfo, "[ABT] $_\n" for @bt;
3282 --$_log_backtrace;
3283 };
3284 } else {
3285 LOG llevInfo, "[ABT] $msg\n";
3286 LOG llevInfo, "[ABT] [suppressed]\n";
3287 }
3288}
3289
2907# load additional modules 3290# load additional modules
2908use cf::pod; 3291use cf::pod;
2909 3292
2910END { cf::emergency_save } 3293END { cf::emergency_save }
2911 3294

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines