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.228 by root, Mon Mar 26 16:53:33 2007 UTC vs.
Revision 1.344 by root, Mon Aug 27 02:43:38 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.52 (); 15use Coro 3.64 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
24use Coro::Util ();
21 25
26use JSON::XS ();
22use BDB (); 27use BDB ();
23use Data::Dumper; 28use Data::Dumper;
24use Digest::MD5; 29use Digest::MD5;
25use Fcntl; 30use Fcntl;
26use YAML::Syck (); 31use YAML::Syck ();
27use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
28use Time::HiRes; 33use Time::HiRes;
29use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
30 36
31# configure various modules to our taste 37# configure various modules to our taste
32# 38#
39$Storable::canonical = 1; # reduce rsync transfers
33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35 42
36$Event::Eval = 1; # no idea why this is required, but it is 43$Event::Eval = 1; # no idea why this is required, but it is
37 44
45our %COMMAND = (); 52our %COMMAND = ();
46our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
47 54
48our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
49our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
50our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
51our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
52 60
53our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
54our @EVENT; 62our @EVENT;
55our $LIBDIR = datadir . "/ext";
56 63
57our $TICK = MAX_TIME * 1e-6; 64our $CONFDIR = confdir;
65our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db";
75
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
58our $TICK_WATCHER; 77our $TICK_WATCHER;
59our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
61our $NEXT_TICK; 80our $NEXT_TICK;
62our $NOW; 81our $NOW;
71our $RUNTIME; 90our $RUNTIME;
72 91
73our %PLAYER; # all users 92our %PLAYER; # all users
74our %MAP; # all maps 93our %MAP; # all maps
75our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
76our $RANDOM_MAPS = cf::localdir . "/random";
77our $BDB_ENV_DIR = cf::localdir . "/db";
78
79our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
80our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
81 95
82# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
83our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
84 98
99our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing
101our $tick_start; # for load detecting purposes
102
85binmode STDOUT; 103binmode STDOUT;
86binmode STDERR; 104binmode STDERR;
87 105
88# read virtual server time, if available 106# read virtual server time, if available
89unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
90 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
91 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
92 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
93} 111}
94 112
95mkdir cf::localdir; 113mkdir $_
96mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
97mkdir cf::localdir . "/" . cf::tmpdir;
98mkdir cf::localdir . "/" . cf::uniquedir;
99mkdir $RANDOM_MAPS;
100mkdir $BDB_ENV_DIR;
101 115
102our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
103 117
104sub cf::map::normalise; 118sub cf::map::normalise;
105 119
116=item $cf::RUNTIME 130=item $cf::RUNTIME
117 131
118The time this server has run, starts at 0 and is increased by $cf::TICK on 132The time this server has run, starts at 0 and is increased by $cf::TICK on
119every server tick. 133every server tick.
120 134
121=item $cf::LIBDIR 135=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
136$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
137$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
122 138
123The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
124be found. It will be added to C<@INC> automatically. 140directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
141unique-items directory, player file directory, random maps directory and
142database environment.
125 143
126=item $cf::NOW 144=item $cf::NOW
127 145
128The time of the last (current) server tick. 146The time of the last (current) server tick.
129 147
130=item $cf::TICK 148=item $cf::TICK
131 149
132The interval between server ticks, in seconds. 150The interval between server ticks, in seconds.
151
152=item $cf::LOADAVG
153
154The current CPU load on the server (alpha-smoothed), as a value between 0
155(none) and 1 (overloaded), indicating how much time is spent on processing
156objects per tick. Healthy values are < 0.5.
157
158=item $cf::LOAD
159
160The raw value load value from the last tick.
133 161
134=item %cf::CFG 162=item %cf::CFG
135 163
136Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
137from wherever your confdir points to. 165from wherever your confdir points to.
138 166
139=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 167=item cf::wait_for_tick, cf::wait_for_tick_begin
140 168
141These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
142or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 170returns directly I<after> the tick processing (and consequently, can only wake one process
143processing has been done. Call C<< ->wait >> on them to maximise the 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
144window of cpu time available, or simply to synchronise to the server tick. 172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
145 178
146=back 179=back
147 180
148=cut 181=cut
149 182
150BEGIN { 183BEGIN {
151 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
152 my $msg = join "", @_; 185 my $msg = join "", @_;
153 utf8::encode $msg;
154 186
155 $msg .= "\n" 187 $msg .= "\n"
156 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
157 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
192 utf8::encode $msg;
158 LOG llevError, $msg; 193 LOG llevError, $msg;
159 }; 194 };
160} 195}
161 196
162@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
163@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
164@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
165@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
166@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 201@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
202@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
167@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 203@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
168 204
169# we bless all objects into (empty) derived classes to force a method lookup 205# we bless all objects into (empty) derived classes to force a method lookup
170# within the Safe compartment. 206# within the Safe compartment.
171for my $pkg (qw( 207for my $pkg (qw(
172 cf::global cf::attachable 208 cf::global cf::attachable
180} 216}
181 217
182$Event::DIED = sub { 218$Event::DIED = sub {
183 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
184}; 220};
221
222#############################################################################
185 223
186=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
187 225
188=over 4 226=over 4
189 227
208 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
209 $d 247 $d
210 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
211} 249}
212 250
213use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
214
215=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
216 252
217Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
218 254
219=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
220 256
221Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
258
259=cut
260
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262
263sub to_json ($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) }
222 265
223=item cf::lock_wait $string 266=item cf::lock_wait $string
224 267
225Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
226 269
232returned. 275returned.
233 276
234Lock names should begin with a unique identifier (for example, cf::map::find 277Lock names should begin with a unique identifier (for example, cf::map::find
235uses map_find and cf::map::load uses map_load). 278uses map_find and cf::map::load uses map_load).
236 279
280=item $locked = cf::lock_active $string
281
282Return true if the lock is currently active, i.e. somebody has locked it.
283
237=cut 284=cut
238 285
239our %LOCK; 286our %LOCK;
240 287
241sub lock_wait($) { 288sub lock_wait($) {
258 305
259 Coro::guard { 306 Coro::guard {
260 # wake up all waiters, to be on the safe side 307 # wake up all waiters, to be on the safe side
261 $_->ready for @{ delete $LOCK{$key} }; 308 $_->ready for @{ delete $LOCK{$key} };
262 } 309 }
310}
311
312sub lock_active($) {
313 my ($key) = @_;
314
315 ! ! $LOCK{$key}
263} 316}
264 317
265sub freeze_mainloop { 318sub freeze_mainloop {
266 return unless $TICK_WATCHER->is_active; 319 return unless $TICK_WATCHER->is_active;
267 320
270 }; 323 };
271 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
272 $guard 325 $guard
273} 326}
274 327
328=item cf::get_slot $time[, $priority[, $name]]
329
330Allocate $time seconds of blocking CPU time at priority C<$priority>:
331This call blocks and returns only when you have at least C<$time> seconds
332of cpu time till the next tick. The slot is only valid till the next cede.
333
334The optional C<$name> can be used to identify the job to run. It might be
335used for statistical purposes and should identify the same time-class.
336
337Useful for short background jobs.
338
339=cut
340
341our @SLOT_QUEUE;
342our $SLOT_QUEUE;
343
344$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async {
346 my $signal = new Coro::Signal;
347
348 while () {
349 next_job:
350 my $avail = cf::till_tick;
351 if ($avail > 0.01) {
352 for (0 .. $#SLOT_QUEUE) {
353 if ($SLOT_QUEUE[$_][0] < $avail) {
354 my $job = splice @SLOT_QUEUE, $_, 1, ();
355 $job->[2]->send;
356 Coro::cede;
357 goto next_job;
358 }
359 }
360 }
361
362 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait;
366 } else {
367 Coro::schedule;
368 }
369 }
370};
371
372sub get_slot($;$$) {
373 my ($time, $pri, $name) = @_;
374
375 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal;
377
378 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
379 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
380 $SLOT_QUEUE->ready;
381 $sig->wait;
382}
383
275=item cf::async { BLOCK } 384=item cf::async { BLOCK }
276 385
277Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
278C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 387C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
279thing you are allowed to do is call C<prio> on it. 388thing you are allowed to do is call C<prio> on it.
282 391
283BEGIN { *async = \&Coro::async_pool } 392BEGIN { *async = \&Coro::async_pool }
284 393
285=item cf::sync_job { BLOCK } 394=item cf::sync_job { BLOCK }
286 395
287The design of crossfire+ requires that the main coro ($Coro::main) is 396The design of Crossfire TRT requires that the main coroutine ($Coro::main)
288always able to handle events or runnable, as crossfire+ is only partly 397is always able to handle events or runnable, as Crossfire TRT is only
289reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 398partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable.
290 400
291If it must be done, put the blocking parts into C<sync_job>. This will run 401If it must be done, put the blocking parts into C<sync_job>. This will run
292the given BLOCK in another coroutine while waiting for the result. The 402the given BLOCK in another coroutine while waiting for the result. The
293server will be frozen during this time, so the block should either finish 403server will be frozen during this time, so the block should either finish
294fast or be very important. 404fast or be very important.
297 407
298sub sync_job(&) { 408sub sync_job(&) {
299 my ($job) = @_; 409 my ($job) = @_;
300 410
301 if ($Coro::current == $Coro::main) { 411 if ($Coro::current == $Coro::main) {
412 my $time = Event::time;
413
302 # this is the main coro, too bad, we have to block 414 # this is the main coro, too bad, we have to block
303 # till the operation succeeds, freezing the server :/ 415 # till the operation succeeds, freezing the server :/
304 416
305 # TODO: use suspend/resume instead 417 # TODO: use suspend/resume instead
306 # (but this is cancel-safe) 418 # (but this is cancel-safe)
317 429
318 while ($busy) { 430 while ($busy) {
319 Coro::cede or Event::one_event; 431 Coro::cede or Event::one_event;
320 } 432 }
321 433
434 $time = Event::time - $time;
435
436 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438
439 $tick_start += $time; # do not account sync jobs to server load
440
322 wantarray ? @res : $res[0] 441 wantarray ? @res : $res[0]
323 } else { 442 } else {
324 # we are in another coroutine, how wonderful, everything just works 443 # we are in another coroutine, how wonderful, everything just works
325 444
326 $job->() 445 $job->()
345 $EXT_CORO{$coro+0} = $coro; 464 $EXT_CORO{$coro+0} = $coro;
346 465
347 $coro 466 $coro
348} 467}
349 468
350sub write_runtime { 469=item fork_call { }, $args
351 my $guard = cf::lock_acquire "write_runtime";
352 470
353 my $runtime = cf::localdir . "/runtime"; 471Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling.
354 475
355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 476=cut
356 or return;
357 477
358 my $value = $cf::RUNTIME + 90 + 10; 478sub fork_call(&@) {
359 # 10 is the runtime save interval, for a monotonic clock 479 my ($cb, @args) = @_;
360 # 60 allows for the watchdog to kill the server.
361 480
362 (aio_write $fh, 0, (length $value), $value, 0) <= 0 481 # we seemingly have to make a local copy of the whole thing,
363 and return; 482 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious)
364 484
365 # always fsync - this file is important 485 my @res = Coro::Util::fork_eval {
366 aio_fsync $fh 486 reset_signals;
367 and return; 487 &$cb
488 }, @args;
368 489
369 close $fh 490 wantarray ? @res : $res[-1]
370 or return; 491}
371 492
372 aio_rename "$runtime~", $runtime 493=item $value = cf::db_get $family => $key
373 and return;
374 494
495Returns a single value from the environment database.
496
497=item cf::db_put $family => $key => $value
498
499Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501
502=cut
503
504our $DB;
505
506sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job {
511 eval {
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
375 1 520 }
521}
522
523sub db_get($$) {
524 my $key = "$_[0]/$_[1]";
525
526 cf::sync_job {
527 BDB::db_get $DB, undef, $key, my $data;
528
529 $! ? ()
530 : $data
531 }
532}
533
534sub db_put($$$) {
535 BDB::dbreq_pri 4;
536 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
537}
538
539=item cf::cache $id => [$paths...], $processversion => $process
540
541Generic caching function that returns the value of the resource $id,
542caching and regenerating as required.
543
544This function can block.
545
546=cut
547
548sub cache {
549 my ($id, $src, $processversion, $process) = @_;
550
551 my $meta =
552 join "\x00",
553 $processversion,
554 map {
555 aio_stat $_
556 and Carp::croak "$_: $!";
557
558 ($_, (stat _)[7,9])
559 } @$src;
560
561 my $dbmeta = db_get cache => "$id/meta";
562 if ($dbmeta ne $meta) {
563 # changed, we may need to process
564
565 my @data;
566 my $md5;
567
568 for (0 .. $#$src) {
569 0 <= aio_load $src->[$_], $data[$_]
570 or Carp::croak "$src->[$_]: $!";
571 }
572
573 # if processing is expensive, check
574 # checksum first
575 if (1) {
576 $md5 =
577 join "\x00",
578 $processversion,
579 map {
580 Coro::cede;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src;
583
584
585 my $dbmd5 = db_get cache => "$id/md5";
586 if ($dbmd5 eq $md5) {
587 db_put cache => "$id/meta", $meta;
588
589 return db_get cache => "$id/data";
590 }
591 }
592
593 my $t1 = Time::HiRes::time;
594 my $data = $process->(\@data);
595 my $t2 = Time::HiRes::time;
596
597 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
598
599 db_put cache => "$id/data", $data;
600 db_put cache => "$id/md5" , $md5;
601 db_put cache => "$id/meta", $meta;
602
603 return $data;
604 }
605
606 db_get cache => "$id/data"
607}
608
609=item cf::datalog type => key => value, ...
610
611Log a datalog packet of the given type with the given key-value pairs.
612
613=cut
614
615sub datalog($@) {
616 my ($type, %kv) = @_;
617 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
376} 618}
377 619
378=back 620=back
379 621
380=cut 622=cut
387attach callbacks/event handlers (a collection of which is called an "attachment") 629attach callbacks/event handlers (a collection of which is called an "attachment")
388to it. All such attachable objects support the following methods. 630to it. All such attachable objects support the following methods.
389 631
390In the following description, CLASS can be any of C<global>, C<object> 632In the following description, CLASS can be any of C<global>, C<object>
391C<player>, C<client> or C<map> (i.e. the attachable objects in 633C<player>, C<client> or C<map> (i.e. the attachable objects in
392crossfire+). 634Crossfire TRT).
393 635
394=over 4 636=over 4
395 637
396=item $attachable->attach ($attachment, key => $value...) 638=item $attachable->attach ($attachment, key => $value...)
397 639
560 $registry = $CB_TYPE[$object_type] ||= []; 802 $registry = $CB_TYPE[$object_type] ||= [];
561 803
562 } elsif ($type eq "subtype") { 804 } elsif ($type eq "subtype") {
563 defined $object_type or Carp::croak "subtype specified without type"; 805 defined $object_type or Carp::croak "subtype specified without type";
564 my $object_subtype = shift @arg; 806 my $object_subtype = shift @arg;
565 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 807 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
566 808
567 } elsif ($type eq "package") { 809 } elsif ($type eq "package") {
568 my $pkg = shift @arg; 810 my $pkg = shift @arg;
569 811
570 while (my ($name, $id) = each %cb_id) { 812 while (my ($name, $id) = each %cb_id) {
599 _attach $registry, $klass, @attach; 841 _attach $registry, $klass, @attach;
600 } 842 }
601 843
602 $obj->{$name} = \%arg; 844 $obj->{$name} = \%arg;
603 } else { 845 } else {
604 warn "object uses attachment '$name' that is not available, postponing.\n"; 846 warn "object uses attachment '$name' which is not available, postponing.\n";
605 } 847 }
606 848
607 $obj->{_attachment}{$name} = undef; 849 $obj->{_attachment}{$name} = undef;
608} 850}
609 851
611 if (ref $_[0]) { 853 if (ref $_[0]) {
612 _object_attach @_; 854 _object_attach @_;
613 } else { 855 } else {
614 _attach shift->_attach_registry, @_; 856 _attach shift->_attach_registry, @_;
615 } 857 }
858 _recalc_want;
616}; 859};
617 860
618# all those should be optimised 861# all those should be optimised
619sub cf::attachable::detach { 862sub cf::attachable::detach {
620 my ($obj, $name) = @_; 863 my ($obj, $name) = @_;
623 delete $obj->{_attachment}{$name}; 866 delete $obj->{_attachment}{$name};
624 reattach ($obj); 867 reattach ($obj);
625 } else { 868 } else {
626 Carp::croak "cannot, currently, detach class attachments"; 869 Carp::croak "cannot, currently, detach class attachments";
627 } 870 }
871 _recalc_want;
628}; 872};
629 873
630sub cf::attachable::attached { 874sub cf::attachable::attached {
631 my ($obj, $name) = @_; 875 my ($obj, $name) = @_;
632 876
647 "; 891 ";
648 die if $@; 892 die if $@;
649} 893}
650 894
651our $override; 895our $override;
652our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 896our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
653 897
654sub override { 898sub override {
655 $override = 1; 899 $override = 1;
656 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
657} 901}
658 902
659sub do_invoke { 903sub do_invoke {
660 my $event = shift; 904 my $event = shift;
661 my $callbacks = shift; 905 my $callbacks = shift;
662 906
663 @invoke_results = (); 907 @INVOKE_RESULTS = ();
664 908
665 local $override; 909 local $override;
666 910
667 for (@$callbacks) { 911 for (@$callbacks) {
668 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
685 929
686Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
687 931
688This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 932This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
689removed in future versions), and there is no public API to access override 933removed in future versions), and there is no public API to access override
690results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
691 935
692=back 936=back
693 937
694=cut 938=cut
695 939
696############################################################################# 940#############################################################################
697# object support 941# object support
942#
943
944sub _can_merge {
945 my ($ob1, $ob2) = @_;
946
947 local $Storable::canonical = 1;
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950
951 $fob1 eq $fob2
952}
698 953
699sub reattach { 954sub reattach {
700 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
701 my ($obj) = @_; 956 my ($obj) = @_;
702 957
805 or return; 1060 or return;
806 $av = eval { (Storable::thaw $av)->{objs} }; 1061 $av = eval { (Storable::thaw $av)->{objs} };
807 } 1062 }
808 1063
809 warn sprintf "loading %s (%d)\n", 1064 warn sprintf "loading %s (%d)\n",
810 $filename, length $data, scalar @{$av || []};#d# 1065 $filename, length $data, scalar @{$av || []};
811 return ($data, $av); 1066 return ($data, $av);
812} 1067}
1068
1069=head2 COMMAND CALLBACKS
1070
1071=over 4
1072
1073=cut
813 1074
814############################################################################# 1075#############################################################################
815# command handling &c 1076# command handling &c
816 1077
817=item cf::register_command $name => \&callback($ob,$args); 1078=item cf::register_command $name => \&callback($ob,$args);
830 push @{ $COMMAND{$name} }, [$caller, $cb]; 1091 push @{ $COMMAND{$name} }, [$caller, $cb];
831} 1092}
832 1093
833=item cf::register_extcmd $name => \&callback($pl,$packet); 1094=item cf::register_extcmd $name => \&callback($pl,$packet);
834 1095
835Register a callbackf ro execution when the client sends an extcmd packet. 1096Register a callback for execution when the client sends an (synchronous)
1097extcmd packet. Ext commands will be processed in the order they are
1098received by the server, like other user commands. The first argument is
1099the logged-in player. Ext commands can only be processed after a player
1100has logged in successfully.
836 1101
837If the callback returns something, it is sent back as if reply was being 1102If the callback returns something, it is sent back as if reply was being
838called. 1103called.
839 1104
1105=item cf::register_exticmd $name => \&callback($ns,$packet);
1106
1107Register a callback for execution when the client sends an (asynchronous)
1108exticmd packet. Exti commands are processed by the server as soon as they
1109are received, i.e. out of order w.r.t. other commands. The first argument
1110is a client socket. Exti commands can be received anytime, even before
1111log-in.
1112
1113If the callback returns something, it is sent back as if reply was being
1114called.
1115
840=cut 1116=cut
841 1117
842sub register_extcmd { 1118sub register_extcmd {
843 my ($name, $cb) = @_; 1119 my ($name, $cb) = @_;
844 1120
845 $EXTCMD{$name} = $cb; 1121 $EXTCMD{$name} = $cb;
1122}
1123
1124sub register_exticmd {
1125 my ($name, $cb) = @_;
1126
1127 $EXTICMD{$name} = $cb;
846} 1128}
847 1129
848cf::player->attach ( 1130cf::player->attach (
849 on_command => sub { 1131 on_command => sub {
850 my ($pl, $name, $params) = @_; 1132 my ($pl, $name, $params) = @_;
859 cf::override; 1141 cf::override;
860 }, 1142 },
861 on_extcmd => sub { 1143 on_extcmd => sub {
862 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
863 1145
864 my $msg = eval { from_json $buf }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
865 1147
866 if (ref $msg) { 1148 if (ref $msg) {
1149 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg
1151 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153
1154 my @reply;
1155
867 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1156 if (my $cb = $EXTCMD{$type}) {
868 if (my %reply = $cb->($pl, $msg)) { 1157 @reply = $cb->($pl, @payload);
869 $pl->ext_reply ($msg->{msgid}, %reply);
870 }
871 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
872 } else { 1163 } else {
873 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
874 } 1165 }
875 1166
876 cf::override; 1167 cf::override;
877 }, 1168 },
878); 1169);
879 1170
880sub load_extension {
881 my ($path) = @_;
882
883 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
884 my $base = $1;
885 my $pkg = $1;
886 $pkg =~ s/[^[:word:]]/_/g;
887 $pkg = "ext::$pkg";
888
889 warn "... loading '$path' into '$pkg'\n";
890
891 open my $fh, "<:utf8", $path
892 or die "$path: $!";
893
894 my $source =
895 "package $pkg; use strict; use utf8;\n"
896 . "#line 1 \"$path\"\n{\n"
897 . (do { local $/; <$fh> })
898 . "\n};\n1";
899
900 unless (eval $source) {
901 my $msg = $@ ? "$path: $@\n"
902 : "extension disabled.\n";
903 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
904 warn $@;
905 warn "mandatory extension failed to load, exiting.\n";
906 exit 1;
907 }
908 die $@;
909 }
910
911 push @EXTS, $pkg;
912}
913
914sub load_extensions { 1171sub load_extensions {
1172 cf::sync_job {
1173 my %todo;
1174
915 for my $ext (<$LIBDIR/*.ext>) { 1175 for my $path (<$LIBDIR/*.ext>) {
916 next unless -r $ext; 1176 next unless -r $path;
917 eval { 1177
918 load_extension $ext; 1178 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1179 my $base = $1;
1180 my $pkg = $1;
1181 $pkg =~ s/[^[:word:]]/_/g;
1182 $pkg = "ext::$pkg";
1183
1184 open my $fh, "<:utf8", $path
1185 or die "$path: $!";
1186
1187 my $source = do { local $/; <$fh> };
1188
1189 my %ext = (
1190 path => $path,
1191 base => $base,
1192 pkg => $pkg,
1193 );
1194
1195 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1196 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1197
1198 $ext{source} =
1199 "package $pkg; use strict; use utf8;\n"
1200 . "#line 1 \"$path\"\n{\n"
1201 . $source
1202 . "\n};\n1";
1203
1204 $todo{$base} = \%ext;
1205 }
1206
1207 my %done;
1208 while (%todo) {
1209 my $progress;
1210
1211 while (my ($k, $v) = each %todo) {
1212 for (split /,\s*/, $v->{meta}{depends}) {
1213 goto skip
1214 unless exists $done{$_};
1215 }
1216
1217 warn "... loading '$k' into '$v->{pkg}'\n";
1218
1219 unless (eval $v->{source}) {
1220 my $msg = $@ ? "$v->{path}: $@\n"
1221 : "$v->{base}: extension inactive.\n";
1222
1223 if (exists $v->{meta}{mandatory}) {
1224 warn $msg;
1225 warn "mandatory extension failed to load, exiting.\n";
1226 exit 1;
1227 }
1228
1229 warn $msg;
1230 }
1231
1232 $done{$k} = delete $todo{$k};
1233 push @EXTS, $v->{pkg};
1234 $progress = 1;
919 1 1235 }
920 } or warn "$ext not loaded: $@"; 1236
1237 skip:
1238 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1239 unless $progress;
1240 }
921 } 1241 };
922} 1242}
923 1243
924############################################################################# 1244#############################################################################
925 1245
1246=back
1247
926=head2 CORE EXTENSIONS 1248=head2 CORE EXTENSIONS
927 1249
928Functions and methods that extend core crossfire objects. 1250Functions and methods that extend core crossfire objects.
929 1251
930=cut 1252=cut
942Returns the given player object, loading it if necessary (might block). 1264Returns the given player object, loading it if necessary (might block).
943 1265
944=cut 1266=cut
945 1267
946sub playerdir($) { 1268sub playerdir($) {
947 cf::localdir 1269 "$PLAYERDIR/"
948 . "/"
949 . cf::playerdir
950 . "/"
951 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1270 . (ref $_[0] ? $_[0]->ob->name : $_[0])
952} 1271}
953 1272
954sub path($) { 1273sub path($) {
955 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1274 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
956 1275
957 (playerdir $login) . "/$login.pl" 1276 (playerdir $login) . "/playerdata"
958} 1277}
959 1278
960sub find_active($) { 1279sub find_active($) {
961 $cf::PLAYER{$_[0]} 1280 $cf::PLAYER{$_[0]}
962 and $cf::PLAYER{$_[0]}->active 1281 and $cf::PLAYER{$_[0]}->active
975 my $login = $_[0]; 1294 my $login = $_[0];
976 1295
977 my $guard = cf::lock_acquire "user_find:$login"; 1296 my $guard = cf::lock_acquire "user_find:$login";
978 1297
979 $cf::PLAYER{$_[0]} || do { 1298 $cf::PLAYER{$_[0]} || do {
1299 # rename old playerfiles to new ones
1300 #TODO: remove when no longer required
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl";
1305
980 my $pl = load_pl path $login 1306 my $pl = load_pl path $login
981 or return; 1307 or return;
982 $cf::PLAYER{$login} = $pl 1308 $cf::PLAYER{$login} = $pl
983 } 1309 }
984 } 1310 }
1010 $self->{deny_save} = 1; 1336 $self->{deny_save} = 1;
1011 1337
1012 $cf::PLAYER{$login} = $self; 1338 $cf::PLAYER{$login} = $self;
1013 1339
1014 $self 1340 $self
1341}
1342
1343=item $player->send_msg ($channel, $msg, $color, [extra...])
1344
1345=cut
1346
1347sub send_msg {
1348 my $ns = shift->ns
1349 or return;
1350 $ns->send_msg (@_);
1015} 1351}
1016 1352
1017=item $pl->quit_character 1353=item $pl->quit_character
1018 1354
1019Nukes the player without looking back. If logged in, the connection will 1355Nukes the player without looking back. If logged in, the connection will
1068while and may block, so not sync_job-capable, ever. 1404while and may block, so not sync_job-capable, ever.
1069 1405
1070=cut 1406=cut
1071 1407
1072sub list_logins { 1408sub list_logins {
1073 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1409 my $dirs = aio_readdir $PLAYERDIR
1074 or return []; 1410 or return [];
1075 1411
1076 my @logins; 1412 my @logins;
1077 1413
1078 for my $login (@$dirs) { 1414 for my $login (@$dirs) {
1113 } 1449 }
1114 1450
1115 \@paths 1451 \@paths
1116} 1452}
1117 1453
1454=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1455
1456Expand crossfire pod fragments into protocol xml.
1457
1458=cut
1459
1460sub expand_cfpod {
1461 ((my $self), (local $_)) = @_;
1462
1463 # escape & and <
1464 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g;
1466
1467 # this is buggy, it needs to properly take care of nested <'s
1468
1469 1 while
1470 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/
1474 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1
1477 }ge
1478 # replace H<hint text>
1479 || s{H<([^\>]*)>}
1480 {
1481 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1482 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1483 "")
1484 [$self->{hintmode}]
1485 }ge;
1486
1487 # create single paragraphs (very hackish)
1488 s/(?<=\S)\n(?=\w)/ /g;
1489
1490 # compress some whitespace
1491 s/\s+\n/\n/g; # ws line-ends
1492 s/\n\n+/\n/g; # double lines
1493 s/^\n+//; # beginning lines
1494 s/\n+$//; # ending lines
1495
1496 $_
1497}
1498
1499sub hintmode {
1500 $_[0]{hintmode} = $_[1] if @_ > 1;
1501 $_[0]{hintmode}
1502}
1503
1118=item $player->ext_reply ($msgid, $msgtype, %msg) 1504=item $player->ext_reply ($msgid, @msg)
1119 1505
1120Sends an ext reply to the player. 1506Sends an ext reply to the player.
1121 1507
1122=cut 1508=cut
1123 1509
1124sub ext_reply($$$%) { 1510sub ext_reply($$@) {
1125 my ($self, $id, %msg) = @_; 1511 my ($self, $id, @msg) = @_;
1126 1512
1127 $msg{msgid} = $id; 1513 $self->ns->ext_reply ($id, @msg)
1128
1129 $self->send ("ext " . cf::to_json \%msg);
1130} 1514}
1131 1515
1132package cf; 1516=item $player->ext_msg ($type, @msg)
1517
1518Sends an ext event to the client.
1519
1520=cut
1521
1522sub ext_msg($$@) {
1523 my ($self, $type, @msg) = @_;
1524
1525 $self->ns->ext_msg ($type, @msg);
1526}
1527
1528=head3 cf::region
1529
1530=over 4
1531
1532=cut
1533
1534package cf::region;
1535
1536=item cf::region::find_by_path $path
1537
1538Tries to decuce the likely region for a map knowing only its path.
1539
1540=cut
1541
1542sub find_by_path($) {
1543 my ($path) = @_;
1544
1545 my ($match, $specificity);
1546
1547 for my $region (list) {
1548 if ($region->{match} && $path =~ $region->{match}) {
1549 ($match, $specificity) = ($region, $region->specificity)
1550 if $region->specificity > $specificity;
1551 }
1552 }
1553
1554 $match
1555}
1133 1556
1134=back 1557=back
1135
1136 1558
1137=head3 cf::map 1559=head3 cf::map
1138 1560
1139=over 4 1561=over 4
1140 1562
1195 my ($self, $merge) = @_; 1617 my ($self, $merge) = @_;
1196 1618
1197 # we have to keep some variables in memory intact 1619 # we have to keep some variables in memory intact
1198 local $self->{path}; 1620 local $self->{path};
1199 local $self->{load_path}; 1621 local $self->{load_path};
1200 local $self->{deny_save};
1201 local $self->{deny_reset};
1202 1622
1203 $self->SUPER::thawer_merge ($merge); 1623 $self->SUPER::thawer_merge ($merge);
1204} 1624}
1205 1625
1206sub normalise { 1626sub normalise {
1253 $self->init; # pass $1 etc. 1673 $self->init; # pass $1 etc.
1254 return $self; 1674 return $self;
1255 } 1675 }
1256 } 1676 }
1257 1677
1258 Carp::carp "unable to resolve path '$path' (base '$base')."; 1678 Carp::cluck "unable to resolve path '$path' (base '$base').";
1259 () 1679 ()
1260} 1680}
1261 1681
1262sub init { 1682sub init {
1263 my ($self) = @_; 1683 my ($self) = @_;
1278 1698
1279# the original (read-only) location 1699# the original (read-only) location
1280sub load_path { 1700sub load_path {
1281 my ($self) = @_; 1701 my ($self) = @_;
1282 1702
1283 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1703 "$MAPDIR/$self->{path}.map"
1284} 1704}
1285 1705
1286# the temporary/swap location 1706# the temporary/swap location
1287sub save_path { 1707sub save_path {
1288 my ($self) = @_; 1708 my ($self) = @_;
1289 1709
1290 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1710 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1291 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1711 "$TMPDIR/$path.map"
1292} 1712}
1293 1713
1294# the unique path, undef == no special unique path 1714# the unique path, undef == no special unique path
1295sub uniq_path { 1715sub uniq_path {
1296 my ($self) = @_; 1716 my ($self) = @_;
1297 1717
1298 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1718 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1299 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1719 "$UNIQUEDIR/$path"
1300} 1720}
1301 1721
1302# and all this just because we cannot iterate over 1722# and all this just because we cannot iterate over
1303# all maps in C++... 1723# all maps in C++...
1304sub change_all_map_light { 1724sub change_all_map_light {
1305 my ($change) = @_; 1725 my ($change) = @_;
1306 1726
1307 $_->change_map_light ($change) 1727 $_->change_map_light ($change)
1308 for grep $_->outdoor, values %cf::MAP; 1728 for grep $_->outdoor, values %cf::MAP;
1729}
1730
1731sub decay_objects {
1732 my ($self) = @_;
1733
1734 return if $self->{deny_reset};
1735
1736 $self->do_decay_objects;
1309} 1737}
1310 1738
1311sub unlink_save { 1739sub unlink_save {
1312 my ($self) = @_; 1740 my ($self) = @_;
1313 1741
1371 $self->load_header_orig 1799 $self->load_header_orig
1372 or return; 1800 or return;
1373 $self->prepare_orig; 1801 $self->prepare_orig;
1374 } 1802 }
1375 1803
1804 $self->{deny_reset} = 1
1805 if $self->no_reset;
1806
1807 $self->default_region (cf::region::find_by_path $self->{path})
1808 unless $self->default_region;
1809
1376 1 1810 1
1377} 1811}
1378 1812
1379sub find; 1813sub find;
1380sub find { 1814sub find {
1392 $map->{last_save} = $cf::RUNTIME; 1826 $map->{last_save} = $cf::RUNTIME;
1393 1827
1394 $map->load_header 1828 $map->load_header
1395 or return; 1829 or return;
1396 1830
1397 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1398 # doing this can freeze the server in a sync job, obviously 1832 # doing this can freeze the server in a sync job, obviously
1399 #$cf::WAIT_FOR_TICK->wait; 1833 #$cf::WAIT_FOR_TICK->wait;
1400 $map->reset; 1834 $map->reset;
1401 undef $guard; 1835 undef $guard;
1402 return find $path; 1836 return find $path;
1413 my ($self) = @_; 1847 my ($self) = @_;
1414 1848
1415 local $self->{deny_reset} = 1; # loading can take a long time 1849 local $self->{deny_reset} = 1; # loading can take a long time
1416 1850
1417 my $path = $self->{path}; 1851 my $path = $self->{path};
1852
1853 {
1418 my $guard = cf::lock_acquire "map_load:$path"; 1854 my $guard = cf::lock_acquire "map_load:$path";
1419 1855
1420 return if $self->in_memory != cf::MAP_SWAPPED; 1856 return if $self->in_memory != cf::MAP_SWAPPED;
1421 1857
1422 $self->in_memory (cf::MAP_LOADING); 1858 $self->in_memory (cf::MAP_LOADING);
1423 1859
1424 $self->alloc; 1860 $self->alloc;
1425 1861
1426 $self->pre_load; 1862 $self->pre_load;
1427
1428 $self->_load_objects ($self->{load_path}, 1)
1429 or return;
1430
1431 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1432 if delete $self->{load_original};
1433
1434 if (my $uniq = $self->uniq_path) {
1435 utf8::encode $uniq;
1436 if (aio_open $uniq, O_RDONLY, 0) {
1437 $self->clear_unique_items;
1438 $self->_load_objects ($uniq, 0);
1439 }
1440 }
1441
1442 Coro::cede;
1443
1444 # now do the right thing for maps
1445 $self->link_multipart_objects;
1446
1447 unless ($self->{deny_activate}) {
1448 $self->decay_objects;
1449 $self->fix_auto_apply;
1450 $self->update_buttons;
1451 Coro::cede; 1863 Coro::cede;
1452 $self->set_darkness_map; 1864
1865 $self->_load_objects ($self->{load_path}, 1)
1866 or return;
1867
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1869 if delete $self->{load_original};
1870
1871 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) {
1874 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0);
1876 }
1877 }
1878
1879 Coro::cede;
1880 # now do the right thing for maps
1881 $self->link_multipart_objects;
1453 $self->difficulty ($self->estimate_difficulty) 1882 $self->difficulty ($self->estimate_difficulty)
1454 unless $self->difficulty; 1883 unless $self->difficulty;
1455 Coro::cede; 1884 Coro::cede;
1885
1886 unless ($self->{deny_activate}) {
1887 $self->decay_objects;
1888 $self->fix_auto_apply;
1889 $self->update_buttons;
1890 Coro::cede;
1891 $self->set_darkness_map;
1892 Coro::cede;
1456 $self->activate; 1893 $self->activate;
1894 }
1895
1896 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME);
1898
1899 $self->in_memory (cf::MAP_IN_MEMORY);
1457 } 1900 }
1458 1901
1459 $self->post_load; 1902 $self->post_load;
1460
1461 $self->in_memory (cf::MAP_IN_MEMORY);
1462} 1903}
1463 1904
1464sub customise_for { 1905sub customise_for {
1465 my ($self, $ob) = @_; 1906 my ($self, $ob) = @_;
1466 1907
1467 return find "~" . $ob->name . "/" . $self->{path} 1908 return find "~" . $ob->name . "/" . $self->{path}
1468 if $self->per_player; 1909 if $self->per_player;
1469 1910
1911# return find "?party/" . $ob->name . "/" . $self->{path}
1912# if $self->per_party;
1913
1470 $self 1914 $self
1471} 1915}
1472 1916
1473# find and load all maps in the 3x3 area around a map 1917# find and load all maps in the 3x3 area around a map
1474sub load_diag { 1918sub load_neighbours {
1475 my ($map) = @_; 1919 my ($map) = @_;
1476 1920
1477 my @diag; # diagonal neighbours 1921 my @neigh; # diagonal neighbours
1478 1922
1479 for (0 .. 3) { 1923 for (0 .. 3) {
1480 my $neigh = $map->tile_path ($_) 1924 my $neigh = $map->tile_path ($_)
1481 or next; 1925 or next;
1482 $neigh = find $neigh, $map 1926 $neigh = find $neigh, $map
1483 or next; 1927 or next;
1484 $neigh->load; 1928 $neigh->load;
1485 1929
1930 push @neigh,
1486 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1931 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1487 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1932 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1488 } 1933 }
1489 1934
1490 for (@diag) { 1935 for (grep defined $_->[0], @neigh) {
1936 my ($path, $origin) = @$_;
1491 my $neigh = find @$_ 1937 my $neigh = find $path, $origin
1492 or next; 1938 or next;
1493 $neigh->load; 1939 $neigh->load;
1494 } 1940 }
1495} 1941}
1496 1942
1501} 1947}
1502 1948
1503sub do_load_sync { 1949sub do_load_sync {
1504 my ($map) = @_; 1950 my ($map) = @_;
1505 1951
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current == $Coro::main;
1954
1506 cf::sync_job { $map->load }; 1955 cf::sync_job { $map->load };
1507} 1956}
1508 1957
1509our %MAP_PREFETCH; 1958our %MAP_PREFETCH;
1510our $MAP_PREFETCHER = undef; 1959our $MAP_PREFETCHER = undef;
1511 1960
1512sub find_async { 1961sub find_async {
1513 my ($path, $origin) = @_; 1962 my ($path, $origin, $load) = @_;
1514 1963
1515 $path = normalise $path, $origin && $origin->{path}; 1964 $path = normalise $path, $origin && $origin->{path};
1516 1965
1517 if (my $map = $cf::MAP{$path}) { 1966 if (my $map = $cf::MAP{$path}) {
1518 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1967 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1519 } 1968 }
1520 1969
1521 undef $MAP_PREFETCH{$path}; 1970 $MAP_PREFETCH{$path} |= $load;
1971
1522 $MAP_PREFETCHER ||= cf::async { 1972 $MAP_PREFETCHER ||= cf::async {
1523 while (%MAP_PREFETCH) { 1973 while (%MAP_PREFETCH) {
1524 for my $path (keys %MAP_PREFETCH) { 1974 while (my ($k, $v) = each %MAP_PREFETCH) {
1525 my $map = find $path 1975 if (my $map = find $k) {
1526 or next;
1527 $map->load; 1976 $map->load if $v;
1977 }
1528 1978
1529 delete $MAP_PREFETCH{$path}; 1979 delete $MAP_PREFETCH{$k};
1530 } 1980 }
1531 } 1981 }
1532 undef $MAP_PREFETCHER; 1982 undef $MAP_PREFETCHER;
1533 }; 1983 };
1534 $MAP_PREFETCHER->prio (6); 1984 $MAP_PREFETCHER->prio (6);
1584 2034
1585sub reset_at { 2035sub reset_at {
1586 my ($self) = @_; 2036 my ($self) = @_;
1587 2037
1588 # TODO: safety, remove and allow resettable per-player maps 2038 # TODO: safety, remove and allow resettable per-player maps
1589 return 1e99 if $self->isa ("ext::map_per_player");#d#
1590 return 1e99 if $self->{deny_reset}; 2039 return 1e99 if $self->{deny_reset};
1591 2040
1592 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2041 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1593 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2042 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1594 2043
1605 my ($self) = @_; 2054 my ($self) = @_;
1606 2055
1607 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2056 my $lock = cf::lock_acquire "map_data:$self->{path}";
1608 2057
1609 return if $self->players; 2058 return if $self->players;
1610 return if $self->isa ("ext::map_per_player");#d#
1611 2059
1612 warn "resetting map ", $self->path;#d# 2060 warn "resetting map ", $self->path;
1613 2061
1614 $self->in_memory (cf::MAP_SWAPPED); 2062 $self->in_memory (cf::MAP_SWAPPED);
1615 2063
1616 # need to save uniques path 2064 # need to save uniques path
1617 unless ($self->{deny_save}) { 2065 unless ($self->{deny_save}) {
1649 $cf::MAP{$self->path} = $self; 2097 $cf::MAP{$self->path} = $self;
1650 2098
1651 $self->reset; # polite request, might not happen 2099 $self->reset; # polite request, might not happen
1652} 2100}
1653 2101
2102=item $maps = cf::map::tmp_maps
2103
2104Returns an arrayref with all map paths of currently instantiated and saved
2105maps. May block.
2106
2107=cut
2108
2109sub tmp_maps() {
2110 [
2111 map {
2112 utf8::decode $_;
2113 /\.map$/
2114 ? normalise $_
2115 : ()
2116 } @{ aio_readdir $TMPDIR or [] }
2117 ]
2118}
2119
2120=item $maps = cf::map::random_maps
2121
2122Returns an arrayref with all map paths of currently instantiated and saved
2123random maps. May block.
2124
2125=cut
2126
2127sub random_maps() {
2128 [
2129 map {
2130 utf8::decode $_;
2131 /\.map$/
2132 ? normalise "?random/$_"
2133 : ()
2134 } @{ aio_readdir $RANDOMDIR or [] }
2135 ]
2136}
2137
1654=item cf::map::unique_maps 2138=item cf::map::unique_maps
1655 2139
1656Returns an arrayref of paths of all shared maps that have 2140Returns an arrayref of paths of all shared maps that have
1657instantiated unique items. May block. 2141instantiated unique items. May block.
1658 2142
1659=cut 2143=cut
1660 2144
1661sub unique_maps() { 2145sub unique_maps() {
1662 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2146 [
1663 or return; 2147 map {
1664
1665 my @paths;
1666
1667 for (@$files) {
1668 utf8::decode $_; 2148 utf8::decode $_;
1669 next if /\.pst$/; 2149 /\.map$/
1670 next unless /^$PATH_SEP/o; 2150 ? normalise $_
1671 2151 : ()
1672 push @paths, cf::map::normalise $_; 2152 } @{ aio_readdir $UNIQUEDIR or [] }
1673 } 2153 ]
1674
1675 \@paths
1676} 2154}
1677 2155
1678package cf; 2156package cf;
1679 2157
1680=back 2158=back
1726 2204
1727 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2205 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1728 2206
1729 if ($self->{record_replies}) { 2207 if ($self->{record_replies}) {
1730 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2208 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2209
1731 } else { 2210 } else {
2211 my $pl = $self->contr;
2212
2213 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2214 my $dialog = $pl->{npc_dialog};
2215 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2216
2217 } else {
1732 $msg = $npc->name . " says: $msg" if $npc; 2218 $msg = $npc->name . " says: $msg" if $npc;
1733 $self->message ($msg, $flags); 2219 $self->message ($msg, $flags);
2220 }
1734 } 2221 }
2222}
2223
2224=item $object->send_msg ($channel, $msg, $color, [extra...])
2225
2226=cut
2227
2228sub cf::object::send_msg {
2229 my $pl = shift->contr
2230 or return;
2231 $pl->send_msg (@_);
1735} 2232}
1736 2233
1737=item $player_object->may ("access") 2234=item $player_object->may ("access")
1738 2235
1739Returns wether the given player is authorized to access resource "access" 2236Returns wether the given player is authorized to access resource "access"
1786 $self->deactivate_recursive; 2283 $self->deactivate_recursive;
1787 2284
1788 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2285 return if UNIVERSAL::isa $self->map, "ext::map_link";
1789 2286
1790 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2287 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1791 if $self->map; 2288 if $self->map && $self->map->{path} ne "{link}";
1792 2289
1793 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2290 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1794} 2291}
1795 2292
1796sub cf::object::player::leave_link { 2293sub cf::object::player::leave_link {
1797 my ($self, $map, $x, $y) = @_; 2294 my ($self, $map, $x, $y) = @_;
2295
2296 return unless $self->contr->active;
1798 2297
1799 my $link_pos = delete $self->{_link_pos}; 2298 my $link_pos = delete $self->{_link_pos};
1800 2299
1801 unless ($map) { 2300 unless ($map) {
1802 # restore original map position 2301 # restore original map position
1816 # use -1 or undef as default coordinates, not 0, 0 2315 # use -1 or undef as default coordinates, not 0, 0
1817 ($x, $y) = ($map->enter_x, $map->enter_y) 2316 ($x, $y) = ($map->enter_x, $map->enter_y)
1818 if $x <=0 && $y <= 0; 2317 if $x <=0 && $y <= 0;
1819 2318
1820 $map->load; 2319 $map->load;
1821 $map->load_diag; 2320 $map->load_neighbours;
1822 2321
1823 return unless $self->contr->active; 2322 return unless $self->contr->active;
1824 $self->activate_recursive; 2323 $self->activate_recursive;
1825 2324
1826 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2325 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1827 $self->enter_map ($map, $x, $y); 2326 $self->enter_map ($map, $x, $y);
1828} 2327}
1829 2328
1830cf::player->attach ( 2329=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1831 on_logout => sub {
1832 my ($pl) = @_;
1833 2330
1834 # abort map switching before logout 2331Moves the player to the given map-path and coordinates by first freezing
1835 if ($pl->ob->{_link_pos}) { 2332her, loading and preparing them map, calling the provided $check callback
1836 cf::sync_job { 2333that has to return the map if sucecssful, and then unfreezes the player on
1837 $pl->ob->leave_link 2334the new (success) or old (failed) map position. In either case, $done will
1838 }; 2335be called at the end of this process.
1839 }
1840 },
1841 on_login => sub {
1842 my ($pl) = @_;
1843 2336
1844 # try to abort aborted map switching on player login :)
1845 # should happen only on crashes
1846 if ($pl->ob->{_link_pos}) {
1847 $pl->ob->enter_link;
1848 (async {
1849 $pl->ob->reply (undef,
1850 "There was an internal problem at your last logout, "
1851 . "the server will try to bring you to your intended destination in a second.",
1852 cf::NDI_RED);
1853 # we need this sleep as the login has a concurrent enter_exit running
1854 # and this sleep increases chances of the player not ending up in scorn
1855 Coro::Timer::sleep 1;
1856 $pl->ob->leave_link;
1857 })->prio (2);
1858 }
1859 },
1860);
1861
1862=item $player_object->goto ($path, $x, $y)
1863
1864=cut 2337=cut
2338
2339our $GOTOGEN;
1865 2340
1866sub cf::object::player::goto { 2341sub cf::object::player::goto {
1867 my ($self, $path, $x, $y) = @_; 2342 my ($self, $path, $x, $y, $check, $done) = @_;
2343
2344 # do generation counting so two concurrent goto's will be executed in-order
2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1868 2346
1869 $self->enter_link; 2347 $self->enter_link;
1870 2348
1871 (async { 2349 (async {
1872 my $map = eval { 2350 my $map = eval {
1873 my $map = cf::map::find $path; 2351 my $map = cf::map::find $path;
2352
2353 if ($map) {
1874 $map = $map->customise_for ($self) if $map; 2354 $map = $map->customise_for ($self);
2355 $map = $check->($map) if $check && $map;
2356 } else {
2357 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2358 }
2359
1875 $map 2360 $map
2361 };
2362
2363 if ($@) {
2364 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2365 LOG llevError | logBacktrace, Carp::longmess $@;
1876 } or 2366 }
1877 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1878 2367
2368 if ($gen == $self->{_goto_generation}) {
2369 delete $self->{_goto_generation};
1879 $self->leave_link ($map, $x, $y); 2370 $self->leave_link ($map, $x, $y);
2371 }
2372
2373 $done->() if $done;
1880 })->prio (1); 2374 })->prio (1);
1881} 2375}
1882 2376
1883=item $player_object->enter_exit ($exit_object) 2377=item $player_object->enter_exit ($exit_object)
1884 2378
1923 2417
1924 $rmp->{random_seed} ||= $exit->random_seed; 2418 $rmp->{random_seed} ||= $exit->random_seed;
1925 2419
1926 my $data = cf::to_json $rmp; 2420 my $data = cf::to_json $rmp;
1927 my $md5 = Digest::MD5::md5_hex $data; 2421 my $md5 = Digest::MD5::md5_hex $data;
1928 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2422 my $meta = "$RANDOMDIR/$md5.meta";
1929 2423
1930 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2424 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1931 aio_write $fh, 0, (length $data), $data, 0; 2425 aio_write $fh, 0, (length $data), $data, 0;
1932 undef $fh; 2426 undef $fh;
1933 aio_rename "$meta~", $meta; 2427 aio_rename "$meta~", $meta;
1942 2436
1943 return unless $self->type == cf::PLAYER; 2437 return unless $self->type == cf::PLAYER;
1944 2438
1945 if ($exit->slaying eq "/!") { 2439 if ($exit->slaying eq "/!") {
1946 #TODO: this should de-fi-ni-te-ly not be a sync-job 2440 #TODO: this should de-fi-ni-te-ly not be a sync-job
2441 # the problem is that $exit might not survive long enough
2442 # so it needs to be done right now, right here
1947 cf::sync_job { prepare_random_map $exit }; 2443 cf::sync_job { prepare_random_map $exit };
1948 } 2444 }
1949 2445
1950 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2446 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1951 my $hp = $exit->stats->hp; 2447 my $hp = $exit->stats->hp;
1952 my $sp = $exit->stats->sp; 2448 my $sp = $exit->stats->sp;
1953 2449
1954 $self->enter_link; 2450 $self->enter_link;
2451
2452 # if exit is damned, update players death & WoR home-position
2453 $self->contr->savebed ($slaying, $hp, $sp)
2454 if $exit->flag (FLAG_DAMNED);
1955 2455
1956 (async { 2456 (async {
1957 $self->deactivate_recursive; # just to be sure 2457 $self->deactivate_recursive; # just to be sure
1958 unless (eval { 2458 unless (eval {
1959 $self->goto ($slaying, $hp, $sp); 2459 $self->goto ($slaying, $hp, $sp);
1960 2460
1961 1; 2461 1;
1962 }) { 2462 }) {
1963 $self->message ("Something went wrong deep within the crossfire server. " 2463 $self->message ("Something went wrong deep within the crossfire server. "
1964 . "I'll try to bring you back to the map you were before. " 2464 . "I'll try to bring you back to the map you were before. "
1965 . "Please report this to the dungeon master!", 2465 . "Please report this to the dungeon master!",
1966 cf::NDI_UNIQUE | cf::NDI_RED); 2466 cf::NDI_UNIQUE | cf::NDI_RED);
1967 2467
1968 warn "ERROR in enter_exit: $@"; 2468 warn "ERROR in enter_exit: $@";
1969 $self->leave_link; 2469 $self->leave_link;
1970 } 2470 }
1971 })->prio (1); 2471 })->prio (1);
1987 2487
1988 utf8::encode $text; 2488 utf8::encode $text;
1989 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2489 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1990} 2490}
1991 2491
2492=item $client->send_msg ($channel, $msg, $color, [extra...])
2493
2494Send a drawinfo or msg packet to the client, formatting the msg for the
2495client if neccessary. C<$type> should be a string identifying the type of
2496the message, with C<log> being the default. If C<$color> is negative, suppress
2497the message unless the client supports the msg packet.
2498
2499=cut
2500
2501sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_;
2503
2504 $msg = $self->pl->expand_cfpod ($msg);
2505
2506 $color &= cf::NDI_CLIENT_MASK; # just in case...
2507
2508 if (ref $channel) {
2509 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel);
2513 }
2514
2515 $channel = $channel->{id};
2516 }
2517
2518 return unless @extra || length $msg;
2519
2520 if ($self->can_msg) {
2521 # default colour, mask it out
2522 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2523 if $color & cf::NDI_DEF;
2524
2525 $self->send_packet ("msg " . $self->{json_coder}->encode (
2526 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2527 } else {
2528 if ($color >= 0) {
2529 # replace some tags by gcfclient-compatible ones
2530 for ($msg) {
2531 1 while
2532 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2533 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2534 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2535 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2536 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2537 }
2538
2539 $color &= cf::NDI_COLOR_MASK;
2540
2541 utf8::encode $msg;
2542
2543 if (0 && $msg =~ /\[/) {
2544 # COMMAND/INFO
2545 $self->send_packet ("drawextinfo $color 10 8 $msg")
2546 } else {
2547 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2548 $self->send_packet ("drawinfo $color $msg")
2549 }
2550 }
2551 }
2552}
2553
2554=item $client->ext_msg ($type, @msg)
2555
2556Sends an ext event to the client.
2557
2558=cut
2559
2560sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_;
2562
2563 if ($self->extcmd == 2) {
2564 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2565 } elsif ($self->extcmd == 1) { # TODO: remove
2566 push @msg, msgtype => "event_$type";
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2568 }
2569}
2570
2571=item $client->ext_reply ($msgid, @msg)
2572
2573Sends an ext reply to the client.
2574
2575=cut
2576
2577sub cf::client::ext_reply($$@) {
2578 my ($self, $id, @msg) = @_;
2579
2580 if ($self->extcmd == 2) {
2581 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2582 } elsif ($self->extcmd == 1) {
2583 #TODO: version 1, remove
2584 unshift @msg, msgtype => "reply", msgid => $id;
2585 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2586 }
2587}
1992 2588
1993=item $success = $client->query ($flags, "text", \&cb) 2589=item $success = $client->query ($flags, "text", \&cb)
1994 2590
1995Queues a query to the client, calling the given callback with 2591Queues a query to the client, calling the given callback with
1996the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2592the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1997C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2593C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1998 2594
1999Queries can fail, so check the return code. Or don't, as queries will become 2595Queries can fail, so check the return code. Or don't, as queries will
2000reliable at some point in the future. 2596become reliable at some point in the future.
2001 2597
2002=cut 2598=cut
2003 2599
2004sub cf::client::query { 2600sub cf::client::query {
2005 my ($self, $flags, $text, $cb) = @_; 2601 my ($self, $flags, $text, $cb) = @_;
2013 utf8::encode $text; 2609 utf8::encode $text;
2014 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2610 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2015 2611
2016 $self->send_packet ($self->{query_queue}[0][0]) 2612 $self->send_packet ($self->{query_queue}[0][0])
2017 if @{ $self->{query_queue} } == 1; 2613 if @{ $self->{query_queue} } == 1;
2614
2615 1
2018} 2616}
2019 2617
2020cf::client->attach ( 2618cf::client->attach (
2619 on_connect => sub {
2620 my ($ns) = @_;
2621
2622 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2623 },
2021 on_reply => sub { 2624 on_reply => sub {
2022 my ($ns, $msg) = @_; 2625 my ($ns, $msg) = @_;
2023 2626
2024 # this weird shuffling is so that direct followup queries 2627 # this weird shuffling is so that direct followup queries
2025 # get handled first 2628 # get handled first
2037 } else { 2640 } else {
2038 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2641 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2039 } 2642 }
2040 } 2643 }
2041 }, 2644 },
2645 on_exticmd => sub {
2646 my ($ns, $buf) = @_;
2647
2648 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2649
2650 if (ref $msg) {
2651 my ($type, $reply, @payload) =
2652 "ARRAY" eq ref $msg
2653 ? @$msg
2654 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2655
2656 my @reply;
2657
2658 if (my $cb = $EXTICMD{$type}) {
2659 @reply = $cb->($ns, @payload);
2660 }
2661
2662 $ns->ext_reply ($reply, @reply)
2663 if $reply;
2664
2665 } else {
2666 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2667 }
2668
2669 cf::override;
2670 },
2042); 2671);
2043 2672
2044=item $client->async (\&cb) 2673=item $client->async (\&cb)
2045 2674
2046Create a new coroutine, running the specified callback. The coroutine will 2675Create a new coroutine, running the specified callback. The coroutine will
2087our $safe = new Safe "safe"; 2716our $safe = new Safe "safe";
2088our $safe_hole = new Safe::Hole; 2717our $safe_hole = new Safe::Hole;
2089 2718
2090$SIG{FPE} = 'IGNORE'; 2719$SIG{FPE} = 'IGNORE';
2091 2720
2092$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2721$safe->permit_only (Opcode::opset qw(
2722 :base_core :base_mem :base_orig :base_math
2723 grepstart grepwhile mapstart mapwhile
2724 sort time
2725));
2093 2726
2094# here we export the classes and methods available to script code 2727# here we export the classes and methods available to script code
2095 2728
2096=pod 2729=pod
2097 2730
2098The following functions and methods are available within a safe environment: 2731The following functions and methods are available within a safe environment:
2099 2732
2100 cf::object contr pay_amount pay_player map 2733 cf::object
2734 contr pay_amount pay_player map x y force_find force_add
2735 insert remove name archname title slaying race decrease_ob_nr
2736
2101 cf::object::player player 2737 cf::object::player
2102 cf::player peaceful 2738 player
2103 cf::map trigger 2739
2740 cf::player
2741 peaceful
2742
2743 cf::map
2744 trigger
2104 2745
2105=cut 2746=cut
2106 2747
2107for ( 2748for (
2108 ["cf::object" => qw(contr pay_amount pay_player map)], 2749 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2750 insert remove inv name archname title slaying race
2751 decrease_ob_nr)],
2109 ["cf::object::player" => qw(player)], 2752 ["cf::object::player" => qw(player)],
2110 ["cf::player" => qw(peaceful)], 2753 ["cf::player" => qw(peaceful)],
2111 ["cf::map" => qw(trigger)], 2754 ["cf::map" => qw(trigger)],
2112) { 2755) {
2113 no strict 'refs'; 2756 no strict 'refs';
2184=back 2827=back
2185 2828
2186=cut 2829=cut
2187 2830
2188############################################################################# 2831#############################################################################
2189
2190=head2 EXTENSION DATABASE SUPPORT
2191
2192Crossfire maintains a very simple database for extension use. It can
2193currently store anything that can be serialised using Storable, which
2194excludes objects.
2195
2196The parameter C<$family> should best start with the name of the extension
2197using it, it should be unique.
2198
2199=over 4
2200
2201=item $value = cf::db_get $family => $key
2202
2203Returns a single value from the database.
2204
2205=item cf::db_put $family => $key => $value
2206
2207Stores the given C<$value> in the family.
2208
2209=cut
2210
2211our $DB;
2212
2213sub db_init {
2214 unless ($DB) {
2215 $DB = BDB::db_create $DB_ENV;
2216
2217 cf::sync_job {
2218 eval {
2219 $DB->set_flags (BDB::CHKSUM);
2220
2221 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2222 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2223 cf::cleanup "db_open(db): $!" if $!;
2224 };
2225 cf::cleanup "db_open(db): $@" if $@;
2226 };
2227
2228 my $path = cf::localdir . "/database.pst";
2229 if (stat $path) {
2230 cf::sync_job {
2231 my $pst = Storable::retrieve $path;
2232
2233 cf::db_put (board => data => $pst->{board});
2234 cf::db_put (guildrules => data => $pst->{guildrules});
2235 cf::db_put (rent => balance => $pst->{rent}{balance});
2236 BDB::db_env_txn_checkpoint $DB_ENV;
2237
2238 unlink $path;
2239 };
2240 }
2241 }
2242}
2243
2244sub db_get($$) {
2245 my $key = "$_[0]/$_[1]";
2246
2247 cf::sync_job {
2248 BDB::db_get $DB, undef, $key, my $data;
2249
2250 $! ? ()
2251 : Compress::LZF::sthaw $data
2252 }
2253}
2254
2255sub db_put($$$) {
2256 BDB::dbreq_pri 4;
2257 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2258}
2259
2260#############################################################################
2261# the server's init and main functions 2832# the server's init and main functions
2262 2833
2263sub load_faces { 2834sub load_facedata($) {
2264 my $path = sprintf "%s/faces", cf::datadir; 2835 my ($path) = @_;
2265 2836
2837 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2838
2266 warn "loading faces from $path\n"; 2839 warn "loading facedata from $path\n";
2267 2840
2268 my $faces; 2841 my $facedata;
2269 0 < aio_load $path, $faces 2842 0 < aio_load $path, $facedata
2270 or die "$path: $!"; 2843 or die "$path: $!";
2271 2844
2272 Coro::cede;
2273 $faces = Storable::thaw $faces; 2845 $facedata = Coro::Storable::thaw $facedata;
2274 Coro::cede;
2275 2846
2276 my $meta = delete $faces->{""};
2277 $meta->{version} == 1 2847 $facedata->{version} == 2
2278 or cf::cleanup "$path: version mismatch, cannot proceed."; 2848 or cf::cleanup "$path: version mismatch, cannot proceed.";
2279 2849
2850 # patch in the exptable
2851 $facedata->{resource}{"res/exp_table"} = {
2852 type => FT_RSRC,
2853 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2854 };
2855 cf::cede_to_tick;
2856
2857 {
2858 my $faces = $facedata->{faceinfo};
2859
2280 while (my ($face, $info) = each %$faces) { 2860 while (my ($face, $info) = each %$faces) {
2281 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2861 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2282 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2862 cf::face::set_visibility $idx, $info->{visibility};
2863 cf::face::set_magicmap $idx, $info->{magicmap};
2283 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2864 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2284 Coro::cede; 2865 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2285 }
2286 2866
2867 cf::cede_to_tick;
2868 }
2869
2287 while (my ($face, $info) = each %$faces) { 2870 while (my ($face, $info) = each %$faces) {
2288 next unless $info->{smooth}; 2871 next unless $info->{smooth};
2289 my $idx = cf::face::find $face 2872 my $idx = cf::face::find $face
2290 or next; 2873 or next;
2291 if (my $smooth = cf::face::find $info->{smooth}) { 2874 if (my $smooth = cf::face::find $info->{smooth}) {
2292 cf::face::set_smooth $idx, $smooth; 2875 cf::face::set_smooth $idx, $smooth;
2876 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2293 } else { 2877 } else {
2294 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2878 warn "smooth face '$info->{smooth}' not found for face '$face'";
2295 } 2879 }
2296 Coro::cede; 2880
2881 cf::cede_to_tick;
2882 }
2883 }
2884
2885 {
2886 my $anims = $facedata->{animinfo};
2887
2888 while (my ($anim, $info) = each %$anims) {
2889 cf::anim::set $anim, $info->{frames}, $info->{facings};
2890 cf::cede_to_tick;
2891 }
2892
2893 cf::anim::invalidate_all; # d'oh
2894 }
2895
2896 {
2897 # TODO: for gcfclient pleasure, we should give resources
2898 # that gcfclient doesn't grok a >10000 face index.
2899 my $res = $facedata->{resource};
2900
2901 my $soundconf = delete $res->{"res/sound.conf"};
2902
2903 while (my ($name, $info) = each %$res) {
2904 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2905 my $data;
2906
2907 if ($info->{type} & 1) {
2908 # prepend meta info
2909
2910 my $meta = $enc->encode ({
2911 name => $name,
2912 %{ $info->{meta} || {} },
2913 });
2914
2915 $data = pack "(w/a*)*", $meta, $info->{data};
2916 } else {
2917 $data = $info->{data};
2918 }
2919
2920 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2921 cf::face::set_type $idx, $info->{type};
2922
2923 cf::cede_to_tick;
2924 }
2925
2926 if ($soundconf) {
2927 $soundconf = $enc->decode (delete $soundconf->{data});
2928
2929 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2930 my $sound = $soundconf->{compat}[$_]
2931 or next;
2932
2933 my $face = cf::face::find "sound/$sound->[1]";
2934 cf::sound::set $sound->[0] => $face;
2935 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2936 }
2937
2938 while (my ($k, $v) = each %{$soundconf->{event}}) {
2939 my $face = cf::face::find "sound/$v";
2940 cf::sound::set $k => $face;
2941 }
2942 }
2297 } 2943 }
2298 2944
2299 1 2945 1
2300} 2946}
2301 2947
2948register_exticmd fx_want => sub {
2949 my ($ns, $want) = @_;
2950
2951 while (my ($k, $v) = each %$want) {
2952 $ns->fx_want ($k, $v);
2953 }
2954};
2955
2956sub reload_regions {
2957 load_resource_file "$MAPDIR/regions"
2958 or die "unable to load regions file\n";
2959
2960 for (cf::region::list) {
2961 $_->{match} = qr/$_->{match}/
2962 if exists $_->{match};
2963 }
2964}
2965
2966sub reload_facedata {
2967 load_facedata "$DATADIR/facedata"
2968 or die "unable to load facedata\n";
2969}
2970
2971sub reload_archetypes {
2972 load_resource_file "$DATADIR/archetypes"
2973 or die "unable to load archetypes\n";
2974 #d# NEED to laod twice to resolve forward references
2975 # this really needs to be done in an extra post-pass
2976 # (which needs to be synchronous, so solve it differently)
2977 load_resource_file "$DATADIR/archetypes"
2978 or die "unable to load archetypes\n";
2979}
2980
2981sub reload_treasures {
2982 load_resource_file "$DATADIR/treasures"
2983 or die "unable to load treasurelists\n";
2984}
2985
2302sub reload_resources { 2986sub reload_resources {
2303 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2987 warn "reloading resource files...\n";
2304 or die "unable to load regions file\n";#d# 2988
2989 reload_regions;
2305 load_faces 2990 reload_facedata;
2306 or die "unable to load faces\n";#d# 2991 #reload_archetypes;#d#
2992 reload_archetypes;
2993 reload_treasures;
2994
2995 warn "finished reloading resource files\n";
2307} 2996}
2308 2997
2309sub init { 2998sub init {
2310 reload_resources; 2999 reload_resources;
2311} 3000}
2312 3001
2313sub cfg_load { 3002sub cfg_load {
2314 open my $fh, "<:utf8", cf::confdir . "/config" 3003 open my $fh, "<:utf8", "$CONFDIR/config"
2315 or return; 3004 or return;
2316 3005
2317 local $/; 3006 local $/;
2318 *CFG = YAML::Syck::Load <$fh>; 3007 *CFG = YAML::Syck::Load <$fh>;
2319 3008
2364 }, 3053 },
2365 ); 3054 );
2366 } 3055 }
2367} 3056}
2368 3057
3058sub write_runtime {
3059 my $runtime = "$LOCALDIR/runtime";
3060
3061 # first touch the runtime file to show we are still running:
3062 # the fsync below can take a very very long time.
3063
3064 IO::AIO::aio_utime $runtime, undef, undef;
3065
3066 my $guard = cf::lock_acquire "write_runtime";
3067
3068 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3069 or return;
3070
3071 my $value = $cf::RUNTIME + 90 + 10;
3072 # 10 is the runtime save interval, for a monotonic clock
3073 # 60 allows for the watchdog to kill the server.
3074
3075 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3076 and return;
3077
3078 # always fsync - this file is important
3079 aio_fsync $fh
3080 and return;
3081
3082 # touch it again to show we are up-to-date
3083 aio_utime $fh, undef, undef;
3084
3085 close $fh
3086 or return;
3087
3088 aio_rename "$runtime~", $runtime
3089 and return;
3090
3091 warn "runtime file written.\n";
3092
3093 1
3094}
3095
2369sub emergency_save() { 3096sub emergency_save() {
2370 my $freeze_guard = cf::freeze_mainloop; 3097 my $freeze_guard = cf::freeze_mainloop;
2371 3098
2372 warn "enter emergency perl save\n"; 3099 warn "enter emergency perl save\n";
2373 3100
2404 3131
2405 warn Carp::longmess "post_cleanup backtrace" 3132 warn Carp::longmess "post_cleanup backtrace"
2406 if $make_core; 3133 if $make_core;
2407} 3134}
2408 3135
2409sub reload() { 3136sub do_reload_perl() {
2410 # can/must only be called in main 3137 # can/must only be called in main
2411 if ($Coro::current != $Coro::main) { 3138 if ($Coro::current != $Coro::main) {
2412 warn "can only reload from main coroutine"; 3139 warn "can only reload from main coroutine";
2413 return; 3140 return;
2414 } 3141 }
2448 %EXT_CORO = (); 3175 %EXT_CORO = ();
2449 3176
2450 warn "removing commands"; 3177 warn "removing commands";
2451 %COMMAND = (); 3178 %COMMAND = ();
2452 3179
2453 warn "removing ext commands"; 3180 warn "removing ext/exti commands";
2454 %EXTCMD = (); 3181 %EXTCMD = ();
3182 %EXTICMD = ();
2455 3183
2456 warn "unloading/nuking all extensions"; 3184 warn "unloading/nuking all extensions";
2457 for my $pkg (@EXTS) { 3185 for my $pkg (@EXTS) {
2458 warn "... unloading $pkg"; 3186 warn "... unloading $pkg";
2459 3187
2489 Symbol::delete_package "safe::$_" 3217 Symbol::delete_package "safe::$_"
2490 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3218 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2491 3219
2492 warn "unloading cf.pm \"a bit\""; 3220 warn "unloading cf.pm \"a bit\"";
2493 delete $INC{"cf.pm"}; 3221 delete $INC{"cf.pm"};
3222 delete $INC{"cf/pod.pm"};
2494 3223
2495 # don't, removes xs symbols, too, 3224 # don't, removes xs symbols, too,
2496 # and global variables created in xs 3225 # and global variables created in xs
2497 #Symbol::delete_package __PACKAGE__; 3226 #Symbol::delete_package __PACKAGE__;
2498 3227
2513 warn "reattaching attachments to maps"; 3242 warn "reattaching attachments to maps";
2514 reattach $_ for values %MAP; 3243 reattach $_ for values %MAP;
2515 warn "reattaching attachments to players"; 3244 warn "reattaching attachments to players";
2516 reattach $_ for values %PLAYER; 3245 reattach $_ for values %PLAYER;
2517 3246
2518 warn "loading reloadable resources";
2519 reload_resources;
2520
2521 warn "leaving sync_job"; 3247 warn "leaving sync_job";
2522 3248
2523 1 3249 1
2524 } or do { 3250 } or do {
2525 warn $@; 3251 warn $@;
2530 warn "reloaded"; 3256 warn "reloaded";
2531}; 3257};
2532 3258
2533our $RELOAD_WATCHER; # used only during reload 3259our $RELOAD_WATCHER; # used only during reload
2534 3260
3261sub reload_perl() {
3262 # doing reload synchronously and two reloads happen back-to-back,
3263 # coro crashes during coro_state_free->destroy here.
3264
3265 $RELOAD_WATCHER ||= Event->timer (
3266 reentrant => 0,
3267 after => 0,
3268 data => WF_AUTOCANCEL,
3269 cb => sub {
3270 do_reload_perl;
3271 undef $RELOAD_WATCHER;
3272 },
3273 );
3274}
3275
2535register_command "reload" => sub { 3276register_command "reload" => sub {
2536 my ($who, $arg) = @_; 3277 my ($who, $arg) = @_;
2537 3278
2538 if ($who->flag (FLAG_WIZ)) { 3279 if ($who->flag (FLAG_WIZ)) {
2539 $who->message ("reloading server."); 3280 $who->message ("reloading server.");
2540 3281 async { reload_perl };
2541 # doing reload synchronously and two reloads happen back-to-back,
2542 # coro crashes during coro_state_free->destroy here.
2543
2544 $RELOAD_WATCHER ||= Event->timer (
2545 reentrant => 0,
2546 after => 0,
2547 data => WF_AUTOCANCEL,
2548 cb => sub {
2549 reload;
2550 undef $RELOAD_WATCHER;
2551 },
2552 );
2553 } 3282 }
2554}; 3283};
2555 3284
2556unshift @INC, $LIBDIR; 3285unshift @INC, $LIBDIR;
2557 3286
2558my $bug_warning = 0; 3287my $bug_warning = 0;
2559 3288
3289our @WAIT_FOR_TICK;
3290our @WAIT_FOR_TICK_BEGIN;
3291
3292sub wait_for_tick {
3293 return unless $TICK_WATCHER->is_active;
3294 return if $Coro::current == $Coro::main;
3295
3296 my $signal = new Coro::Signal;
3297 push @WAIT_FOR_TICK, $signal;
3298 $signal->wait;
3299}
3300
3301sub wait_for_tick_begin {
3302 return unless $TICK_WATCHER->is_active;
3303 return if $Coro::current == $Coro::main;
3304
3305 my $signal = new Coro::Signal;
3306 push @WAIT_FOR_TICK_BEGIN, $signal;
3307 $signal->wait;
3308}
3309
3310 my $min = 1e6;#d#
3311 my $avg = 10;
2560$TICK_WATCHER = Event->timer ( 3312$TICK_WATCHER = Event->timer (
2561 reentrant => 0, 3313 reentrant => 0,
2562 parked => 1, 3314 parked => 1,
2563 prio => 0, 3315 prio => 0,
2564 at => $NEXT_TICK || $TICK, 3316 at => $NEXT_TICK || $TICK,
2568 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3320 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2569 unless ++$bug_warning > 10; 3321 unless ++$bug_warning > 10;
2570 return; 3322 return;
2571 } 3323 }
2572 3324
2573 $NOW = Event::time; 3325 $NOW = $tick_start = Event::time;
2574 3326
2575 cf::server_tick; # one server iteration 3327 cf::server_tick; # one server iteration
3328
3329 0 && sync_job {#d#
3330 for(1..10) {
3331 my $t = Event::time;
3332 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3333 or die;
3334
3335 $map->width (50);
3336 $map->height (50);
3337 $map->alloc;
3338 $map->_load_objects ("/tmp/x.map", 1);
3339 my $t = Event::time - $t;
3340
3341 #next unless $t < 0.0013;#d#
3342 if ($t < $min) {
3343 $min = $t;
3344 }
3345 $avg = $avg * 0.99 + $t * 0.01;
3346 }
3347 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3348 exit 0;
3349 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3350 };
3351
2576 $RUNTIME += $TICK; 3352 $RUNTIME += $TICK;
2577 $NEXT_TICK += $TICK; 3353 $NEXT_TICK += $TICK;
2578 3354
2579 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3355 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2580 $NEXT_RUNTIME_WRITE = $NOW + 10; 3356 $NEXT_RUNTIME_WRITE = $NOW + 10;
2582 write_runtime 3358 write_runtime
2583 or warn "ERROR: unable to write runtime file: $!"; 3359 or warn "ERROR: unable to write runtime file: $!";
2584 }; 3360 };
2585 } 3361 }
2586 3362
2587 $WAIT_FOR_TICK->broadcast;
2588 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2589
2590# my $AFTER = Event::time; 3363# my $AFTER = Event::time;
2591# warn $AFTER - $NOW;#d# 3364# warn $AFTER - $NOW;#d#
2592 3365
3366 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3367 $sig->send;
3368 }
3369 while (my $sig = shift @WAIT_FOR_TICK) {
3370 $sig->send;
3371 }
3372
3373 $NOW = Event::time;
3374
2593 # if we are delayed by four ticks or more, skip them all 3375 # if we are delayed by four ticks or more, skip them all
2594 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3376 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2595 3377
2596 $TICK_WATCHER->at ($NEXT_TICK); 3378 $TICK_WATCHER->at ($NEXT_TICK);
2597 $TICK_WATCHER->start; 3379 $TICK_WATCHER->start;
3380
3381 $LOAD = ($NOW - $tick_start) / $TICK;
3382 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3383
3384 _post_tick;
3385
3386
2598 }, 3387 },
2599); 3388);
2600 3389
2601{ 3390{
2602 BDB::max_poll_time $TICK * 0.1; 3391 BDB::max_poll_time $TICK * 0.1;
2630 3419
2631 cf::sync_job { 3420 cf::sync_job {
2632 eval { 3421 eval {
2633 BDB::db_env_open 3422 BDB::db_env_open
2634 $DB_ENV, 3423 $DB_ENV,
2635 $BDB_ENV_DIR, 3424 $BDBDIR,
2636 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3425 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2637 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3426 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2638 0666; 3427 0666;
2639 3428
2640 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3429 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2641 3430
2642 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3431 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2643 $DB_ENV->set_lk_detect; 3432 $DB_ENV->set_lk_detect;
2644 }; 3433 };
2645 3434
2661 prio => 6, 3450 prio => 6,
2662 cb => \&IO::AIO::poll_cb, 3451 cb => \&IO::AIO::poll_cb,
2663 ); 3452 );
2664} 3453}
2665 3454
3455my $_log_backtrace;
3456
3457sub _log_backtrace {
3458 my ($msg, @addr) = @_;
3459
3460 $msg =~ s/\n//;
3461
3462 # limit the # of concurrent backtraces
3463 if ($_log_backtrace < 2) {
3464 ++$_log_backtrace;
3465 async {
3466 my @bt = fork_call {
3467 @addr = map { sprintf "%x", $_ } @addr;
3468 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3469 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3470 or die "addr2line: $!";
3471
3472 my @funcs;
3473 my @res = <$fh>;
3474 chomp for @res;
3475 while (@res) {
3476 my ($func, $line) = splice @res, 0, 2, ();
3477 push @funcs, "[$func] $line";
3478 }
3479
3480 @funcs
3481 };
3482
3483 LOG llevInfo, "[ABT] $msg\n";
3484 LOG llevInfo, "[ABT] $_\n" for @bt;
3485 --$_log_backtrace;
3486 };
3487 } else {
3488 LOG llevInfo, "[ABT] $msg\n";
3489 LOG llevInfo, "[ABT] [suppressed]\n";
3490 }
3491}
3492
3493# load additional modules
3494use cf::pod;
3495
2666END { cf::emergency_save } 3496END { cf::emergency_save }
2667 3497
26681 34981
2669 3499

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines