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.222 by root, Tue Mar 6 03:06:00 2007 UTC vs.
Revision 1.334 by root, Mon Aug 20 22:09:04 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;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.5 (); 15use Coro 3.64 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
24use Coro::Util ();
19 25
26use JSON::XS 1.4 ();
20use BDB (); 27use BDB ();
21use Data::Dumper; 28use Data::Dumper;
22use Digest::MD5; 29use Digest::MD5;
23use Fcntl; 30use Fcntl;
31use YAML::Syck ();
24use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
25use YAML::Syck ();
26use Time::HiRes; 33use Time::HiRes;
27use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
28 36
37# configure various modules to our taste
38#
39$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
29Compress::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
30 42
31use Event; $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
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 44
35# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36$YAML::Syck::ImplicitUnicode = 1; 46$YAML::Syck::ImplicitUnicode = 1;
37 47
38$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
39 49
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51
40our %COMMAND = (); 52our %COMMAND = ();
41our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
42 54
43our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
44our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
45our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
46our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
47 60
61our $RELOAD; # number of reloads so far
48our @EVENT; 62our @EVENT;
49our $LIBDIR = datadir . "/ext";
50 63
51our $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(!)
52our $TICK_WATCHER; 77our $TICK_WATCHER;
53our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55our $NEXT_TICK; 80our $NEXT_TICK;
56our $NOW; 81our $NOW;
65our $RUNTIME; 90our $RUNTIME;
66 91
67our %PLAYER; # all users 92our %PLAYER; # all users
68our %MAP; # all maps 93our %MAP; # all maps
69our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
72
73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
75 95
76# 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 ∕
77our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
78 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
79binmode STDOUT; 103binmode STDOUT;
80binmode STDERR; 104binmode STDERR;
81 105
82# read virtual server time, if available 106# read virtual server time, if available
83unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
84 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
85 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
86 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
87} 111}
88 112
89mkdir cf::localdir; 113mkdir $_
90mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
91mkdir cf::localdir . "/" . cf::tmpdir;
92mkdir cf::localdir . "/" . cf::uniquedir;
93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
95 115
96our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
97 117
98sub cf::map::normalise; 118sub cf::map::normalise;
99 119
110=item $cf::RUNTIME 130=item $cf::RUNTIME
111 131
112The 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
113every server tick. 133every server tick.
114 134
115=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
116 138
117The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
118be 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.
119 143
120=item $cf::NOW 144=item $cf::NOW
121 145
122The time of the last (current) server tick. 146The time of the last (current) server tick.
123 147
124=item $cf::TICK 148=item $cf::TICK
125 149
126The 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.
127 161
128=item %cf::CFG 162=item %cf::CFG
129 163
130Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
131from wherever your confdir points to. 165from wherever your confdir points to.
132 166
133=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 167=item cf::wait_for_tick, cf::wait_for_tick_begin
134 168
135These 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
136or 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
137processing 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.
138window 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.
139 178
140=back 179=back
141 180
142=cut 181=cut
143 182
144BEGIN { 183BEGIN {
145 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
146 my $msg = join "", @_; 185 my $msg = join "", @_;
147 utf8::encode $msg;
148 186
149 $msg .= "\n" 187 $msg .= "\n"
150 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
151 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
192 utf8::encode $msg;
152 LOG llevError, $msg; 193 LOG llevError, $msg;
153 }; 194 };
154} 195}
155 196
156@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
157@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
158@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
159@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
160@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';
161@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)
162 204
163# 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
164# within the Safe compartment. 206# within the Safe compartment.
165for my $pkg (qw( 207for my $pkg (qw(
166 cf::global cf::attachable 208 cf::global cf::attachable
174} 216}
175 217
176$Event::DIED = sub { 218$Event::DIED = sub {
177 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
178}; 220};
221
222#############################################################################
179 223
180=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
181 225
182=over 4 226=over 4
183 227
202 $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;
203 $d 247 $d
204 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
205} 249}
206 250
207use JSON::Syck (); # TODO# replace by JSON::PC once working
208
209=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
210 252
211Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
212 254
213=cut
214
215sub from_json($) {
216 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
217 JSON::Syck::Load $_[0]
218}
219
220=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
221 256
222Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
223 258
224=cut 259=cut
225 260
226sub to_json($) { 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
227 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 262
228 JSON::Syck::Dump $_[0] 263sub to_json ($) { $json_coder->encode ($_[0]) }
229} 264sub from_json ($) { $json_coder->decode ($_[0]) }
230 265
231=item cf::lock_wait $string 266=item cf::lock_wait $string
232 267
233Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
234 269
240returned. 275returned.
241 276
242Lock 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
243uses map_find and cf::map::load uses map_load). 278uses map_find and cf::map::load uses map_load).
244 279
280=item $locked = cf::lock_active $string
281
282Return true if the lock is currently active, i.e. somebody has locked it.
283
245=cut 284=cut
246 285
247our %LOCK; 286our %LOCK;
248 287
249sub lock_wait($) { 288sub lock_wait($) {
266 305
267 Coro::guard { 306 Coro::guard {
268 # wake up all waiters, to be on the safe side 307 # wake up all waiters, to be on the safe side
269 $_->ready for @{ delete $LOCK{$key} }; 308 $_->ready for @{ delete $LOCK{$key} };
270 } 309 }
310}
311
312sub lock_active($) {
313 my ($key) = @_;
314
315 ! ! $LOCK{$key}
271} 316}
272 317
273sub freeze_mainloop { 318sub freeze_mainloop {
274 return unless $TICK_WATCHER->is_active; 319 return unless $TICK_WATCHER->is_active;
275 320
278 }; 323 };
279 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
280 $guard 325 $guard
281} 326}
282 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
283=item cf::async { BLOCK } 384=item cf::async { BLOCK }
284 385
285Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
286C<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
287thing you are allowed to do is call C<prio> on it. 388thing you are allowed to do is call C<prio> on it.
290 391
291BEGIN { *async = \&Coro::async_pool } 392BEGIN { *async = \&Coro::async_pool }
292 393
293=item cf::sync_job { BLOCK } 394=item cf::sync_job { BLOCK }
294 395
295The design of crossfire+ requires that the main coro ($Coro::main) is 396The design of Crossfire TRT requires that the main coroutine ($Coro::main)
296always able to handle events or runnable, as crossfire+ is only partly 397is always able to handle events or runnable, as Crossfire TRT is only
297reentrant. 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.
298 400
299If 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
300the given BLOCK in another coroutine while waiting for the result. The 402the given BLOCK in another coroutine while waiting for the result. The
301server 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
302fast or be very important. 404fast or be very important.
305 407
306sub sync_job(&) { 408sub sync_job(&) {
307 my ($job) = @_; 409 my ($job) = @_;
308 410
309 if ($Coro::current == $Coro::main) { 411 if ($Coro::current == $Coro::main) {
412 my $time = Event::time;
413
310 # this is the main coro, too bad, we have to block 414 # this is the main coro, too bad, we have to block
311 # till the operation succeeds, freezing the server :/ 415 # till the operation succeeds, freezing the server :/
312 416
313 # TODO: use suspend/resume instead 417 # TODO: use suspend/resume instead
314 # (but this is cancel-safe) 418 # (but this is cancel-safe)
325 429
326 while ($busy) { 430 while ($busy) {
327 Coro::cede or Event::one_event; 431 Coro::cede or Event::one_event;
328 } 432 }
329 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
330 wantarray ? @res : $res[0] 441 wantarray ? @res : $res[0]
331 } else { 442 } else {
332 # we are in another coroutine, how wonderful, everything just works 443 # we are in another coroutine, how wonderful, everything just works
333 444
334 $job->() 445 $job->()
353 $EXT_CORO{$coro+0} = $coro; 464 $EXT_CORO{$coro+0} = $coro;
354 465
355 $coro 466 $coro
356} 467}
357 468
358sub write_runtime { 469=item fork_call { }, $args
359 my $guard = cf::lock_acquire "write_runtime";
360 470
361 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.
362 475
363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 476=cut
364 or return;
365 477
366 my $value = $cf::RUNTIME + 90 + 10; 478sub fork_call(&@) {
367 # 10 is the runtime save interval, for a monotonic clock 479 my ($cb, @args) = @_;
368 # 60 allows for the watchdog to kill the server.
369 480
370 (aio_write $fh, 0, (length $value), $value, 0) <= 0 481 # we seemingly have to make a local copy of the whole thing,
371 and return; 482 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious)
372 484
373 # always fsync - this file is important 485 my @res = Coro::Util::fork_eval {
374 aio_fsync $fh 486 reset_signals;
375 and return; 487 &$cb
488 }, @args;
376 489
377 close $fh 490 wantarray ? @res : $res[-1]
378 or return; 491}
379 492
380 aio_rename "$runtime~", $runtime 493=item $value = cf::db_get $family => $key
381 and return;
382 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 };
383 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 });
384} 618}
385 619
386=back 620=back
387 621
388=cut 622=cut
395attach callbacks/event handlers (a collection of which is called an "attachment") 629attach callbacks/event handlers (a collection of which is called an "attachment")
396to it. All such attachable objects support the following methods. 630to it. All such attachable objects support the following methods.
397 631
398In 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>
399C<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
400crossfire+). 634Crossfire TRT).
401 635
402=over 4 636=over 4
403 637
404=item $attachable->attach ($attachment, key => $value...) 638=item $attachable->attach ($attachment, key => $value...)
405 639
568 $registry = $CB_TYPE[$object_type] ||= []; 802 $registry = $CB_TYPE[$object_type] ||= [];
569 803
570 } elsif ($type eq "subtype") { 804 } elsif ($type eq "subtype") {
571 defined $object_type or Carp::croak "subtype specified without type"; 805 defined $object_type or Carp::croak "subtype specified without type";
572 my $object_subtype = shift @arg; 806 my $object_subtype = shift @arg;
573 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 807 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
574 808
575 } elsif ($type eq "package") { 809 } elsif ($type eq "package") {
576 my $pkg = shift @arg; 810 my $pkg = shift @arg;
577 811
578 while (my ($name, $id) = each %cb_id) { 812 while (my ($name, $id) = each %cb_id) {
607 _attach $registry, $klass, @attach; 841 _attach $registry, $klass, @attach;
608 } 842 }
609 843
610 $obj->{$name} = \%arg; 844 $obj->{$name} = \%arg;
611 } else { 845 } else {
612 warn "object uses attachment '$name' that is not available, postponing.\n"; 846 warn "object uses attachment '$name' which is not available, postponing.\n";
613 } 847 }
614 848
615 $obj->{_attachment}{$name} = undef; 849 $obj->{_attachment}{$name} = undef;
616} 850}
617 851
619 if (ref $_[0]) { 853 if (ref $_[0]) {
620 _object_attach @_; 854 _object_attach @_;
621 } else { 855 } else {
622 _attach shift->_attach_registry, @_; 856 _attach shift->_attach_registry, @_;
623 } 857 }
858 _recalc_want;
624}; 859};
625 860
626# all those should be optimised 861# all those should be optimised
627sub cf::attachable::detach { 862sub cf::attachable::detach {
628 my ($obj, $name) = @_; 863 my ($obj, $name) = @_;
631 delete $obj->{_attachment}{$name}; 866 delete $obj->{_attachment}{$name};
632 reattach ($obj); 867 reattach ($obj);
633 } else { 868 } else {
634 Carp::croak "cannot, currently, detach class attachments"; 869 Carp::croak "cannot, currently, detach class attachments";
635 } 870 }
871 _recalc_want;
636}; 872};
637 873
638sub cf::attachable::attached { 874sub cf::attachable::attached {
639 my ($obj, $name) = @_; 875 my ($obj, $name) = @_;
640 876
655 "; 891 ";
656 die if $@; 892 die if $@;
657} 893}
658 894
659our $override; 895our $override;
660our @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?
661 897
662sub override { 898sub override {
663 $override = 1; 899 $override = 1;
664 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
665} 901}
666 902
667sub do_invoke { 903sub do_invoke {
668 my $event = shift; 904 my $event = shift;
669 my $callbacks = shift; 905 my $callbacks = shift;
670 906
671 @invoke_results = (); 907 @INVOKE_RESULTS = ();
672 908
673 local $override; 909 local $override;
674 910
675 for (@$callbacks) { 911 for (@$callbacks) {
676 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
693 929
694Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
695 931
696This 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
697removed 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
698results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
699 935
700=back 936=back
701 937
702=cut 938=cut
703 939
704############################################################################# 940#############################################################################
705# 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}
706 953
707sub reattach { 954sub reattach {
708 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
709 my ($obj) = @_; 956 my ($obj) = @_;
710 957
813 or return; 1060 or return;
814 $av = eval { (Storable::thaw $av)->{objs} }; 1061 $av = eval { (Storable::thaw $av)->{objs} };
815 } 1062 }
816 1063
817 warn sprintf "loading %s (%d)\n", 1064 warn sprintf "loading %s (%d)\n",
818 $filename, length $data, scalar @{$av || []};#d# 1065 $filename, length $data, scalar @{$av || []};
819 return ($data, $av); 1066 return ($data, $av);
820} 1067}
1068
1069=head2 COMMAND CALLBACKS
1070
1071=over 4
1072
1073=cut
821 1074
822############################################################################# 1075#############################################################################
823# command handling &c 1076# command handling &c
824 1077
825=item cf::register_command $name => \&callback($ob,$args); 1078=item cf::register_command $name => \&callback($ob,$args);
838 push @{ $COMMAND{$name} }, [$caller, $cb]; 1091 push @{ $COMMAND{$name} }, [$caller, $cb];
839} 1092}
840 1093
841=item cf::register_extcmd $name => \&callback($pl,$packet); 1094=item cf::register_extcmd $name => \&callback($pl,$packet);
842 1095
843Register 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.
844 1101
845If 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
846called. 1103called.
847 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
848=cut 1116=cut
849 1117
850sub register_extcmd { 1118sub register_extcmd {
851 my ($name, $cb) = @_; 1119 my ($name, $cb) = @_;
852 1120
853 $EXTCMD{$name} = $cb; 1121 $EXTCMD{$name} = $cb;
1122}
1123
1124sub register_exticmd {
1125 my ($name, $cb) = @_;
1126
1127 $EXTICMD{$name} = $cb;
854} 1128}
855 1129
856cf::player->attach ( 1130cf::player->attach (
857 on_command => sub { 1131 on_command => sub {
858 my ($pl, $name, $params) = @_; 1132 my ($pl, $name, $params) = @_;
867 cf::override; 1141 cf::override;
868 }, 1142 },
869 on_extcmd => sub { 1143 on_extcmd => sub {
870 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
871 1145
872 my $msg = eval { from_json $buf }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
873 1147
874 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
875 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1154 if (my $cb = $EXTCMD{$type}) {
876 if (my %reply = $cb->($pl, $msg)) { 1155 my @reply = $cb->($pl, @payload);
1156
877 $pl->ext_reply ($msg->{msgid}, %reply); 1157 $pl->ext_reply ($reply, @reply)
878 } 1158 if $reply;
879 } 1159 }
880 } else { 1160 } else {
881 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
882 } 1162 }
883 1163
884 cf::override; 1164 cf::override;
885 }, 1165 },
886); 1166);
887 1167
888sub load_extension {
889 my ($path) = @_;
890
891 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
892 my $base = $1;
893 my $pkg = $1;
894 $pkg =~ s/[^[:word:]]/_/g;
895 $pkg = "ext::$pkg";
896
897 warn "... loading '$path' into '$pkg'\n";
898
899 open my $fh, "<:utf8", $path
900 or die "$path: $!";
901
902 my $source =
903 "package $pkg; use strict; use utf8;\n"
904 . "#line 1 \"$path\"\n{\n"
905 . (do { local $/; <$fh> })
906 . "\n};\n1";
907
908 unless (eval $source) {
909 my $msg = $@ ? "$path: $@\n"
910 : "extension disabled.\n";
911 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
912 warn $@;
913 warn "mandatory extension failed to load, exiting.\n";
914 exit 1;
915 }
916 die $@;
917 }
918
919 push @EXTS, $pkg;
920}
921
922sub load_extensions { 1168sub load_extensions {
1169 cf::sync_job {
1170 my %todo;
1171
923 for my $ext (<$LIBDIR/*.ext>) { 1172 for my $path (<$LIBDIR/*.ext>) {
924 next unless -r $ext; 1173 next unless -r $path;
925 eval { 1174
926 load_extension $ext; 1175 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1176 my $base = $1;
1177 my $pkg = $1;
1178 $pkg =~ s/[^[:word:]]/_/g;
1179 $pkg = "ext::$pkg";
1180
1181 open my $fh, "<:utf8", $path
1182 or die "$path: $!";
1183
1184 my $source = do { local $/; <$fh> };
1185
1186 my %ext = (
1187 path => $path,
1188 base => $base,
1189 pkg => $pkg,
1190 );
1191
1192 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1193 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1194
1195 $ext{source} =
1196 "package $pkg; use strict; use utf8;\n"
1197 . "#line 1 \"$path\"\n{\n"
1198 . $source
1199 . "\n};\n1";
1200
1201 $todo{$base} = \%ext;
1202 }
1203
1204 my %done;
1205 while (%todo) {
1206 my $progress;
1207
1208 while (my ($k, $v) = each %todo) {
1209 for (split /,\s*/, $v->{meta}{depends}) {
1210 goto skip
1211 unless exists $done{$_};
1212 }
1213
1214 warn "... loading '$k' into '$v->{pkg}'\n";
1215
1216 unless (eval $v->{source}) {
1217 my $msg = $@ ? "$v->{path}: $@\n"
1218 : "$v->{base}: extension inactive.\n";
1219
1220 if (exists $v->{meta}{mandatory}) {
1221 warn $msg;
1222 warn "mandatory extension failed to load, exiting.\n";
1223 exit 1;
1224 }
1225
1226 warn $msg;
1227 }
1228
1229 $done{$k} = delete $todo{$k};
1230 push @EXTS, $v->{pkg};
1231 $progress = 1;
927 1 1232 }
928 } or warn "$ext not loaded: $@"; 1233
1234 skip:
1235 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1236 unless $progress;
1237 }
929 } 1238 };
930} 1239}
931 1240
932############################################################################# 1241#############################################################################
933 1242
1243=back
1244
934=head2 CORE EXTENSIONS 1245=head2 CORE EXTENSIONS
935 1246
936Functions and methods that extend core crossfire objects. 1247Functions and methods that extend core crossfire objects.
937 1248
938=cut 1249=cut
950Returns the given player object, loading it if necessary (might block). 1261Returns the given player object, loading it if necessary (might block).
951 1262
952=cut 1263=cut
953 1264
954sub playerdir($) { 1265sub playerdir($) {
955 cf::localdir 1266 "$PLAYERDIR/"
956 . "/"
957 . cf::playerdir
958 . "/"
959 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1267 . (ref $_[0] ? $_[0]->ob->name : $_[0])
960} 1268}
961 1269
962sub path($) { 1270sub path($) {
963 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1271 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
964 1272
965 (playerdir $login) . "/$login.pl" 1273 (playerdir $login) . "/playerdata"
966} 1274}
967 1275
968sub find_active($) { 1276sub find_active($) {
969 $cf::PLAYER{$_[0]} 1277 $cf::PLAYER{$_[0]}
970 and $cf::PLAYER{$_[0]}->active 1278 and $cf::PLAYER{$_[0]}->active
983 my $login = $_[0]; 1291 my $login = $_[0];
984 1292
985 my $guard = cf::lock_acquire "user_find:$login"; 1293 my $guard = cf::lock_acquire "user_find:$login";
986 1294
987 $cf::PLAYER{$_[0]} || do { 1295 $cf::PLAYER{$_[0]} || do {
1296 # rename old playerfiles to new ones
1297 #TODO: remove when no longer required
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl";
1302
988 my $pl = load_pl path $login 1303 my $pl = load_pl path $login
989 or return; 1304 or return;
990 $cf::PLAYER{$login} = $pl 1305 $cf::PLAYER{$login} = $pl
991 } 1306 }
992 } 1307 }
1018 $self->{deny_save} = 1; 1333 $self->{deny_save} = 1;
1019 1334
1020 $cf::PLAYER{$login} = $self; 1335 $cf::PLAYER{$login} = $self;
1021 1336
1022 $self 1337 $self
1338}
1339
1340=item $player->send_msg ($channel, $msg, $color, [extra...])
1341
1342=cut
1343
1344sub send_msg {
1345 my $ns = shift->ns
1346 or return;
1347 $ns->send_msg (@_);
1023} 1348}
1024 1349
1025=item $pl->quit_character 1350=item $pl->quit_character
1026 1351
1027Nukes the player without looking back. If logged in, the connection will 1352Nukes the player without looking back. If logged in, the connection will
1076while and may block, so not sync_job-capable, ever. 1401while and may block, so not sync_job-capable, ever.
1077 1402
1078=cut 1403=cut
1079 1404
1080sub list_logins { 1405sub list_logins {
1081 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1406 my $dirs = aio_readdir $PLAYERDIR
1082 or return []; 1407 or return [];
1083 1408
1084 my @logins; 1409 my @logins;
1085 1410
1086 for my $login (@$dirs) { 1411 for my $login (@$dirs) {
1121 } 1446 }
1122 1447
1123 \@paths 1448 \@paths
1124} 1449}
1125 1450
1451=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1452
1453Expand crossfire pod fragments into protocol xml.
1454
1455=cut
1456
1457sub expand_cfpod {
1458 ((my $self), (local $_)) = @_;
1459
1460 # escape & and <
1461 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g;
1463
1464 # this is buggy, it needs to properly take care of nested <'s
1465
1466 1 while
1467 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/
1471 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1
1474 }ge
1475 # replace H<hint text>
1476 || s{H<([^\>]*)>}
1477 {
1478 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "")
1481 [$self->{hintmode}]
1482 }ge;
1483
1484 # create single paragraphs (very hackish)
1485 s/(?<=\S)\n(?=\w)/ /g;
1486
1487 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines
1492
1493 $_
1494}
1495
1496sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode}
1499}
1500
1126=item $player->ext_reply ($msgid, $msgtype, %msg) 1501=item $player->ext_reply ($msgid, @msg)
1127 1502
1128Sends an ext reply to the player. 1503Sends an ext reply to the player.
1129 1504
1130=cut 1505=cut
1131 1506
1132sub ext_reply($$$%) { 1507sub ext_reply($$@) {
1133 my ($self, $id, %msg) = @_; 1508 my ($self, $id, @msg) = @_;
1134 1509
1135 $msg{msgid} = $id; 1510 if ($self->ns->extcmd == 2) {
1136 1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1137 $self->send ("ext " . cf::to_json \%msg); 1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1138} 1517}
1139 1518
1140package cf; 1519=item $player->ext_msg ($type, @msg)
1520
1521Sends an ext event to the client.
1522
1523=cut
1524
1525sub ext_msg($$@) {
1526 my ($self, $type, @msg) = @_;
1527
1528 $self->ns->ext_msg ($type, @msg);
1529}
1530
1531=head3 cf::region
1532
1533=over 4
1534
1535=cut
1536
1537package cf::region;
1538
1539=item cf::region::find_by_path $path
1540
1541Tries to decuce the likely region for a map knowing only its path.
1542
1543=cut
1544
1545sub find_by_path($) {
1546 my ($path) = @_;
1547
1548 my ($match, $specificity);
1549
1550 for my $region (list) {
1551 if ($region->{match} && $path =~ $region->{match}) {
1552 ($match, $specificity) = ($region, $region->specificity)
1553 if $region->specificity > $specificity;
1554 }
1555 }
1556
1557 $match
1558}
1141 1559
1142=back 1560=back
1143
1144 1561
1145=head3 cf::map 1562=head3 cf::map
1146 1563
1147=over 4 1564=over 4
1148 1565
1203 my ($self, $merge) = @_; 1620 my ($self, $merge) = @_;
1204 1621
1205 # we have to keep some variables in memory intact 1622 # we have to keep some variables in memory intact
1206 local $self->{path}; 1623 local $self->{path};
1207 local $self->{load_path}; 1624 local $self->{load_path};
1208 local $self->{deny_save};
1209 local $self->{deny_reset};
1210 1625
1211 $self->SUPER::thawer_merge ($merge); 1626 $self->SUPER::thawer_merge ($merge);
1212} 1627}
1213 1628
1214sub normalise { 1629sub normalise {
1261 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1262 return $self; 1677 return $self;
1263 } 1678 }
1264 } 1679 }
1265 1680
1266 Carp::carp "unable to resolve path '$path' (base '$base')."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1267 () 1682 ()
1268} 1683}
1269 1684
1270sub init { 1685sub init {
1271 my ($self) = @_; 1686 my ($self) = @_;
1286 1701
1287# the original (read-only) location 1702# the original (read-only) location
1288sub load_path { 1703sub load_path {
1289 my ($self) = @_; 1704 my ($self) = @_;
1290 1705
1291 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1706 "$MAPDIR/$self->{path}.map"
1292} 1707}
1293 1708
1294# the temporary/swap location 1709# the temporary/swap location
1295sub save_path { 1710sub save_path {
1296 my ($self) = @_; 1711 my ($self) = @_;
1297 1712
1298 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1299 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1714 "$TMPDIR/$path.map"
1300} 1715}
1301 1716
1302# the unique path, undef == no special unique path 1717# the unique path, undef == no special unique path
1303sub uniq_path { 1718sub uniq_path {
1304 my ($self) = @_; 1719 my ($self) = @_;
1305 1720
1306 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1307 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1722 "$UNIQUEDIR/$path"
1308} 1723}
1309 1724
1310# and all this just because we cannot iterate over 1725# and all this just because we cannot iterate over
1311# all maps in C++... 1726# all maps in C++...
1312sub change_all_map_light { 1727sub change_all_map_light {
1313 my ($change) = @_; 1728 my ($change) = @_;
1314 1729
1315 $_->change_map_light ($change) 1730 $_->change_map_light ($change)
1316 for grep $_->outdoor, values %cf::MAP; 1731 for grep $_->outdoor, values %cf::MAP;
1732}
1733
1734sub decay_objects {
1735 my ($self) = @_;
1736
1737 return if $self->{deny_reset};
1738
1739 $self->do_decay_objects;
1317} 1740}
1318 1741
1319sub unlink_save { 1742sub unlink_save {
1320 my ($self) = @_; 1743 my ($self) = @_;
1321 1744
1379 $self->load_header_orig 1802 $self->load_header_orig
1380 or return; 1803 or return;
1381 $self->prepare_orig; 1804 $self->prepare_orig;
1382 } 1805 }
1383 1806
1807 $self->{deny_reset} = 1
1808 if $self->no_reset;
1809
1810 $self->default_region (cf::region::find_by_path $self->{path})
1811 unless $self->default_region;
1812
1384 1 1813 1
1385} 1814}
1386 1815
1387sub find; 1816sub find;
1388sub find { 1817sub find {
1400 $map->{last_save} = $cf::RUNTIME; 1829 $map->{last_save} = $cf::RUNTIME;
1401 1830
1402 $map->load_header 1831 $map->load_header
1403 or return; 1832 or return;
1404 1833
1405 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1406 # doing this can freeze the server in a sync job, obviously 1835 # doing this can freeze the server in a sync job, obviously
1407 #$cf::WAIT_FOR_TICK->wait; 1836 #$cf::WAIT_FOR_TICK->wait;
1408 $map->reset; 1837 $map->reset;
1409 undef $guard; 1838 undef $guard;
1410 return find $path; 1839 return find $path;
1421 my ($self) = @_; 1850 my ($self) = @_;
1422 1851
1423 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1424 1853
1425 my $path = $self->{path}; 1854 my $path = $self->{path};
1855
1856 {
1426 my $guard = cf::lock_acquire "map_load:$path"; 1857 my $guard = cf::lock_acquire "map_load:$path";
1427 1858
1428 return if $self->in_memory != cf::MAP_SWAPPED; 1859 return if $self->in_memory != cf::MAP_SWAPPED;
1429 1860
1430 $self->in_memory (cf::MAP_LOADING); 1861 $self->in_memory (cf::MAP_LOADING);
1431 1862
1432 $self->alloc; 1863 $self->alloc;
1433 1864
1434 $self->pre_load; 1865 $self->pre_load;
1435
1436 $self->_load_objects ($self->{load_path}, 1)
1437 or return;
1438
1439 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1440 if delete $self->{load_original};
1441
1442 if (my $uniq = $self->uniq_path) {
1443 utf8::encode $uniq;
1444 if (aio_open $uniq, O_RDONLY, 0) {
1445 $self->clear_unique_items;
1446 $self->_load_objects ($uniq, 0);
1447 }
1448 }
1449
1450 Coro::cede;
1451
1452 # now do the right thing for maps
1453 $self->link_multipart_objects;
1454
1455 unless ($self->{deny_activate}) {
1456 $self->decay_objects;
1457 $self->fix_auto_apply;
1458 $self->update_buttons;
1459 Coro::cede; 1866 Coro::cede;
1460 $self->set_darkness_map; 1867
1868 $self->_load_objects ($self->{load_path}, 1)
1869 or return;
1870
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1872 if delete $self->{load_original};
1873
1874 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) {
1877 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0);
1879 }
1880 }
1881
1882 Coro::cede;
1883 # now do the right thing for maps
1884 $self->link_multipart_objects;
1461 $self->difficulty ($self->estimate_difficulty) 1885 $self->difficulty ($self->estimate_difficulty)
1462 unless $self->difficulty; 1886 unless $self->difficulty;
1463 Coro::cede; 1887 Coro::cede;
1888
1889 unless ($self->{deny_activate}) {
1890 $self->decay_objects;
1891 $self->fix_auto_apply;
1892 $self->update_buttons;
1893 Coro::cede;
1894 $self->set_darkness_map;
1895 Coro::cede;
1464 $self->activate; 1896 $self->activate;
1897 }
1898
1899 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME);
1901
1902 $self->in_memory (cf::MAP_IN_MEMORY);
1465 } 1903 }
1466 1904
1467 $self->post_load; 1905 $self->post_load;
1468
1469 $self->in_memory (cf::MAP_IN_MEMORY);
1470} 1906}
1471 1907
1472sub customise_for { 1908sub customise_for {
1473 my ($self, $ob) = @_; 1909 my ($self, $ob) = @_;
1474 1910
1475 return find "~" . $ob->name . "/" . $self->{path} 1911 return find "~" . $ob->name . "/" . $self->{path}
1476 if $self->per_player; 1912 if $self->per_player;
1477 1913
1914# return find "?party/" . $ob->name . "/" . $self->{path}
1915# if $self->per_party;
1916
1478 $self 1917 $self
1479} 1918}
1480 1919
1481# find and load all maps in the 3x3 area around a map 1920# find and load all maps in the 3x3 area around a map
1482sub load_diag { 1921sub load_neighbours {
1483 my ($map) = @_; 1922 my ($map) = @_;
1484 1923
1485 my @diag; # diagonal neighbours 1924 my @neigh; # diagonal neighbours
1486 1925
1487 for (0 .. 3) { 1926 for (0 .. 3) {
1488 my $neigh = $map->tile_path ($_) 1927 my $neigh = $map->tile_path ($_)
1489 or next; 1928 or next;
1490 $neigh = find $neigh, $map 1929 $neigh = find $neigh, $map
1491 or next; 1930 or next;
1492 $neigh->load; 1931 $neigh->load;
1493 1932
1933 push @neigh,
1494 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1934 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1495 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1935 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1496 } 1936 }
1497 1937
1498 for (@diag) { 1938 for (grep defined $_->[0], @neigh) {
1939 my ($path, $origin) = @$_;
1499 my $neigh = find @$_ 1940 my $neigh = find $path, $origin
1500 or next; 1941 or next;
1501 $neigh->load; 1942 $neigh->load;
1502 } 1943 }
1503} 1944}
1504 1945
1528 1969
1529 undef $MAP_PREFETCH{$path}; 1970 undef $MAP_PREFETCH{$path};
1530 $MAP_PREFETCHER ||= cf::async { 1971 $MAP_PREFETCHER ||= cf::async {
1531 while (%MAP_PREFETCH) { 1972 while (%MAP_PREFETCH) {
1532 for my $path (keys %MAP_PREFETCH) { 1973 for my $path (keys %MAP_PREFETCH) {
1533 my $map = find $path 1974 if (my $map = find $path) {
1534 or next;
1535 $map->load; 1975 $map->load;
1976 }
1536 1977
1537 delete $MAP_PREFETCH{$path}; 1978 delete $MAP_PREFETCH{$path};
1538 } 1979 }
1539 } 1980 }
1540 undef $MAP_PREFETCHER; 1981 undef $MAP_PREFETCHER;
1592 2033
1593sub reset_at { 2034sub reset_at {
1594 my ($self) = @_; 2035 my ($self) = @_;
1595 2036
1596 # TODO: safety, remove and allow resettable per-player maps 2037 # TODO: safety, remove and allow resettable per-player maps
1597 return 1e99 if $self->isa ("ext::map_per_player");#d#
1598 return 1e99 if $self->{deny_reset}; 2038 return 1e99 if $self->{deny_reset};
1599 2039
1600 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2040 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1601 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2041 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1602 2042
1613 my ($self) = @_; 2053 my ($self) = @_;
1614 2054
1615 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2055 my $lock = cf::lock_acquire "map_data:$self->{path}";
1616 2056
1617 return if $self->players; 2057 return if $self->players;
1618 return if $self->isa ("ext::map_per_player");#d#
1619 2058
1620 warn "resetting map ", $self->path;#d# 2059 warn "resetting map ", $self->path;
1621 2060
1622 $self->in_memory (cf::MAP_SWAPPED); 2061 $self->in_memory (cf::MAP_SWAPPED);
1623 2062
1624 # need to save uniques path 2063 # need to save uniques path
1625 unless ($self->{deny_save}) { 2064 unless ($self->{deny_save}) {
1657 $cf::MAP{$self->path} = $self; 2096 $cf::MAP{$self->path} = $self;
1658 2097
1659 $self->reset; # polite request, might not happen 2098 $self->reset; # polite request, might not happen
1660} 2099}
1661 2100
2101=item $maps = cf::map::tmp_maps
2102
2103Returns an arrayref with all map paths of currently instantiated and saved
2104maps. May block.
2105
2106=cut
2107
2108sub tmp_maps() {
2109 [
2110 map {
2111 utf8::decode $_;
2112 /\.map$/
2113 ? normalise $_
2114 : ()
2115 } @{ aio_readdir $TMPDIR or [] }
2116 ]
2117}
2118
2119=item $maps = cf::map::random_maps
2120
2121Returns an arrayref with all map paths of currently instantiated and saved
2122random maps. May block.
2123
2124=cut
2125
2126sub random_maps() {
2127 [
2128 map {
2129 utf8::decode $_;
2130 /\.map$/
2131 ? normalise "?random/$_"
2132 : ()
2133 } @{ aio_readdir $RANDOMDIR or [] }
2134 ]
2135}
2136
1662=item cf::map::unique_maps 2137=item cf::map::unique_maps
1663 2138
1664Returns an arrayref of paths of all shared maps that have 2139Returns an arrayref of paths of all shared maps that have
1665instantiated unique items. May block. 2140instantiated unique items. May block.
1666 2141
1667=cut 2142=cut
1668 2143
1669sub unique_maps() { 2144sub unique_maps() {
1670 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2145 [
1671 or return; 2146 map {
1672
1673 my @paths;
1674
1675 for (@$files) {
1676 utf8::decode $_; 2147 utf8::decode $_;
1677 next if /\.pst$/; 2148 /\.map$/
1678 next unless /^$PATH_SEP/o; 2149 ? normalise $_
1679 2150 : ()
1680 push @paths, cf::map::normalise $_; 2151 } @{ aio_readdir $UNIQUEDIR or [] }
1681 } 2152 ]
1682
1683 \@paths
1684} 2153}
1685 2154
1686package cf; 2155package cf;
1687 2156
1688=back 2157=back
1734 2203
1735 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2204 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1736 2205
1737 if ($self->{record_replies}) { 2206 if ($self->{record_replies}) {
1738 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2207 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2208
1739 } else { 2209 } else {
2210 my $pl = $self->contr;
2211
2212 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2213 my $dialog = $pl->{npc_dialog};
2214 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2215
2216 } else {
1740 $msg = $npc->name . " says: $msg" if $npc; 2217 $msg = $npc->name . " says: $msg" if $npc;
1741 $self->message ($msg, $flags); 2218 $self->message ($msg, $flags);
2219 }
1742 } 2220 }
2221}
2222
2223=item $object->send_msg ($channel, $msg, $color, [extra...])
2224
2225=cut
2226
2227sub cf::object::send_msg {
2228 my $pl = shift->contr
2229 or return;
2230 $pl->send_msg (@_);
1743} 2231}
1744 2232
1745=item $player_object->may ("access") 2233=item $player_object->may ("access")
1746 2234
1747Returns wether the given player is authorized to access resource "access" 2235Returns wether the given player is authorized to access resource "access"
1794 $self->deactivate_recursive; 2282 $self->deactivate_recursive;
1795 2283
1796 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2284 return if UNIVERSAL::isa $self->map, "ext::map_link";
1797 2285
1798 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2286 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1799 if $self->map; 2287 if $self->map && $self->map->{path} ne "{link}";
1800 2288
1801 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2289 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1802} 2290}
1803 2291
1804sub cf::object::player::leave_link { 2292sub cf::object::player::leave_link {
1805 my ($self, $map, $x, $y) = @_; 2293 my ($self, $map, $x, $y) = @_;
2294
2295 return unless $self->contr->active;
1806 2296
1807 my $link_pos = delete $self->{_link_pos}; 2297 my $link_pos = delete $self->{_link_pos};
1808 2298
1809 unless ($map) { 2299 unless ($map) {
1810 # restore original map position 2300 # restore original map position
1824 # use -1 or undef as default coordinates, not 0, 0 2314 # use -1 or undef as default coordinates, not 0, 0
1825 ($x, $y) = ($map->enter_x, $map->enter_y) 2315 ($x, $y) = ($map->enter_x, $map->enter_y)
1826 if $x <=0 && $y <= 0; 2316 if $x <=0 && $y <= 0;
1827 2317
1828 $map->load; 2318 $map->load;
1829 $map->load_diag; 2319 $map->load_neighbours;
1830 2320
1831 return unless $self->contr->active; 2321 return unless $self->contr->active;
1832 $self->activate_recursive; 2322 $self->activate_recursive;
1833 2323
1834 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1835 $self->enter_map ($map, $x, $y); 2325 $self->enter_map ($map, $x, $y);
1836} 2326}
1837 2327
1838cf::player->attach ( 2328=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1839 on_logout => sub {
1840 my ($pl) = @_;
1841 2329
1842 # abort map switching before logout 2330Moves the player to the given map-path and coordinates by first freezing
1843 if ($pl->ob->{_link_pos}) { 2331her, loading and preparing them map, calling the provided $check callback
1844 cf::sync_job { 2332that has to return the map if sucecssful, and then unfreezes the player on
1845 $pl->ob->leave_link 2333the new (success) or old (failed) map position. In either case, $done will
1846 }; 2334be called at the end of this process.
1847 }
1848 },
1849 on_login => sub {
1850 my ($pl) = @_;
1851 2335
1852 # try to abort aborted map switching on player login :)
1853 # should happen only on crashes
1854 if ($pl->ob->{_link_pos}) {
1855 $pl->ob->enter_link;
1856 (async {
1857 $pl->ob->reply (undef,
1858 "There was an internal problem at your last logout, "
1859 . "the server will try to bring you to your intended destination in a second.",
1860 cf::NDI_RED);
1861 # we need this sleep as the login has a concurrent enter_exit running
1862 # and this sleep increases chances of the player not ending up in scorn
1863 Coro::Timer::sleep 1;
1864 $pl->ob->leave_link;
1865 })->prio (2);
1866 }
1867 },
1868);
1869
1870=item $player_object->goto ($path, $x, $y)
1871
1872=cut 2336=cut
2337
2338our $GOTOGEN;
1873 2339
1874sub cf::object::player::goto { 2340sub cf::object::player::goto {
1875 my ($self, $path, $x, $y) = @_; 2341 my ($self, $path, $x, $y, $check, $done) = @_;
2342
2343 # do generation counting so two concurrent goto's will be executed in-order
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1876 2345
1877 $self->enter_link; 2346 $self->enter_link;
1878 2347
1879 (async { 2348 (async {
1880 my $map = eval { 2349 my $map = eval {
1881 my $map = cf::map::find $path; 2350 my $map = cf::map::find $path;
2351
2352 if ($map) {
1882 $map = $map->customise_for ($self) if $map; 2353 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map;
2355 } else {
2356 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2357 }
2358
1883 $map 2359 $map
2360 };
2361
2362 if ($@) {
2363 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2364 LOG llevError | logBacktrace, Carp::longmess $@;
1884 } or 2365 }
1885 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1886 2366
2367 if ($gen == $self->{_goto_generation}) {
2368 delete $self->{_goto_generation};
1887 $self->leave_link ($map, $x, $y); 2369 $self->leave_link ($map, $x, $y);
2370 }
2371
2372 $done->() if $done;
1888 })->prio (1); 2373 })->prio (1);
1889} 2374}
1890 2375
1891=item $player_object->enter_exit ($exit_object) 2376=item $player_object->enter_exit ($exit_object)
1892 2377
1931 2416
1932 $rmp->{random_seed} ||= $exit->random_seed; 2417 $rmp->{random_seed} ||= $exit->random_seed;
1933 2418
1934 my $data = cf::to_json $rmp; 2419 my $data = cf::to_json $rmp;
1935 my $md5 = Digest::MD5::md5_hex $data; 2420 my $md5 = Digest::MD5::md5_hex $data;
1936 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2421 my $meta = "$RANDOMDIR/$md5.meta";
1937 2422
1938 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2423 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1939 aio_write $fh, 0, (length $data), $data, 0; 2424 aio_write $fh, 0, (length $data), $data, 0;
1940 undef $fh; 2425 undef $fh;
1941 aio_rename "$meta~", $meta; 2426 aio_rename "$meta~", $meta;
1950 2435
1951 return unless $self->type == cf::PLAYER; 2436 return unless $self->type == cf::PLAYER;
1952 2437
1953 if ($exit->slaying eq "/!") { 2438 if ($exit->slaying eq "/!") {
1954 #TODO: this should de-fi-ni-te-ly not be a sync-job 2439 #TODO: this should de-fi-ni-te-ly not be a sync-job
2440 # the problem is that $exit might not survive long enough
2441 # so it needs to be done right now, right here
1955 cf::sync_job { prepare_random_map $exit }; 2442 cf::sync_job { prepare_random_map $exit };
1956 } 2443 }
1957 2444
1958 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2445 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1959 my $hp = $exit->stats->hp; 2446 my $hp = $exit->stats->hp;
1960 my $sp = $exit->stats->sp; 2447 my $sp = $exit->stats->sp;
1961 2448
1962 $self->enter_link; 2449 $self->enter_link;
2450
2451 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED);
1963 2454
1964 (async { 2455 (async {
1965 $self->deactivate_recursive; # just to be sure 2456 $self->deactivate_recursive; # just to be sure
1966 unless (eval { 2457 unless (eval {
1967 $self->goto ($slaying, $hp, $sp); 2458 $self->goto ($slaying, $hp, $sp);
1968 2459
1969 1; 2460 1;
1970 }) { 2461 }) {
1971 $self->message ("Something went wrong deep within the crossfire server. " 2462 $self->message ("Something went wrong deep within the crossfire server. "
1972 . "I'll try to bring you back to the map you were before. " 2463 . "I'll try to bring you back to the map you were before. "
1973 . "Please report this to the dungeon master!", 2464 . "Please report this to the dungeon master!",
1974 cf::NDI_UNIQUE | cf::NDI_RED); 2465 cf::NDI_UNIQUE | cf::NDI_RED);
1975 2466
1976 warn "ERROR in enter_exit: $@"; 2467 warn "ERROR in enter_exit: $@";
1977 $self->leave_link; 2468 $self->leave_link;
1978 } 2469 }
1979 })->prio (1); 2470 })->prio (1);
1992 2483
1993sub cf::client::send_drawinfo { 2484sub cf::client::send_drawinfo {
1994 my ($self, $text, $flags) = @_; 2485 my ($self, $text, $flags) = @_;
1995 2486
1996 utf8::encode $text; 2487 utf8::encode $text;
1997 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2488 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1998} 2489}
1999 2490
2491=item $client->send_msg ($channel, $msg, $color, [extra...])
2492
2493Send a drawinfo or msg packet to the client, formatting the msg for the
2494client if neccessary. C<$type> should be a string identifying the type of
2495the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet.
2497
2498=cut
2499
2500sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_;
2502
2503 $msg = $self->pl->expand_cfpod ($msg);
2504
2505 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506
2507 if (ref $channel) {
2508 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_msg (channel_info => $channel);
2512 }
2513
2514 $channel = $channel->{id};
2515 }
2516
2517 return unless @extra || length $msg;
2518
2519 if ($self->can_msg) {
2520 # default colour, mask it out
2521 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2522 if $color & cf::NDI_DEF;
2523
2524 $self->send_packet ("msg " . $self->{json_coder}->encode (
2525 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2526 } else {
2527 if ($color >= 0) {
2528 # replace some tags by gcfclient-compatible ones
2529 for ($msg) {
2530 1 while
2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536 }
2537
2538 $color &= cf::NDI_COLOR_MASK;
2539
2540 utf8::encode $msg;
2541
2542 if (0 && $msg =~ /\[/) {
2543 # COMMAND/INFO
2544 $self->send_packet ("drawextinfo $color 10 8 $msg")
2545 } else {
2546 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2547 $self->send_packet ("drawinfo $color $msg")
2548 }
2549 }
2550 }
2551}
2552
2553=item $client->ext_msg ($type, @msg)
2554
2555Sends an ext event to the client.
2556
2557=cut
2558
2559sub cf::client::ext_msg($$@) {
2560 my ($self, $type, @msg) = @_;
2561
2562 my $extcmd = $self->extcmd;
2563
2564 if ($extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($extcmd == 1) { # TODO: remove
2567 push @msg, msgtype => "event_$type";
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 }
2570}
2000 2571
2001=item $success = $client->query ($flags, "text", \&cb) 2572=item $success = $client->query ($flags, "text", \&cb)
2002 2573
2003Queues a query to the client, calling the given callback with 2574Queues a query to the client, calling the given callback with
2004the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2575the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2005C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2576C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2006 2577
2007Queries can fail, so check the return code. Or don't, as queries will become 2578Queries can fail, so check the return code. Or don't, as queries will
2008reliable at some point in the future. 2579become reliable at some point in the future.
2009 2580
2010=cut 2581=cut
2011 2582
2012sub cf::client::query { 2583sub cf::client::query {
2013 my ($self, $flags, $text, $cb) = @_; 2584 my ($self, $flags, $text, $cb) = @_;
2021 utf8::encode $text; 2592 utf8::encode $text;
2022 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2593 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2023 2594
2024 $self->send_packet ($self->{query_queue}[0][0]) 2595 $self->send_packet ($self->{query_queue}[0][0])
2025 if @{ $self->{query_queue} } == 1; 2596 if @{ $self->{query_queue} } == 1;
2597
2598 1
2026} 2599}
2027 2600
2028cf::client->attach ( 2601cf::client->attach (
2602 on_connect => sub {
2603 my ($ns) = @_;
2604
2605 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2606 },
2029 on_reply => sub { 2607 on_reply => sub {
2030 my ($ns, $msg) = @_; 2608 my ($ns, $msg) = @_;
2031 2609
2032 # this weird shuffling is so that direct followup queries 2610 # this weird shuffling is so that direct followup queries
2033 # get handled first 2611 # get handled first
2045 } else { 2623 } else {
2046 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2624 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2047 } 2625 }
2048 } 2626 }
2049 }, 2627 },
2628 on_exticmd => sub {
2629 my ($ns, $buf) = @_;
2630
2631 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2632
2633 if (ref $msg) {
2634 my ($type, $reply, @payload) =
2635 "ARRAY" eq ref $msg
2636 ? @$msg
2637 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2638
2639 if (my $cb = $EXTICMD{$type}) {
2640 my @reply = $cb->($ns, @payload);
2641
2642 $ns->ext_reply ($reply, @reply)
2643 if $reply;
2644 }
2645 } else {
2646 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2647 }
2648
2649 cf::override;
2650 },
2050); 2651);
2051 2652
2052=item $client->async (\&cb) 2653=item $client->async (\&cb)
2053 2654
2054Create a new coroutine, running the specified callback. The coroutine will 2655Create a new coroutine, running the specified callback. The coroutine will
2095our $safe = new Safe "safe"; 2696our $safe = new Safe "safe";
2096our $safe_hole = new Safe::Hole; 2697our $safe_hole = new Safe::Hole;
2097 2698
2098$SIG{FPE} = 'IGNORE'; 2699$SIG{FPE} = 'IGNORE';
2099 2700
2100$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2701$safe->permit_only (Opcode::opset qw(
2702 :base_core :base_mem :base_orig :base_math
2703 grepstart grepwhile mapstart mapwhile
2704 sort time
2705));
2101 2706
2102# here we export the classes and methods available to script code 2707# here we export the classes and methods available to script code
2103 2708
2104=pod 2709=pod
2105 2710
2106The following fucntions and emthods are available within a safe environment: 2711The following functions and methods are available within a safe environment:
2107 2712
2108 cf::object contr pay_amount pay_player map 2713 cf::object
2714 contr pay_amount pay_player map x y force_find force_add
2715 insert remove name archname title slaying race
2716
2109 cf::object::player player 2717 cf::object::player
2110 cf::player peaceful 2718 player
2111 cf::map trigger 2719
2720 cf::player
2721 peaceful
2722
2723 cf::map
2724 trigger
2112 2725
2113=cut 2726=cut
2114 2727
2115for ( 2728for (
2116 ["cf::object" => qw(contr pay_amount pay_player map)], 2729 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2730 insert remove inv name archname title slaying race)],
2117 ["cf::object::player" => qw(player)], 2731 ["cf::object::player" => qw(player)],
2118 ["cf::player" => qw(peaceful)], 2732 ["cf::player" => qw(peaceful)],
2119 ["cf::map" => qw(trigger)], 2733 ["cf::map" => qw(trigger)],
2120) { 2734) {
2121 no strict 'refs'; 2735 no strict 'refs';
2192=back 2806=back
2193 2807
2194=cut 2808=cut
2195 2809
2196############################################################################# 2810#############################################################################
2197
2198=head2 EXTENSION DATABASE SUPPORT
2199
2200Crossfire maintains a very simple database for extension use. It can
2201currently store anything that can be serialised using Storable, which
2202excludes objects.
2203
2204The parameter C<$family> should best start with the name of the extension
2205using it, it should be unique.
2206
2207=over 4
2208
2209=item $value = cf::db_get $family => $key
2210
2211Returns a single value from the database.
2212
2213=item cf::db_put $family => $key => $value
2214
2215Stores the given C<$value> in the family.
2216
2217=cut
2218
2219our $DB;
2220
2221sub db_init {
2222 unless ($DB) {
2223 $DB = BDB::db_create $DB_ENV;
2224
2225 cf::sync_job {
2226 eval {
2227 $DB->set_flags (BDB::CHKSUM);
2228
2229 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2230 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2231 cf::cleanup "db_open(db): $!" if $!;
2232 };
2233 cf::cleanup "db_open(db): $@" if $@;
2234 };
2235
2236 my $path = cf::localdir . "/database.pst";
2237 if (stat $path) {
2238 cf::sync_job {
2239 my $pst = Storable::retrieve $path;
2240
2241 cf::db_put (board => data => $pst->{board});
2242 cf::db_put (guildrules => data => $pst->{guildrules});
2243 cf::db_put (rent => balance => $pst->{rent}{balance});
2244 BDB::db_env_txn_checkpoint $DB_ENV;
2245
2246 unlink $path;
2247 };
2248 }
2249 }
2250}
2251
2252sub db_get($$) {
2253 my $key = "$_[0]/$_[1]";
2254
2255 cf::sync_job {
2256 BDB::db_get $DB, undef, $key, my $data;
2257
2258 $! ? ()
2259 : Compress::LZF::sthaw $data
2260 }
2261}
2262
2263sub db_put($$$) {
2264 BDB::dbreq_pri 4;
2265 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2266}
2267
2268#############################################################################
2269# the server's init and main functions 2811# the server's init and main functions
2270 2812
2271sub init_resources { 2813sub load_facedata($) {
2272 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2814 my ($path) = @_;
2815
2816 my $enc = JSON::XS->new->utf8->canonical;
2817
2818 warn "loading facedata from $path\n";
2819
2820 my $facedata;
2821 0 < aio_load $path, $facedata
2822 or die "$path: $!";
2823
2824 $facedata = Coro::Storable::thaw $facedata;
2825
2826 $facedata->{version} == 2
2827 or cf::cleanup "$path: version mismatch, cannot proceed.";
2828
2829 # patch in the exptable
2830 cf::cede_to_tick;
2831 $facedata->{resource}{"res/exp_table"} = {
2832 type => FT_RSRC,
2833 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]),
2834 };
2835 cf::cede_to_tick;
2836
2837 {
2838 my $faces = $facedata->{faceinfo};
2839
2840 while (my ($face, $info) = each %$faces) {
2841 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2842 cf::face::set_visibility $idx, $info->{visibility};
2843 cf::face::set_magicmap $idx, $info->{magicmap};
2844 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2845 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2846
2847 cf::cede_to_tick;
2848 }
2849
2850 while (my ($face, $info) = each %$faces) {
2851 next unless $info->{smooth};
2852 my $idx = cf::face::find $face
2853 or next;
2854 if (my $smooth = cf::face::find $info->{smooth}) {
2855 cf::face::set_smooth $idx, $smooth;
2856 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2857 } else {
2858 warn "smooth face '$info->{smooth}' not found for face '$face'";
2859 }
2860
2861 cf::cede_to_tick;
2862 }
2863 }
2864
2865 {
2866 my $anims = $facedata->{animinfo};
2867
2868 while (my ($anim, $info) = each %$anims) {
2869 cf::anim::set $anim, $info->{frames}, $info->{facings};
2870 cf::cede_to_tick;
2871 }
2872
2873 cf::anim::invalidate_all; # d'oh
2874 }
2875
2876 {
2877 # TODO: for gcfclient pleasure, we should give resources
2878 # that gcfclient doesn't grok a >10000 face index.
2879 my $res = $facedata->{resource};
2880
2881 my $soundconf = delete $res->{"res/sound.conf"};
2882
2883 while (my ($name, $info) = each %$res) {
2884 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2885 my $data;
2886
2887 if ($info->{type} & 1) {
2888 # prepend meta info
2889
2890 my $meta = $enc->encode ({
2891 name => $name,
2892 %{ $info->{meta} || {} },
2893 });
2894
2895 $data = pack "(w/a*)*", $meta, $info->{data};
2896 }
2897
2898 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2899 cf::face::set_type $idx, $info->{type};
2900
2901 cf::cede_to_tick;
2902 }
2903
2904 if ($soundconf) {
2905 $soundconf = $enc->decode (delete $soundconf->{data});
2906
2907 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2908 my $sound = $soundconf->{compat}[$_]
2909 or next;
2910
2911 my $face = cf::face::find "sound/$sound->[1]";
2912 cf::sound::set $sound->[0] => $face;
2913 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2914 }
2915
2916 while (my ($k, $v) = each %{$soundconf->{event}}) {
2917 my $face = cf::face::find "sound/$v";
2918 cf::sound::set $k => $face;
2919 }
2920 }
2921 }
2922
2923 1
2924}
2925
2926register_exticmd fx_want => sub {
2927 my ($ns, $want) = @_;
2928
2929 while (my ($k, $v) = each %$want) {
2930 $ns->fx_want ($k, $v);
2931 }
2932};
2933
2934sub reload_regions {
2935 load_resource_file "$MAPDIR/regions"
2273 or die "unable to load regions file\n";#d# 2936 or die "unable to load regions file\n";
2937
2938 for (cf::region::list) {
2939 $_->{match} = qr/$_->{match}/
2940 if exists $_->{match};
2941 }
2942}
2943
2944sub reload_facedata {
2945 load_facedata "$DATADIR/facedata"
2946 or die "unable to load facedata\n";
2947}
2948
2949sub reload_archetypes {
2950 load_resource_file "$DATADIR/archetypes"
2951 or die "unable to load archetypes\n";
2952 #d# NEED to laod twice to resolve forward references
2953 # this really needs to be done in an extra post-pass
2954 # (which needs to be synchronous, so solve it differently)
2955 load_resource_file "$DATADIR/archetypes"
2956 or die "unable to load archetypes\n";
2957}
2958
2959sub reload_treasures {
2960 load_resource_file "$DATADIR/treasures"
2961 or die "unable to load treasurelists\n";
2962}
2963
2964sub reload_resources {
2965 warn "reloading resource files...\n";
2966
2967 reload_regions;
2968 reload_facedata;
2969 #reload_archetypes;#d#
2970 reload_archetypes;
2971 reload_treasures;
2972
2973 warn "finished reloading resource files\n";
2974}
2975
2976sub init {
2977 reload_resources;
2274} 2978}
2275 2979
2276sub cfg_load { 2980sub cfg_load {
2277 open my $fh, "<:utf8", cf::confdir . "/config" 2981 open my $fh, "<:utf8", "$CONFDIR/config"
2278 or return; 2982 or return;
2279 2983
2280 local $/; 2984 local $/;
2281 *CFG = YAML::Syck::Load <$fh>; 2985 *CFG = YAML::Syck::Load <$fh>;
2282 2986
2290 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2994 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2291 and die "WARNING: m(un)lockall failed: $!\n"; 2995 and die "WARNING: m(un)lockall failed: $!\n";
2292 }; 2996 };
2293 warn $@ if $@; 2997 warn $@ if $@;
2294 } 2998 }
2295}
2296
2297sub init {
2298 init_resources;
2299} 2999}
2300 3000
2301sub main { 3001sub main {
2302 # we must not ever block the main coroutine 3002 # we must not ever block the main coroutine
2303 local $Coro::idle = sub { 3003 local $Coro::idle = sub {
2331 }, 3031 },
2332 ); 3032 );
2333 } 3033 }
2334} 3034}
2335 3035
3036sub write_runtime {
3037 my $runtime = "$LOCALDIR/runtime";
3038
3039 # first touch the runtime file to show we are still running:
3040 # the fsync below can take a very very long time.
3041
3042 IO::AIO::aio_utime $runtime, undef, undef;
3043
3044 my $guard = cf::lock_acquire "write_runtime";
3045
3046 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3047 or return;
3048
3049 my $value = $cf::RUNTIME + 90 + 10;
3050 # 10 is the runtime save interval, for a monotonic clock
3051 # 60 allows for the watchdog to kill the server.
3052
3053 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3054 and return;
3055
3056 # always fsync - this file is important
3057 aio_fsync $fh
3058 and return;
3059
3060 # touch it again to show we are up-to-date
3061 aio_utime $fh, undef, undef;
3062
3063 close $fh
3064 or return;
3065
3066 aio_rename "$runtime~", $runtime
3067 and return;
3068
3069 warn "runtime file written.\n";
3070
3071 1
3072}
3073
2336sub emergency_save() { 3074sub emergency_save() {
2337 my $freeze_guard = cf::freeze_mainloop; 3075 my $freeze_guard = cf::freeze_mainloop;
2338 3076
2339 warn "enter emergency perl save\n"; 3077 warn "enter emergency perl save\n";
2340 3078
2371 3109
2372 warn Carp::longmess "post_cleanup backtrace" 3110 warn Carp::longmess "post_cleanup backtrace"
2373 if $make_core; 3111 if $make_core;
2374} 3112}
2375 3113
2376sub reload() { 3114sub do_reload_perl() {
2377 # can/must only be called in main 3115 # can/must only be called in main
2378 if ($Coro::current != $Coro::main) { 3116 if ($Coro::current != $Coro::main) {
2379 warn "can only reload from main coroutine"; 3117 warn "can only reload from main coroutine";
2380 return; 3118 return;
2381 } 3119 }
2406 Coro::cede; 3144 Coro::cede;
2407 last unless IO::AIO::nreqs || BDB::nreqs; 3145 last unless IO::AIO::nreqs || BDB::nreqs;
2408 warn "iterate..."; 3146 warn "iterate...";
2409 } 3147 }
2410 3148
3149 ++$RELOAD;
3150
2411 warn "cancelling all extension coros"; 3151 warn "cancelling all extension coros";
2412 $_->cancel for values %EXT_CORO; 3152 $_->cancel for values %EXT_CORO;
2413 %EXT_CORO = (); 3153 %EXT_CORO = ();
2414 3154
2415 warn "removing commands"; 3155 warn "removing commands";
2416 %COMMAND = (); 3156 %COMMAND = ();
2417 3157
2418 warn "removing ext commands"; 3158 warn "removing ext/exti commands";
2419 %EXTCMD = (); 3159 %EXTCMD = ();
3160 %EXTICMD = ();
2420 3161
2421 warn "unloading/nuking all extensions"; 3162 warn "unloading/nuking all extensions";
2422 for my $pkg (@EXTS) { 3163 for my $pkg (@EXTS) {
2423 warn "... unloading $pkg"; 3164 warn "... unloading $pkg";
2424 3165
2454 Symbol::delete_package "safe::$_" 3195 Symbol::delete_package "safe::$_"
2455 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3196 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2456 3197
2457 warn "unloading cf.pm \"a bit\""; 3198 warn "unloading cf.pm \"a bit\"";
2458 delete $INC{"cf.pm"}; 3199 delete $INC{"cf.pm"};
3200 delete $INC{"cf/pod.pm"};
2459 3201
2460 # don't, removes xs symbols, too, 3202 # don't, removes xs symbols, too,
2461 # and global variables created in xs 3203 # and global variables created in xs
2462 #Symbol::delete_package __PACKAGE__; 3204 #Symbol::delete_package __PACKAGE__;
2463 3205
2478 warn "reattaching attachments to maps"; 3220 warn "reattaching attachments to maps";
2479 reattach $_ for values %MAP; 3221 reattach $_ for values %MAP;
2480 warn "reattaching attachments to players"; 3222 warn "reattaching attachments to players";
2481 reattach $_ for values %PLAYER; 3223 reattach $_ for values %PLAYER;
2482 3224
2483 warn "loading reloadable resources";
2484 init_resources;
2485
2486 warn "leaving sync_job"; 3225 warn "leaving sync_job";
2487 3226
2488 1 3227 1
2489 } or do { 3228 } or do {
2490 warn $@; 3229 warn $@;
2495 warn "reloaded"; 3234 warn "reloaded";
2496}; 3235};
2497 3236
2498our $RELOAD_WATCHER; # used only during reload 3237our $RELOAD_WATCHER; # used only during reload
2499 3238
3239sub reload_perl() {
3240 # doing reload synchronously and two reloads happen back-to-back,
3241 # coro crashes during coro_state_free->destroy here.
3242
3243 $RELOAD_WATCHER ||= Event->timer (
3244 reentrant => 0,
3245 after => 0,
3246 data => WF_AUTOCANCEL,
3247 cb => sub {
3248 do_reload_perl;
3249 undef $RELOAD_WATCHER;
3250 },
3251 );
3252}
3253
2500register_command "reload" => sub { 3254register_command "reload" => sub {
2501 my ($who, $arg) = @_; 3255 my ($who, $arg) = @_;
2502 3256
2503 if ($who->flag (FLAG_WIZ)) { 3257 if ($who->flag (FLAG_WIZ)) {
2504 $who->message ("reloading server."); 3258 $who->message ("reloading server.");
2505 3259 async { reload_perl };
2506 # doing reload synchronously and two reloads happen back-to-back,
2507 # coro crashes during coro_state_free->destroy here.
2508
2509 $RELOAD_WATCHER ||= Event->timer (
2510 reentrant => 0,
2511 after => 0,
2512 data => WF_AUTOCANCEL,
2513 cb => sub {
2514 reload;
2515 undef $RELOAD_WATCHER;
2516 },
2517 );
2518 } 3260 }
2519}; 3261};
2520 3262
2521unshift @INC, $LIBDIR; 3263unshift @INC, $LIBDIR;
2522 3264
2523my $bug_warning = 0; 3265my $bug_warning = 0;
2524 3266
3267our @WAIT_FOR_TICK;
3268our @WAIT_FOR_TICK_BEGIN;
3269
3270sub wait_for_tick {
3271 return unless $TICK_WATCHER->is_active;
3272 return if $Coro::current == $Coro::main;
3273
3274 my $signal = new Coro::Signal;
3275 push @WAIT_FOR_TICK, $signal;
3276 $signal->wait;
3277}
3278
3279sub wait_for_tick_begin {
3280 return unless $TICK_WATCHER->is_active;
3281 return if $Coro::current == $Coro::main;
3282
3283 my $signal = new Coro::Signal;
3284 push @WAIT_FOR_TICK_BEGIN, $signal;
3285 $signal->wait;
3286}
3287
3288 my $min = 1e6;#d#
3289 my $avg = 10;
2525$TICK_WATCHER = Event->timer ( 3290$TICK_WATCHER = Event->timer (
2526 reentrant => 0, 3291 reentrant => 0,
2527 parked => 1, 3292 parked => 1,
2528 prio => 0, 3293 prio => 0,
2529 at => $NEXT_TICK || $TICK, 3294 at => $NEXT_TICK || $TICK,
2533 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3298 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2534 unless ++$bug_warning > 10; 3299 unless ++$bug_warning > 10;
2535 return; 3300 return;
2536 } 3301 }
2537 3302
2538 $NOW = Event::time; 3303 $NOW = $tick_start = Event::time;
2539 3304
2540 cf::server_tick; # one server iteration 3305 cf::server_tick; # one server iteration
3306
3307 0 && sync_job {#d#
3308 for(1..10) {
3309 my $t = Event::time;
3310 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3311 or die;
3312
3313 $map->width (50);
3314 $map->height (50);
3315 $map->alloc;
3316 $map->_load_objects ("/tmp/x.map", 1);
3317 my $t = Event::time - $t;
3318
3319 #next unless $t < 0.0013;#d#
3320 if ($t < $min) {
3321 $min = $t;
3322 }
3323 $avg = $avg * 0.99 + $t * 0.01;
3324 }
3325 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3326 exit 0;
3327 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3328 };
3329
2541 $RUNTIME += $TICK; 3330 $RUNTIME += $TICK;
2542 $NEXT_TICK += $TICK; 3331 $NEXT_TICK += $TICK;
2543 3332
2544 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3333 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2545 $NEXT_RUNTIME_WRITE = $NOW + 10; 3334 $NEXT_RUNTIME_WRITE = $NOW + 10;
2547 write_runtime 3336 write_runtime
2548 or warn "ERROR: unable to write runtime file: $!"; 3337 or warn "ERROR: unable to write runtime file: $!";
2549 }; 3338 };
2550 } 3339 }
2551 3340
2552 $WAIT_FOR_TICK->broadcast;
2553 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2554
2555# my $AFTER = Event::time; 3341# my $AFTER = Event::time;
2556# warn $AFTER - $NOW;#d# 3342# warn $AFTER - $NOW;#d#
2557 3343
3344 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3345 $sig->send;
3346 }
3347 while (my $sig = shift @WAIT_FOR_TICK) {
3348 $sig->send;
3349 }
3350
3351 $NOW = Event::time;
3352
2558 # if we are delayed by four ticks or more, skip them all 3353 # if we are delayed by four ticks or more, skip them all
2559 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3354 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2560 3355
2561 $TICK_WATCHER->at ($NEXT_TICK); 3356 $TICK_WATCHER->at ($NEXT_TICK);
2562 $TICK_WATCHER->start; 3357 $TICK_WATCHER->start;
3358
3359 $LOAD = ($NOW - $tick_start) / $TICK;
3360 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3361
3362 _post_tick;
3363
3364
2563 }, 3365 },
2564); 3366);
2565 3367
2566{ 3368{
2567 BDB::max_poll_time $TICK * 0.1; 3369 BDB::max_poll_time $TICK * 0.1;
2595 3397
2596 cf::sync_job { 3398 cf::sync_job {
2597 eval { 3399 eval {
2598 BDB::db_env_open 3400 BDB::db_env_open
2599 $DB_ENV, 3401 $DB_ENV,
2600 $BDB_ENV_DIR, 3402 $BDBDIR,
2601 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3403 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2602 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3404 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2603 0666; 3405 0666;
2604 3406
2605 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3407 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2606 3408
2607 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3409 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2608 $DB_ENV->set_lk_detect; 3410 $DB_ENV->set_lk_detect;
2609 }; 3411 };
2610 3412
2626 prio => 6, 3428 prio => 6,
2627 cb => \&IO::AIO::poll_cb, 3429 cb => \&IO::AIO::poll_cb,
2628 ); 3430 );
2629} 3431}
2630 3432
3433my $_log_backtrace;
3434
3435sub _log_backtrace {
3436 my ($msg, @addr) = @_;
3437
3438 $msg =~ s/\n//;
3439
3440 # limit the # of concurrent backtraces
3441 if ($_log_backtrace < 2) {
3442 ++$_log_backtrace;
3443 async {
3444 my @bt = fork_call {
3445 @addr = map { sprintf "%x", $_ } @addr;
3446 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3447 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3448 or die "addr2line: $!";
3449
3450 my @funcs;
3451 my @res = <$fh>;
3452 chomp for @res;
3453 while (@res) {
3454 my ($func, $line) = splice @res, 0, 2, ();
3455 push @funcs, "[$func] $line";
3456 }
3457
3458 @funcs
3459 };
3460
3461 LOG llevInfo, "[ABT] $msg\n";
3462 LOG llevInfo, "[ABT] $_\n" for @bt;
3463 --$_log_backtrace;
3464 };
3465 } else {
3466 LOG llevInfo, "[ABT] $msg\n";
3467 LOG llevInfo, "[ABT] [suppressed]\n";
3468 }
3469}
3470
3471# load additional modules
3472use cf::pod;
3473
2631END { cf::emergency_save } 3474END { cf::emergency_save }
2632 3475
26331 34761
2634 3477

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines