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.232 by root, Wed Apr 4 02:07:19 2007 UTC vs.
Revision 1.346 by root, Tue Aug 28 19:38:40 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 cf::cede_to_tick;
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"
376} 607}
377 608
378=item cf::datalog type => key => value, ... 609=item cf::datalog type => key => value, ...
379 610
380Log a datalog packet of the given type with the given key-value pairs. 611Log a datalog packet of the given type with the given key-value pairs.
398attach callbacks/event handlers (a collection of which is called an "attachment") 629attach callbacks/event handlers (a collection of which is called an "attachment")
399to it. All such attachable objects support the following methods. 630to it. All such attachable objects support the following methods.
400 631
401In 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>
402C<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
403crossfire+). 634Crossfire TRT).
404 635
405=over 4 636=over 4
406 637
407=item $attachable->attach ($attachment, key => $value...) 638=item $attachable->attach ($attachment, key => $value...)
408 639
571 $registry = $CB_TYPE[$object_type] ||= []; 802 $registry = $CB_TYPE[$object_type] ||= [];
572 803
573 } elsif ($type eq "subtype") { 804 } elsif ($type eq "subtype") {
574 defined $object_type or Carp::croak "subtype specified without type"; 805 defined $object_type or Carp::croak "subtype specified without type";
575 my $object_subtype = shift @arg; 806 my $object_subtype = shift @arg;
576 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 807 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
577 808
578 } elsif ($type eq "package") { 809 } elsif ($type eq "package") {
579 my $pkg = shift @arg; 810 my $pkg = shift @arg;
580 811
581 while (my ($name, $id) = each %cb_id) { 812 while (my ($name, $id) = each %cb_id) {
610 _attach $registry, $klass, @attach; 841 _attach $registry, $klass, @attach;
611 } 842 }
612 843
613 $obj->{$name} = \%arg; 844 $obj->{$name} = \%arg;
614 } else { 845 } else {
615 warn "object uses attachment '$name' that is not available, postponing.\n"; 846 warn "object uses attachment '$name' which is not available, postponing.\n";
616 } 847 }
617 848
618 $obj->{_attachment}{$name} = undef; 849 $obj->{_attachment}{$name} = undef;
619} 850}
620 851
622 if (ref $_[0]) { 853 if (ref $_[0]) {
623 _object_attach @_; 854 _object_attach @_;
624 } else { 855 } else {
625 _attach shift->_attach_registry, @_; 856 _attach shift->_attach_registry, @_;
626 } 857 }
858 _recalc_want;
627}; 859};
628 860
629# all those should be optimised 861# all those should be optimised
630sub cf::attachable::detach { 862sub cf::attachable::detach {
631 my ($obj, $name) = @_; 863 my ($obj, $name) = @_;
634 delete $obj->{_attachment}{$name}; 866 delete $obj->{_attachment}{$name};
635 reattach ($obj); 867 reattach ($obj);
636 } else { 868 } else {
637 Carp::croak "cannot, currently, detach class attachments"; 869 Carp::croak "cannot, currently, detach class attachments";
638 } 870 }
871 _recalc_want;
639}; 872};
640 873
641sub cf::attachable::attached { 874sub cf::attachable::attached {
642 my ($obj, $name) = @_; 875 my ($obj, $name) = @_;
643 876
658 "; 891 ";
659 die if $@; 892 die if $@;
660} 893}
661 894
662our $override; 895our $override;
663our @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?
664 897
665sub override { 898sub override {
666 $override = 1; 899 $override = 1;
667 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
668} 901}
669 902
670sub do_invoke { 903sub do_invoke {
671 my $event = shift; 904 my $event = shift;
672 my $callbacks = shift; 905 my $callbacks = shift;
673 906
674 @invoke_results = (); 907 @INVOKE_RESULTS = ();
675 908
676 local $override; 909 local $override;
677 910
678 for (@$callbacks) { 911 for (@$callbacks) {
679 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
696 929
697Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
698 931
699This 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
700removed 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
701results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
702 935
703=back 936=back
704 937
705=cut 938=cut
706 939
707############################################################################# 940#############################################################################
708# 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}
709 953
710sub reattach { 954sub reattach {
711 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
712 my ($obj) = @_; 956 my ($obj) = @_;
713 957
816 or return; 1060 or return;
817 $av = eval { (Storable::thaw $av)->{objs} }; 1061 $av = eval { (Storable::thaw $av)->{objs} };
818 } 1062 }
819 1063
820 warn sprintf "loading %s (%d)\n", 1064 warn sprintf "loading %s (%d)\n",
821 $filename, length $data, scalar @{$av || []};#d# 1065 $filename, length $data, scalar @{$av || []};
822 return ($data, $av); 1066 return ($data, $av);
823} 1067}
1068
1069=head2 COMMAND CALLBACKS
1070
1071=over 4
1072
1073=cut
824 1074
825############################################################################# 1075#############################################################################
826# command handling &c 1076# command handling &c
827 1077
828=item cf::register_command $name => \&callback($ob,$args); 1078=item cf::register_command $name => \&callback($ob,$args);
841 push @{ $COMMAND{$name} }, [$caller, $cb]; 1091 push @{ $COMMAND{$name} }, [$caller, $cb];
842} 1092}
843 1093
844=item cf::register_extcmd $name => \&callback($pl,$packet); 1094=item cf::register_extcmd $name => \&callback($pl,$packet);
845 1095
846Register 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.
847 1101
848If 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
849called. 1103called.
850 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
851=cut 1116=cut
852 1117
853sub register_extcmd { 1118sub register_extcmd {
854 my ($name, $cb) = @_; 1119 my ($name, $cb) = @_;
855 1120
856 $EXTCMD{$name} = $cb; 1121 $EXTCMD{$name} = $cb;
1122}
1123
1124sub register_exticmd {
1125 my ($name, $cb) = @_;
1126
1127 $EXTICMD{$name} = $cb;
857} 1128}
858 1129
859cf::player->attach ( 1130cf::player->attach (
860 on_command => sub { 1131 on_command => sub {
861 my ($pl, $name, $params) = @_; 1132 my ($pl, $name, $params) = @_;
870 cf::override; 1141 cf::override;
871 }, 1142 },
872 on_extcmd => sub { 1143 on_extcmd => sub {
873 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
874 1145
875 my $msg = eval { from_json $buf }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
876 1147
877 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
878 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1156 if (my $cb = $EXTCMD{$type}) {
879 if (my %reply = $cb->($pl, $msg)) { 1157 @reply = $cb->($pl, @payload);
880 $pl->ext_reply ($msg->{msgid}, %reply);
881 }
882 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
883 } else { 1163 } else {
884 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
885 } 1165 }
886 1166
887 cf::override; 1167 cf::override;
888 }, 1168 },
889); 1169);
890 1170
891sub load_extension {
892 my ($path) = @_;
893
894 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
895 my $base = $1;
896 my $pkg = $1;
897 $pkg =~ s/[^[:word:]]/_/g;
898 $pkg = "ext::$pkg";
899
900 warn "... loading '$path' into '$pkg'\n";
901
902 open my $fh, "<:utf8", $path
903 or die "$path: $!";
904
905 my $source =
906 "package $pkg; use strict; use utf8;\n"
907 . "#line 1 \"$path\"\n{\n"
908 . (do { local $/; <$fh> })
909 . "\n};\n1";
910
911 unless (eval $source) {
912 my $msg = $@ ? "$path: $@\n"
913 : "extension disabled.\n";
914 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
915 warn $@;
916 warn "mandatory extension failed to load, exiting.\n";
917 exit 1;
918 }
919 die $@;
920 }
921
922 push @EXTS, $pkg;
923}
924
925sub load_extensions { 1171sub load_extensions {
1172 cf::sync_job {
1173 my %todo;
1174
926 for my $ext (<$LIBDIR/*.ext>) { 1175 for my $path (<$LIBDIR/*.ext>) {
927 next unless -r $ext; 1176 next unless -r $path;
928 eval { 1177
929 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;
930 1 1235 }
931 } or warn "$ext not loaded: $@"; 1236
1237 skip:
1238 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1239 unless $progress;
1240 }
932 } 1241 };
933} 1242}
934 1243
935############################################################################# 1244#############################################################################
936 1245
1246=back
1247
937=head2 CORE EXTENSIONS 1248=head2 CORE EXTENSIONS
938 1249
939Functions and methods that extend core crossfire objects. 1250Functions and methods that extend core crossfire objects.
940 1251
941=cut 1252=cut
953Returns the given player object, loading it if necessary (might block). 1264Returns the given player object, loading it if necessary (might block).
954 1265
955=cut 1266=cut
956 1267
957sub playerdir($) { 1268sub playerdir($) {
958 cf::localdir 1269 "$PLAYERDIR/"
959 . "/"
960 . cf::playerdir
961 . "/"
962 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1270 . (ref $_[0] ? $_[0]->ob->name : $_[0])
963} 1271}
964 1272
965sub path($) { 1273sub path($) {
966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1274 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
967 1275
968 (playerdir $login) . "/$login.pl" 1276 (playerdir $login) . "/playerdata"
969} 1277}
970 1278
971sub find_active($) { 1279sub find_active($) {
972 $cf::PLAYER{$_[0]} 1280 $cf::PLAYER{$_[0]}
973 and $cf::PLAYER{$_[0]}->active 1281 and $cf::PLAYER{$_[0]}->active
986 my $login = $_[0]; 1294 my $login = $_[0];
987 1295
988 my $guard = cf::lock_acquire "user_find:$login"; 1296 my $guard = cf::lock_acquire "user_find:$login";
989 1297
990 $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
991 my $pl = load_pl path $login 1306 my $pl = load_pl path $login
992 or return; 1307 or return;
993 $cf::PLAYER{$login} = $pl 1308 $cf::PLAYER{$login} = $pl
994 } 1309 }
995 } 1310 }
1007 1322
1008 aio_mkdir playerdir $pl, 0770; 1323 aio_mkdir playerdir $pl, 0770;
1009 $pl->{last_save} = $cf::RUNTIME; 1324 $pl->{last_save} = $cf::RUNTIME;
1010 1325
1011 $pl->save_pl ($path); 1326 $pl->save_pl ($path);
1012 Coro::cede; 1327 cf::cede_to_tick;
1013} 1328}
1014 1329
1015sub new($) { 1330sub new($) {
1016 my ($login) = @_; 1331 my ($login) = @_;
1017 1332
1021 $self->{deny_save} = 1; 1336 $self->{deny_save} = 1;
1022 1337
1023 $cf::PLAYER{$login} = $self; 1338 $cf::PLAYER{$login} = $self;
1024 1339
1025 $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 (@_);
1026} 1351}
1027 1352
1028=item $pl->quit_character 1353=item $pl->quit_character
1029 1354
1030Nukes the player without looking back. If logged in, the connection will 1355Nukes the player without looking back. If logged in, the connection will
1079while and may block, so not sync_job-capable, ever. 1404while and may block, so not sync_job-capable, ever.
1080 1405
1081=cut 1406=cut
1082 1407
1083sub list_logins { 1408sub list_logins {
1084 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1409 my $dirs = aio_readdir $PLAYERDIR
1085 or return []; 1410 or return [];
1086 1411
1087 my @logins; 1412 my @logins;
1088 1413
1089 for my $login (@$dirs) { 1414 for my $login (@$dirs) {
1124 } 1449 }
1125 1450
1126 \@paths 1451 \@paths
1127} 1452}
1128 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
1129=item $player->ext_reply ($msgid, %msg) 1504=item $player->ext_reply ($msgid, @msg)
1130 1505
1131Sends an ext reply to the player. 1506Sends an ext reply to the player.
1132 1507
1133=cut 1508=cut
1134 1509
1135sub ext_reply($$%) { 1510sub ext_reply($$@) {
1136 my ($self, $id, %msg) = @_; 1511 my ($self, $id, @msg) = @_;
1137 1512
1138 $msg{msgid} = $id; 1513 $self->ns->ext_reply ($id, @msg)
1139
1140 $self->send ("ext " . cf::to_json \%msg);
1141} 1514}
1142 1515
1143=item $player->ext_event ($type, %msg) 1516=item $player->ext_msg ($type, @msg)
1144 1517
1145Sends an ext event to the client. 1518Sends an ext event to the client.
1146 1519
1147=cut 1520=cut
1148 1521
1149sub ext_event($$%) { 1522sub ext_msg($$@) {
1150 my ($self, $type, %msg) = @_; 1523 my ($self, $type, @msg) = @_;
1151 1524
1152 $self->ns->ext_event ($type, %msg); 1525 $self->ns->ext_msg ($type, @msg);
1153} 1526}
1154 1527
1155package cf; 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}
1156 1556
1157=back 1557=back
1158
1159 1558
1160=head3 cf::map 1559=head3 cf::map
1161 1560
1162=over 4 1561=over 4
1163 1562
1218 my ($self, $merge) = @_; 1617 my ($self, $merge) = @_;
1219 1618
1220 # we have to keep some variables in memory intact 1619 # we have to keep some variables in memory intact
1221 local $self->{path}; 1620 local $self->{path};
1222 local $self->{load_path}; 1621 local $self->{load_path};
1223 local $self->{deny_save};
1224 local $self->{deny_reset};
1225 1622
1226 $self->SUPER::thawer_merge ($merge); 1623 $self->SUPER::thawer_merge ($merge);
1227} 1624}
1228 1625
1229sub normalise { 1626sub normalise {
1276 $self->init; # pass $1 etc. 1673 $self->init; # pass $1 etc.
1277 return $self; 1674 return $self;
1278 } 1675 }
1279 } 1676 }
1280 1677
1281 Carp::carp "unable to resolve path '$path' (base '$base')."; 1678 Carp::cluck "unable to resolve path '$path' (base '$base').";
1282 () 1679 ()
1283} 1680}
1284 1681
1285sub init { 1682sub init {
1286 my ($self) = @_; 1683 my ($self) = @_;
1301 1698
1302# the original (read-only) location 1699# the original (read-only) location
1303sub load_path { 1700sub load_path {
1304 my ($self) = @_; 1701 my ($self) = @_;
1305 1702
1306 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1703 "$MAPDIR/$self->{path}.map"
1307} 1704}
1308 1705
1309# the temporary/swap location 1706# the temporary/swap location
1310sub save_path { 1707sub save_path {
1311 my ($self) = @_; 1708 my ($self) = @_;
1312 1709
1313 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1710 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1314 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1711 "$TMPDIR/$path.map"
1315} 1712}
1316 1713
1317# the unique path, undef == no special unique path 1714# the unique path, undef == no special unique path
1318sub uniq_path { 1715sub uniq_path {
1319 my ($self) = @_; 1716 my ($self) = @_;
1320 1717
1321 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1718 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1322 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1719 "$UNIQUEDIR/$path"
1323} 1720}
1324 1721
1325# and all this just because we cannot iterate over 1722# and all this just because we cannot iterate over
1326# all maps in C++... 1723# all maps in C++...
1327sub change_all_map_light { 1724sub change_all_map_light {
1328 my ($change) = @_; 1725 my ($change) = @_;
1329 1726
1330 $_->change_map_light ($change) 1727 $_->change_map_light ($change)
1331 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;
1332} 1737}
1333 1738
1334sub unlink_save { 1739sub unlink_save {
1335 my ($self) = @_; 1740 my ($self) = @_;
1336 1741
1394 $self->load_header_orig 1799 $self->load_header_orig
1395 or return; 1800 or return;
1396 $self->prepare_orig; 1801 $self->prepare_orig;
1397 } 1802 }
1398 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
1399 1 1810 1
1400} 1811}
1401 1812
1402sub find; 1813sub find;
1403sub find { 1814sub find {
1415 $map->{last_save} = $cf::RUNTIME; 1826 $map->{last_save} = $cf::RUNTIME;
1416 1827
1417 $map->load_header 1828 $map->load_header
1418 or return; 1829 or return;
1419 1830
1420 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1421 # doing this can freeze the server in a sync job, obviously 1832 # doing this can freeze the server in a sync job, obviously
1422 #$cf::WAIT_FOR_TICK->wait; 1833 #$cf::WAIT_FOR_TICK->wait;
1423 $map->reset; 1834 $map->reset;
1424 undef $guard; 1835 undef $guard;
1425 return find $path; 1836 return find $path;
1436 my ($self) = @_; 1847 my ($self) = @_;
1437 1848
1438 local $self->{deny_reset} = 1; # loading can take a long time 1849 local $self->{deny_reset} = 1; # loading can take a long time
1439 1850
1440 my $path = $self->{path}; 1851 my $path = $self->{path};
1852
1853 {
1854 my $guard1 = cf::lock_acquire "map_data:$path";
1441 my $guard = cf::lock_acquire "map_load:$path"; 1855 my $guard2 = cf::lock_acquire "map_load:$path";
1442 1856
1443 return if $self->in_memory != cf::MAP_SWAPPED; 1857 return if $self->in_memory != cf::MAP_SWAPPED;
1444 1858
1445 $self->in_memory (cf::MAP_LOADING); 1859 $self->in_memory (cf::MAP_LOADING);
1446 1860
1447 $self->alloc; 1861 $self->alloc;
1448 1862
1449 $self->pre_load; 1863 $self->pre_load;
1864 cf::cede_to_tick;
1450 1865
1451 $self->_load_objects ($self->{load_path}, 1) 1866 $self->_load_objects ($self->{load_path}, 1)
1452 or return; 1867 or return;
1453 1868
1454 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1869 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1455 if delete $self->{load_original}; 1870 if delete $self->{load_original};
1456 1871
1457 if (my $uniq = $self->uniq_path) { 1872 if (my $uniq = $self->uniq_path) {
1458 utf8::encode $uniq; 1873 utf8::encode $uniq;
1459 if (aio_open $uniq, O_RDONLY, 0) { 1874 if (aio_open $uniq, O_RDONLY, 0) {
1460 $self->clear_unique_items; 1875 $self->clear_unique_items;
1461 $self->_load_objects ($uniq, 0); 1876 $self->_load_objects ($uniq, 0);
1462 } 1877 }
1463 } 1878 }
1464 1879
1465 Coro::cede; 1880 cf::cede_to_tick;
1466
1467 # now do the right thing for maps 1881 # now do the right thing for maps
1468 $self->link_multipart_objects; 1882 $self->link_multipart_objects;
1469
1470 unless ($self->{deny_activate}) {
1471 $self->decay_objects;
1472 $self->fix_auto_apply;
1473 $self->update_buttons;
1474 Coro::cede;
1475 $self->set_darkness_map;
1476 $self->difficulty ($self->estimate_difficulty) 1883 $self->difficulty ($self->estimate_difficulty)
1477 unless $self->difficulty; 1884 unless $self->difficulty;
1478 Coro::cede; 1885 cf::cede_to_tick;
1886
1887 unless ($self->{deny_activate}) {
1888 $self->decay_objects;
1889 $self->fix_auto_apply;
1890 $self->update_buttons;
1891 cf::cede_to_tick;
1892 $self->set_darkness_map;
1893 cf::cede_to_tick;
1479 $self->activate; 1894 $self->activate;
1895 }
1896
1897 $self->{last_save} = $cf::RUNTIME;
1898 $self->last_access ($cf::RUNTIME);
1899
1900 $self->in_memory (cf::MAP_IN_MEMORY);
1480 } 1901 }
1481 1902
1482 $self->post_load; 1903 $self->post_load;
1483
1484 $self->in_memory (cf::MAP_IN_MEMORY);
1485} 1904}
1486 1905
1487sub customise_for { 1906sub customise_for {
1488 my ($self, $ob) = @_; 1907 my ($self, $ob) = @_;
1489 1908
1490 return find "~" . $ob->name . "/" . $self->{path} 1909 return find "~" . $ob->name . "/" . $self->{path}
1491 if $self->per_player; 1910 if $self->per_player;
1492 1911
1912# return find "?party/" . $ob->name . "/" . $self->{path}
1913# if $self->per_party;
1914
1493 $self 1915 $self
1494} 1916}
1495 1917
1496# find and load all maps in the 3x3 area around a map 1918# find and load all maps in the 3x3 area around a map
1497sub load_diag { 1919sub load_neighbours {
1498 my ($map) = @_; 1920 my ($map) = @_;
1499 1921
1500 my @diag; # diagonal neighbours 1922 my @neigh; # diagonal neighbours
1501 1923
1502 for (0 .. 3) { 1924 for (0 .. 3) {
1503 my $neigh = $map->tile_path ($_) 1925 my $neigh = $map->tile_path ($_)
1504 or next; 1926 or next;
1505 $neigh = find $neigh, $map 1927 $neigh = find $neigh, $map
1506 or next; 1928 or next;
1507 $neigh->load; 1929 $neigh->load;
1508 1930
1931 push @neigh,
1509 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1932 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1510 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1933 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1511 } 1934 }
1512 1935
1513 for (@diag) { 1936 for (grep defined $_->[0], @neigh) {
1937 my ($path, $origin) = @$_;
1514 my $neigh = find @$_ 1938 my $neigh = find $path, $origin
1515 or next; 1939 or next;
1516 $neigh->load; 1940 $neigh->load;
1517 } 1941 }
1518} 1942}
1519 1943
1524} 1948}
1525 1949
1526sub do_load_sync { 1950sub do_load_sync {
1527 my ($map) = @_; 1951 my ($map) = @_;
1528 1952
1953 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1954 if $Coro::current == $Coro::main;
1955
1529 cf::sync_job { $map->load }; 1956 cf::sync_job { $map->load };
1530} 1957}
1531 1958
1532our %MAP_PREFETCH; 1959our %MAP_PREFETCH;
1533our $MAP_PREFETCHER = undef; 1960our $MAP_PREFETCHER = undef;
1534 1961
1535sub find_async { 1962sub find_async {
1536 my ($path, $origin) = @_; 1963 my ($path, $origin, $load) = @_;
1537 1964
1538 $path = normalise $path, $origin && $origin->{path}; 1965 $path = normalise $path, $origin && $origin->{path};
1539 1966
1540 if (my $map = $cf::MAP{$path}) { 1967 if (my $map = $cf::MAP{$path}) {
1541 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1968 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1542 } 1969 }
1543 1970
1544 undef $MAP_PREFETCH{$path}; 1971 $MAP_PREFETCH{$path} |= $load;
1972
1545 $MAP_PREFETCHER ||= cf::async { 1973 $MAP_PREFETCHER ||= cf::async {
1546 while (%MAP_PREFETCH) { 1974 while (%MAP_PREFETCH) {
1547 for my $path (keys %MAP_PREFETCH) { 1975 while (my ($k, $v) = each %MAP_PREFETCH) {
1548 my $map = find $path 1976 if (my $map = find $k) {
1549 or next;
1550 $map->load; 1977 $map->load if $v;
1978 }
1551 1979
1552 delete $MAP_PREFETCH{$path}; 1980 delete $MAP_PREFETCH{$k};
1553 } 1981 }
1554 } 1982 }
1555 undef $MAP_PREFETCHER; 1983 undef $MAP_PREFETCHER;
1556 }; 1984 };
1557 $MAP_PREFETCHER->prio (6); 1985 $MAP_PREFETCHER->prio (6);
1560} 1988}
1561 1989
1562sub save { 1990sub save {
1563 my ($self) = @_; 1991 my ($self) = @_;
1564 1992
1565 my $lock = cf::lock_acquire "map_data:" . $self->path; 1993 my $lock = cf::lock_acquire "map_data:$self->{path}";
1566 1994
1567 $self->{last_save} = $cf::RUNTIME; 1995 $self->{last_save} = $cf::RUNTIME;
1568 1996
1569 return unless $self->dirty; 1997 return unless $self->dirty;
1570 1998
1593 my ($self) = @_; 2021 my ($self) = @_;
1594 2022
1595 # save first because save cedes 2023 # save first because save cedes
1596 $self->save; 2024 $self->save;
1597 2025
1598 my $lock = cf::lock_acquire "map_data:" . $self->path; 2026 my $lock = cf::lock_acquire "map_data:$self->{path}";
1599 2027
1600 return if $self->players; 2028 return if $self->players;
1601 return if $self->in_memory != cf::MAP_IN_MEMORY; 2029 return if $self->in_memory != cf::MAP_IN_MEMORY;
1602 return if $self->{deny_save}; 2030 return if $self->{deny_save};
1603 2031
1607 2035
1608sub reset_at { 2036sub reset_at {
1609 my ($self) = @_; 2037 my ($self) = @_;
1610 2038
1611 # TODO: safety, remove and allow resettable per-player maps 2039 # TODO: safety, remove and allow resettable per-player maps
1612 return 1e99 if $self->isa ("ext::map_per_player");#d#
1613 return 1e99 if $self->{deny_reset}; 2040 return 1e99 if $self->{deny_reset};
1614 2041
1615 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2042 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1616 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2043 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1617 2044
1628 my ($self) = @_; 2055 my ($self) = @_;
1629 2056
1630 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2057 my $lock = cf::lock_acquire "map_data:$self->{path}";
1631 2058
1632 return if $self->players; 2059 return if $self->players;
1633 return if $self->isa ("ext::map_per_player");#d#
1634 2060
1635 warn "resetting map ", $self->path;#d# 2061 warn "resetting map ", $self->path;
1636 2062
1637 $self->in_memory (cf::MAP_SWAPPED); 2063 $self->in_memory (cf::MAP_SWAPPED);
1638 2064
1639 # need to save uniques path 2065 # need to save uniques path
1640 unless ($self->{deny_save}) { 2066 unless ($self->{deny_save}) {
1672 $cf::MAP{$self->path} = $self; 2098 $cf::MAP{$self->path} = $self;
1673 2099
1674 $self->reset; # polite request, might not happen 2100 $self->reset; # polite request, might not happen
1675} 2101}
1676 2102
2103=item $maps = cf::map::tmp_maps
2104
2105Returns an arrayref with all map paths of currently instantiated and saved
2106maps. May block.
2107
2108=cut
2109
2110sub tmp_maps() {
2111 [
2112 map {
2113 utf8::decode $_;
2114 /\.map$/
2115 ? normalise $_
2116 : ()
2117 } @{ aio_readdir $TMPDIR or [] }
2118 ]
2119}
2120
2121=item $maps = cf::map::random_maps
2122
2123Returns an arrayref with all map paths of currently instantiated and saved
2124random maps. May block.
2125
2126=cut
2127
2128sub random_maps() {
2129 [
2130 map {
2131 utf8::decode $_;
2132 /\.map$/
2133 ? normalise "?random/$_"
2134 : ()
2135 } @{ aio_readdir $RANDOMDIR or [] }
2136 ]
2137}
2138
1677=item cf::map::unique_maps 2139=item cf::map::unique_maps
1678 2140
1679Returns an arrayref of paths of all shared maps that have 2141Returns an arrayref of paths of all shared maps that have
1680instantiated unique items. May block. 2142instantiated unique items. May block.
1681 2143
1682=cut 2144=cut
1683 2145
1684sub unique_maps() { 2146sub unique_maps() {
1685 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2147 [
1686 or return; 2148 map {
1687
1688 my @paths;
1689
1690 for (@$files) {
1691 utf8::decode $_; 2149 utf8::decode $_;
1692 next if /\.pst$/; 2150 /\.map$/
1693 next unless /^$PATH_SEP/o; 2151 ? normalise $_
1694 2152 : ()
1695 push @paths, cf::map::normalise $_; 2153 } @{ aio_readdir $UNIQUEDIR or [] }
1696 } 2154 ]
1697
1698 \@paths
1699} 2155}
1700 2156
1701package cf; 2157package cf;
1702 2158
1703=back 2159=back
1749 2205
1750 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2206 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1751 2207
1752 if ($self->{record_replies}) { 2208 if ($self->{record_replies}) {
1753 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2209 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2210
1754 } else { 2211 } else {
2212 my $pl = $self->contr;
2213
2214 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2215 my $dialog = $pl->{npc_dialog};
2216 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2217
2218 } else {
1755 $msg = $npc->name . " says: $msg" if $npc; 2219 $msg = $npc->name . " says: $msg" if $npc;
1756 $self->message ($msg, $flags); 2220 $self->message ($msg, $flags);
2221 }
1757 } 2222 }
2223}
2224
2225=item $object->send_msg ($channel, $msg, $color, [extra...])
2226
2227=cut
2228
2229sub cf::object::send_msg {
2230 my $pl = shift->contr
2231 or return;
2232 $pl->send_msg (@_);
1758} 2233}
1759 2234
1760=item $player_object->may ("access") 2235=item $player_object->may ("access")
1761 2236
1762Returns wether the given player is authorized to access resource "access" 2237Returns wether the given player is authorized to access resource "access"
1809 $self->deactivate_recursive; 2284 $self->deactivate_recursive;
1810 2285
1811 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2286 return if UNIVERSAL::isa $self->map, "ext::map_link";
1812 2287
1813 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2288 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1814 if $self->map; 2289 if $self->map && $self->map->{path} ne "{link}";
1815 2290
1816 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2291 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1817} 2292}
1818 2293
1819sub cf::object::player::leave_link { 2294sub cf::object::player::leave_link {
1820 my ($self, $map, $x, $y) = @_; 2295 my ($self, $map, $x, $y) = @_;
2296
2297 return unless $self->contr->active;
1821 2298
1822 my $link_pos = delete $self->{_link_pos}; 2299 my $link_pos = delete $self->{_link_pos};
1823 2300
1824 unless ($map) { 2301 unless ($map) {
1825 # restore original map position 2302 # restore original map position
1839 # use -1 or undef as default coordinates, not 0, 0 2316 # use -1 or undef as default coordinates, not 0, 0
1840 ($x, $y) = ($map->enter_x, $map->enter_y) 2317 ($x, $y) = ($map->enter_x, $map->enter_y)
1841 if $x <=0 && $y <= 0; 2318 if $x <=0 && $y <= 0;
1842 2319
1843 $map->load; 2320 $map->load;
1844 $map->load_diag; 2321 $map->load_neighbours;
1845 2322
1846 return unless $self->contr->active; 2323 return unless $self->contr->active;
1847 $self->activate_recursive; 2324 $self->activate_recursive;
1848 2325
1849 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2326 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1850 $self->enter_map ($map, $x, $y); 2327 $self->enter_map ($map, $x, $y);
1851} 2328}
1852 2329
1853cf::player->attach ( 2330=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1854 on_logout => sub {
1855 my ($pl) = @_;
1856 2331
1857 # abort map switching before logout 2332Moves the player to the given map-path and coordinates by first freezing
1858 if ($pl->ob->{_link_pos}) { 2333her, loading and preparing them map, calling the provided $check callback
1859 cf::sync_job { 2334that has to return the map if sucecssful, and then unfreezes the player on
1860 $pl->ob->leave_link 2335the new (success) or old (failed) map position. In either case, $done will
1861 }; 2336be called at the end of this process.
1862 }
1863 },
1864 on_login => sub {
1865 my ($pl) = @_;
1866 2337
1867 # try to abort aborted map switching on player login :)
1868 # should happen only on crashes
1869 if ($pl->ob->{_link_pos}) {
1870 $pl->ob->enter_link;
1871 (async {
1872 $pl->ob->reply (undef,
1873 "There was an internal problem at your last logout, "
1874 . "the server will try to bring you to your intended destination in a second.",
1875 cf::NDI_RED);
1876 # we need this sleep as the login has a concurrent enter_exit running
1877 # and this sleep increases chances of the player not ending up in scorn
1878 Coro::Timer::sleep 1;
1879 $pl->ob->leave_link;
1880 })->prio (2);
1881 }
1882 },
1883);
1884
1885=item $player_object->goto ($path, $x, $y)
1886
1887=cut 2338=cut
2339
2340our $GOTOGEN;
1888 2341
1889sub cf::object::player::goto { 2342sub cf::object::player::goto {
1890 my ($self, $path, $x, $y) = @_; 2343 my ($self, $path, $x, $y, $check, $done) = @_;
2344
2345 # do generation counting so two concurrent goto's will be executed in-order
2346 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1891 2347
1892 $self->enter_link; 2348 $self->enter_link;
1893 2349
1894 (async { 2350 (async {
1895 my $map = eval { 2351 my $map = eval {
1896 my $map = cf::map::find $path; 2352 my $map = cf::map::find $path;
2353
2354 if ($map) {
1897 $map = $map->customise_for ($self) if $map; 2355 $map = $map->customise_for ($self);
2356 $map = $check->($map) if $check && $map;
2357 } else {
2358 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2359 }
2360
1898 $map 2361 $map
2362 };
2363
2364 if ($@) {
2365 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2366 LOG llevError | logBacktrace, Carp::longmess $@;
1899 } or 2367 }
1900 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1901 2368
2369 if ($gen == $self->{_goto_generation}) {
2370 delete $self->{_goto_generation};
1902 $self->leave_link ($map, $x, $y); 2371 $self->leave_link ($map, $x, $y);
2372 }
2373
2374 $done->() if $done;
1903 })->prio (1); 2375 })->prio (1);
1904} 2376}
1905 2377
1906=item $player_object->enter_exit ($exit_object) 2378=item $player_object->enter_exit ($exit_object)
1907 2379
1946 2418
1947 $rmp->{random_seed} ||= $exit->random_seed; 2419 $rmp->{random_seed} ||= $exit->random_seed;
1948 2420
1949 my $data = cf::to_json $rmp; 2421 my $data = cf::to_json $rmp;
1950 my $md5 = Digest::MD5::md5_hex $data; 2422 my $md5 = Digest::MD5::md5_hex $data;
1951 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2423 my $meta = "$RANDOMDIR/$md5.meta";
1952 2424
1953 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2425 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1954 aio_write $fh, 0, (length $data), $data, 0; 2426 aio_write $fh, 0, (length $data), $data, 0;
1955 undef $fh; 2427 undef $fh;
1956 aio_rename "$meta~", $meta; 2428 aio_rename "$meta~", $meta;
1965 2437
1966 return unless $self->type == cf::PLAYER; 2438 return unless $self->type == cf::PLAYER;
1967 2439
1968 if ($exit->slaying eq "/!") { 2440 if ($exit->slaying eq "/!") {
1969 #TODO: this should de-fi-ni-te-ly not be a sync-job 2441 #TODO: this should de-fi-ni-te-ly not be a sync-job
2442 # the problem is that $exit might not survive long enough
2443 # so it needs to be done right now, right here
1970 cf::sync_job { prepare_random_map $exit }; 2444 cf::sync_job { prepare_random_map $exit };
1971 } 2445 }
1972 2446
1973 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2447 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1974 my $hp = $exit->stats->hp; 2448 my $hp = $exit->stats->hp;
1975 my $sp = $exit->stats->sp; 2449 my $sp = $exit->stats->sp;
1976 2450
1977 $self->enter_link; 2451 $self->enter_link;
2452
2453 # if exit is damned, update players death & WoR home-position
2454 $self->contr->savebed ($slaying, $hp, $sp)
2455 if $exit->flag (FLAG_DAMNED);
1978 2456
1979 (async { 2457 (async {
1980 $self->deactivate_recursive; # just to be sure 2458 $self->deactivate_recursive; # just to be sure
1981 unless (eval { 2459 unless (eval {
1982 $self->goto ($slaying, $hp, $sp); 2460 $self->goto ($slaying, $hp, $sp);
1983 2461
1984 1; 2462 1;
1985 }) { 2463 }) {
1986 $self->message ("Something went wrong deep within the crossfire server. " 2464 $self->message ("Something went wrong deep within the crossfire server. "
1987 . "I'll try to bring you back to the map you were before. " 2465 . "I'll try to bring you back to the map you were before. "
1988 . "Please report this to the dungeon master!", 2466 . "Please report this to the dungeon master!",
1989 cf::NDI_UNIQUE | cf::NDI_RED); 2467 cf::NDI_UNIQUE | cf::NDI_RED);
1990 2468
1991 warn "ERROR in enter_exit: $@"; 2469 warn "ERROR in enter_exit: $@";
1992 $self->leave_link; 2470 $self->leave_link;
1993 } 2471 }
1994 })->prio (1); 2472 })->prio (1);
2010 2488
2011 utf8::encode $text; 2489 utf8::encode $text;
2012 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2490 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2013} 2491}
2014 2492
2493=item $client->send_msg ($channel, $msg, $color, [extra...])
2494
2495Send a drawinfo or msg packet to the client, formatting the msg for the
2496client if neccessary. C<$type> should be a string identifying the type of
2497the message, with C<log> being the default. If C<$color> is negative, suppress
2498the message unless the client supports the msg packet.
2499
2500=cut
2501
2502sub cf::client::send_msg {
2503 my ($self, $channel, $msg, $color, @extra) = @_;
2504
2505 $msg = $self->pl->expand_cfpod ($msg);
2506
2507 $color &= cf::NDI_CLIENT_MASK; # just in case...
2508
2509 if (ref $channel) {
2510 # send meta info to client, if not yet sent
2511 unless (exists $self->{channel}{$channel->{id}}) {
2512 $self->{channel}{$channel->{id}} = $channel;
2513 $self->ext_msg (channel_info => $channel);
2514 }
2515
2516 $channel = $channel->{id};
2517 }
2518
2519 return unless @extra || length $msg;
2520
2521 if ($self->can_msg) {
2522 # default colour, mask it out
2523 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2524 if $color & cf::NDI_DEF;
2525
2526 $self->send_packet ("msg " . $self->{json_coder}->encode (
2527 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2528 } else {
2529 if ($color >= 0) {
2530 # replace some tags by gcfclient-compatible ones
2531 for ($msg) {
2532 1 while
2533 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2534 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2535 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2536 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2537 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2538 }
2539
2540 $color &= cf::NDI_COLOR_MASK;
2541
2542 utf8::encode $msg;
2543
2544 if (0 && $msg =~ /\[/) {
2545 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg")
2550 }
2551 }
2552 }
2553}
2554
2015=item $client->ext_event ($type, %msg) 2555=item $client->ext_msg ($type, @msg)
2016 2556
2017Sends an exti event to the client. 2557Sends an ext event to the client.
2018 2558
2019=cut 2559=cut
2020 2560
2021sub cf::client::ext_event($$%) { 2561sub cf::client::ext_msg($$@) {
2022 my ($self, $type, %msg) = @_; 2562 my ($self, $type, @msg) = @_;
2023 2563
2564 if ($self->extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($self->extcmd == 1) { # TODO: remove
2024 $msg{msgtype} = "event_$type"; 2567 push @msg, msgtype => "event_$type";
2025 $self->send_packet ("ext " . cf::to_json \%msg); 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 }
2570}
2571
2572=item $client->ext_reply ($msgid, @msg)
2573
2574Sends an ext reply to the client.
2575
2576=cut
2577
2578sub cf::client::ext_reply($$@) {
2579 my ($self, $id, @msg) = @_;
2580
2581 if ($self->extcmd == 2) {
2582 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2583 } elsif ($self->extcmd == 1) {
2584 #TODO: version 1, remove
2585 unshift @msg, msgtype => "reply", msgid => $id;
2586 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2587 }
2026} 2588}
2027 2589
2028=item $success = $client->query ($flags, "text", \&cb) 2590=item $success = $client->query ($flags, "text", \&cb)
2029 2591
2030Queues a query to the client, calling the given callback with 2592Queues a query to the client, calling the given callback with
2031the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2593the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2032C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2594C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2033 2595
2034Queries can fail, so check the return code. Or don't, as queries will become 2596Queries can fail, so check the return code. Or don't, as queries will
2035reliable at some point in the future. 2597become reliable at some point in the future.
2036 2598
2037=cut 2599=cut
2038 2600
2039sub cf::client::query { 2601sub cf::client::query {
2040 my ($self, $flags, $text, $cb) = @_; 2602 my ($self, $flags, $text, $cb) = @_;
2048 utf8::encode $text; 2610 utf8::encode $text;
2049 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2611 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2050 2612
2051 $self->send_packet ($self->{query_queue}[0][0]) 2613 $self->send_packet ($self->{query_queue}[0][0])
2052 if @{ $self->{query_queue} } == 1; 2614 if @{ $self->{query_queue} } == 1;
2615
2616 1
2053} 2617}
2054 2618
2055cf::client->attach ( 2619cf::client->attach (
2620 on_connect => sub {
2621 my ($ns) = @_;
2622
2623 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2624 },
2056 on_reply => sub { 2625 on_reply => sub {
2057 my ($ns, $msg) = @_; 2626 my ($ns, $msg) = @_;
2058 2627
2059 # this weird shuffling is so that direct followup queries 2628 # this weird shuffling is so that direct followup queries
2060 # get handled first 2629 # get handled first
2072 } else { 2641 } else {
2073 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2642 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2074 } 2643 }
2075 } 2644 }
2076 }, 2645 },
2646 on_exticmd => sub {
2647 my ($ns, $buf) = @_;
2648
2649 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2650
2651 if (ref $msg) {
2652 my ($type, $reply, @payload) =
2653 "ARRAY" eq ref $msg
2654 ? @$msg
2655 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2656
2657 my @reply;
2658
2659 if (my $cb = $EXTICMD{$type}) {
2660 @reply = $cb->($ns, @payload);
2661 }
2662
2663 $ns->ext_reply ($reply, @reply)
2664 if $reply;
2665
2666 } else {
2667 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2668 }
2669
2670 cf::override;
2671 },
2077); 2672);
2078 2673
2079=item $client->async (\&cb) 2674=item $client->async (\&cb)
2080 2675
2081Create a new coroutine, running the specified callback. The coroutine will 2676Create a new coroutine, running the specified callback. The coroutine will
2122our $safe = new Safe "safe"; 2717our $safe = new Safe "safe";
2123our $safe_hole = new Safe::Hole; 2718our $safe_hole = new Safe::Hole;
2124 2719
2125$SIG{FPE} = 'IGNORE'; 2720$SIG{FPE} = 'IGNORE';
2126 2721
2127$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2722$safe->permit_only (Opcode::opset qw(
2723 :base_core :base_mem :base_orig :base_math
2724 grepstart grepwhile mapstart mapwhile
2725 sort time
2726));
2128 2727
2129# here we export the classes and methods available to script code 2728# here we export the classes and methods available to script code
2130 2729
2131=pod 2730=pod
2132 2731
2133The following functions and methods are available within a safe environment: 2732The following functions and methods are available within a safe environment:
2134 2733
2135 cf::object contr pay_amount pay_player map 2734 cf::object
2735 contr pay_amount pay_player map x y force_find force_add
2736 insert remove name archname title slaying race decrease_ob_nr
2737
2136 cf::object::player player 2738 cf::object::player
2137 cf::player peaceful 2739 player
2138 cf::map trigger 2740
2741 cf::player
2742 peaceful
2743
2744 cf::map
2745 trigger
2139 2746
2140=cut 2747=cut
2141 2748
2142for ( 2749for (
2143 ["cf::object" => qw(contr pay_amount pay_player map)], 2750 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2751 insert remove inv name archname title slaying race
2752 decrease_ob_nr)],
2144 ["cf::object::player" => qw(player)], 2753 ["cf::object::player" => qw(player)],
2145 ["cf::player" => qw(peaceful)], 2754 ["cf::player" => qw(peaceful)],
2146 ["cf::map" => qw(trigger)], 2755 ["cf::map" => qw(trigger)],
2147) { 2756) {
2148 no strict 'refs'; 2757 no strict 'refs';
2219=back 2828=back
2220 2829
2221=cut 2830=cut
2222 2831
2223############################################################################# 2832#############################################################################
2224
2225=head2 EXTENSION DATABASE SUPPORT
2226
2227Crossfire maintains a very simple database for extension use. It can
2228currently store anything that can be serialised using Storable, which
2229excludes objects.
2230
2231The parameter C<$family> should best start with the name of the extension
2232using it, it should be unique.
2233
2234=over 4
2235
2236=item $value = cf::db_get $family => $key
2237
2238Returns a single value from the database.
2239
2240=item cf::db_put $family => $key => $value
2241
2242Stores the given C<$value> in the family.
2243
2244=cut
2245
2246our $DB;
2247
2248sub db_init {
2249 unless ($DB) {
2250 $DB = BDB::db_create $DB_ENV;
2251
2252 cf::sync_job {
2253 eval {
2254 $DB->set_flags (BDB::CHKSUM);
2255
2256 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2257 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2258 cf::cleanup "db_open(db): $!" if $!;
2259 };
2260 cf::cleanup "db_open(db): $@" if $@;
2261 };
2262
2263 my $path = cf::localdir . "/database.pst";
2264 if (stat $path) {
2265 cf::sync_job {
2266 my $pst = Storable::retrieve $path;
2267
2268 cf::db_put (board => data => $pst->{board});
2269 cf::db_put (guildrules => data => $pst->{guildrules});
2270 cf::db_put (rent => balance => $pst->{rent}{balance});
2271 BDB::db_env_txn_checkpoint $DB_ENV;
2272
2273 unlink $path;
2274 };
2275 }
2276 }
2277}
2278
2279sub db_get($$) {
2280 my $key = "$_[0]/$_[1]";
2281
2282 cf::sync_job {
2283 BDB::db_get $DB, undef, $key, my $data;
2284
2285 $! ? ()
2286 : Compress::LZF::sthaw $data
2287 }
2288}
2289
2290sub db_put($$$) {
2291 BDB::dbreq_pri 4;
2292 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2293}
2294
2295#############################################################################
2296# the server's init and main functions 2833# the server's init and main functions
2297 2834
2298sub load_facedata { 2835sub load_facedata($) {
2299 my $path = sprintf "%s/facedata", cf::datadir; 2836 my ($path) = @_;
2837
2838 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2300 2839
2301 warn "loading facedata from $path\n"; 2840 warn "loading facedata from $path\n";
2302 2841
2303 my $faces; 2842 my $facedata;
2304 0 < aio_load $path, $faces 2843 0 < aio_load $path, $facedata
2305 or die "$path: $!"; 2844 or die "$path: $!";
2306 2845
2307 Coro::cede;
2308 $faces = Storable::thaw $faces; 2846 $facedata = Coro::Storable::thaw $facedata;
2309 Coro::cede;
2310 2847
2311 my $meta = delete $faces->{""};
2312 $meta->{version} == 1 2848 $facedata->{version} == 2
2313 or cf::cleanup "$path: version mismatch, cannot proceed."; 2849 or cf::cleanup "$path: version mismatch, cannot proceed.";
2314 2850
2851 # patch in the exptable
2852 $facedata->{resource}{"res/exp_table"} = {
2853 type => FT_RSRC,
2854 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2855 };
2856 cf::cede_to_tick;
2857
2858 {
2859 my $faces = $facedata->{faceinfo};
2860
2315 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
2316 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2862 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2317 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2863 cf::face::set_visibility $idx, $info->{visibility};
2864 cf::face::set_magicmap $idx, $info->{magicmap};
2318 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2865 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2319 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2866 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2320 Coro::cede;
2321 }
2322 2867
2868 cf::cede_to_tick;
2869 }
2870
2323 while (my ($face, $info) = each %$faces) { 2871 while (my ($face, $info) = each %$faces) {
2324 next unless $info->{smooth}; 2872 next unless $info->{smooth};
2325 my $idx = cf::face::find $face 2873 my $idx = cf::face::find $face
2326 or next; 2874 or next;
2327 if (my $smooth = cf::face::find $info->{smooth}) { 2875 if (my $smooth = cf::face::find $info->{smooth}) {
2328 cf::face::set_smooth $idx, $smooth; 2876 cf::face::set_smooth $idx, $smooth;
2877 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2329 } else { 2878 } else {
2330 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2879 warn "smooth face '$info->{smooth}' not found for face '$face'";
2331 } 2880 }
2332 Coro::cede; 2881
2882 cf::cede_to_tick;
2883 }
2884 }
2885
2886 {
2887 my $anims = $facedata->{animinfo};
2888
2889 while (my ($anim, $info) = each %$anims) {
2890 cf::anim::set $anim, $info->{frames}, $info->{facings};
2891 cf::cede_to_tick;
2892 }
2893
2894 cf::anim::invalidate_all; # d'oh
2895 }
2896
2897 {
2898 # TODO: for gcfclient pleasure, we should give resources
2899 # that gcfclient doesn't grok a >10000 face index.
2900 my $res = $facedata->{resource};
2901
2902 my $soundconf = delete $res->{"res/sound.conf"};
2903
2904 while (my ($name, $info) = each %$res) {
2905 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2906 my $data;
2907
2908 if ($info->{type} & 1) {
2909 # prepend meta info
2910
2911 my $meta = $enc->encode ({
2912 name => $name,
2913 %{ $info->{meta} || {} },
2914 });
2915
2916 $data = pack "(w/a*)*", $meta, $info->{data};
2917 } else {
2918 $data = $info->{data};
2919 }
2920
2921 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2922 cf::face::set_type $idx, $info->{type};
2923
2924 cf::cede_to_tick;
2925 }
2926
2927 if ($soundconf) {
2928 $soundconf = $enc->decode (delete $soundconf->{data});
2929
2930 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2931 my $sound = $soundconf->{compat}[$_]
2932 or next;
2933
2934 my $face = cf::face::find "sound/$sound->[1]";
2935 cf::sound::set $sound->[0] => $face;
2936 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2937 }
2938
2939 while (my ($k, $v) = each %{$soundconf->{event}}) {
2940 my $face = cf::face::find "sound/$v";
2941 cf::sound::set $k => $face;
2942 }
2943 }
2333 } 2944 }
2334 2945
2335 1 2946 1
2336} 2947}
2337 2948
2949register_exticmd fx_want => sub {
2950 my ($ns, $want) = @_;
2951
2952 while (my ($k, $v) = each %$want) {
2953 $ns->fx_want ($k, $v);
2954 }
2955};
2956
2957sub reload_regions {
2958 load_resource_file "$MAPDIR/regions"
2959 or die "unable to load regions file\n";
2960
2961 for (cf::region::list) {
2962 $_->{match} = qr/$_->{match}/
2963 if exists $_->{match};
2964 }
2965}
2966
2967sub reload_facedata {
2968 load_facedata "$DATADIR/facedata"
2969 or die "unable to load facedata\n";
2970}
2971
2972sub reload_archetypes {
2973 load_resource_file "$DATADIR/archetypes"
2974 or die "unable to load archetypes\n";
2975 #d# NEED to laod twice to resolve forward references
2976 # this really needs to be done in an extra post-pass
2977 # (which needs to be synchronous, so solve it differently)
2978 load_resource_file "$DATADIR/archetypes"
2979 or die "unable to load archetypes\n";
2980}
2981
2982sub reload_treasures {
2983 load_resource_file "$DATADIR/treasures"
2984 or die "unable to load treasurelists\n";
2985}
2986
2338sub reload_resources { 2987sub reload_resources {
2339 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2988 warn "reloading resource files...\n";
2340 or die "unable to load regions file\n";#d# 2989
2990 reload_regions;
2341 load_facedata 2991 reload_facedata;
2342 or die "unable to load facedata\n";#d# 2992 #reload_archetypes;#d#
2993 reload_archetypes;
2994 reload_treasures;
2995
2996 warn "finished reloading resource files\n";
2343} 2997}
2344 2998
2345sub init { 2999sub init {
2346 reload_resources; 3000 reload_resources;
2347} 3001}
2348 3002
2349sub cfg_load { 3003sub reload_config {
2350 open my $fh, "<:utf8", cf::confdir . "/config" 3004 open my $fh, "<:utf8", "$CONFDIR/config"
2351 or return; 3005 or return;
2352 3006
2353 local $/; 3007 local $/;
2354 *CFG = YAML::Syck::Load <$fh>; 3008 *CFG = YAML::Syck::Load <$fh>;
2355 3009
2374 (async { 3028 (async {
2375 Event::one_event; 3029 Event::one_event;
2376 })->prio (Coro::PRIO_MAX); 3030 })->prio (Coro::PRIO_MAX);
2377 }; 3031 };
2378 3032
2379 cfg_load; 3033 reload_config;
2380 db_init; 3034 db_init;
2381 load_extensions; 3035 load_extensions;
2382 3036
2383 $TICK_WATCHER->start; 3037 $TICK_WATCHER->start;
2384 Event::loop; 3038 Event::loop;
2400 }, 3054 },
2401 ); 3055 );
2402 } 3056 }
2403} 3057}
2404 3058
3059sub write_runtime {
3060 my $runtime = "$LOCALDIR/runtime";
3061
3062 # first touch the runtime file to show we are still running:
3063 # the fsync below can take a very very long time.
3064
3065 IO::AIO::aio_utime $runtime, undef, undef;
3066
3067 my $guard = cf::lock_acquire "write_runtime";
3068
3069 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3070 or return;
3071
3072 my $value = $cf::RUNTIME + 90 + 10;
3073 # 10 is the runtime save interval, for a monotonic clock
3074 # 60 allows for the watchdog to kill the server.
3075
3076 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3077 and return;
3078
3079 # always fsync - this file is important
3080 aio_fsync $fh
3081 and return;
3082
3083 # touch it again to show we are up-to-date
3084 aio_utime $fh, undef, undef;
3085
3086 close $fh
3087 or return;
3088
3089 aio_rename "$runtime~", $runtime
3090 and return;
3091
3092 warn "runtime file written.\n";
3093
3094 1
3095}
3096
2405sub emergency_save() { 3097sub emergency_save() {
2406 my $freeze_guard = cf::freeze_mainloop; 3098 my $freeze_guard = cf::freeze_mainloop;
2407 3099
2408 warn "enter emergency perl save\n"; 3100 warn "enter emergency perl save\n";
2409 3101
2440 3132
2441 warn Carp::longmess "post_cleanup backtrace" 3133 warn Carp::longmess "post_cleanup backtrace"
2442 if $make_core; 3134 if $make_core;
2443} 3135}
2444 3136
2445sub reload() { 3137sub do_reload_perl() {
2446 # can/must only be called in main 3138 # can/must only be called in main
2447 if ($Coro::current != $Coro::main) { 3139 if ($Coro::current != $Coro::main) {
2448 warn "can only reload from main coroutine"; 3140 warn "can only reload from main coroutine";
2449 return; 3141 return;
2450 } 3142 }
2484 %EXT_CORO = (); 3176 %EXT_CORO = ();
2485 3177
2486 warn "removing commands"; 3178 warn "removing commands";
2487 %COMMAND = (); 3179 %COMMAND = ();
2488 3180
2489 warn "removing ext commands"; 3181 warn "removing ext/exti commands";
2490 %EXTCMD = (); 3182 %EXTCMD = ();
3183 %EXTICMD = ();
2491 3184
2492 warn "unloading/nuking all extensions"; 3185 warn "unloading/nuking all extensions";
2493 for my $pkg (@EXTS) { 3186 for my $pkg (@EXTS) {
2494 warn "... unloading $pkg"; 3187 warn "... unloading $pkg";
2495 3188
2525 Symbol::delete_package "safe::$_" 3218 Symbol::delete_package "safe::$_"
2526 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3219 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2527 3220
2528 warn "unloading cf.pm \"a bit\""; 3221 warn "unloading cf.pm \"a bit\"";
2529 delete $INC{"cf.pm"}; 3222 delete $INC{"cf.pm"};
3223 delete $INC{"cf/pod.pm"};
2530 3224
2531 # don't, removes xs symbols, too, 3225 # don't, removes xs symbols, too,
2532 # and global variables created in xs 3226 # and global variables created in xs
2533 #Symbol::delete_package __PACKAGE__; 3227 #Symbol::delete_package __PACKAGE__;
2534 3228
2537 warn "reloading cf.pm"; 3231 warn "reloading cf.pm";
2538 require cf; 3232 require cf;
2539 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2540 3234
2541 warn "loading config and database again"; 3235 warn "loading config and database again";
2542 cf::cfg_load; 3236 cf::reload_config;
2543 3237
2544 warn "loading extensions"; 3238 warn "loading extensions";
2545 cf::load_extensions; 3239 cf::load_extensions;
2546 3240
2547 warn "reattaching attachments to objects/players"; 3241 warn "reattaching attachments to objects/players";
2549 warn "reattaching attachments to maps"; 3243 warn "reattaching attachments to maps";
2550 reattach $_ for values %MAP; 3244 reattach $_ for values %MAP;
2551 warn "reattaching attachments to players"; 3245 warn "reattaching attachments to players";
2552 reattach $_ for values %PLAYER; 3246 reattach $_ for values %PLAYER;
2553 3247
2554 warn "loading reloadable resources";
2555 reload_resources;
2556
2557 warn "leaving sync_job"; 3248 warn "leaving sync_job";
2558 3249
2559 1 3250 1
2560 } or do { 3251 } or do {
2561 warn $@; 3252 warn $@;
2566 warn "reloaded"; 3257 warn "reloaded";
2567}; 3258};
2568 3259
2569our $RELOAD_WATCHER; # used only during reload 3260our $RELOAD_WATCHER; # used only during reload
2570 3261
3262sub reload_perl() {
3263 # doing reload synchronously and two reloads happen back-to-back,
3264 # coro crashes during coro_state_free->destroy here.
3265
3266 $RELOAD_WATCHER ||= Event->timer (
3267 reentrant => 0,
3268 after => 0,
3269 data => WF_AUTOCANCEL,
3270 cb => sub {
3271 do_reload_perl;
3272 undef $RELOAD_WATCHER;
3273 },
3274 );
3275}
3276
2571register_command "reload" => sub { 3277register_command "reload" => sub {
2572 my ($who, $arg) = @_; 3278 my ($who, $arg) = @_;
2573 3279
2574 if ($who->flag (FLAG_WIZ)) { 3280 if ($who->flag (FLAG_WIZ)) {
2575 $who->message ("reloading server."); 3281 $who->message ("reloading server.");
2576 3282 async { reload_perl };
2577 # doing reload synchronously and two reloads happen back-to-back,
2578 # coro crashes during coro_state_free->destroy here.
2579
2580 $RELOAD_WATCHER ||= Event->timer (
2581 reentrant => 0,
2582 after => 0,
2583 data => WF_AUTOCANCEL,
2584 cb => sub {
2585 reload;
2586 undef $RELOAD_WATCHER;
2587 },
2588 );
2589 } 3283 }
2590}; 3284};
2591 3285
2592unshift @INC, $LIBDIR; 3286unshift @INC, $LIBDIR;
2593 3287
2594my $bug_warning = 0; 3288my $bug_warning = 0;
2595 3289
3290our @WAIT_FOR_TICK;
3291our @WAIT_FOR_TICK_BEGIN;
3292
3293sub wait_for_tick {
3294 return unless $TICK_WATCHER->is_active;
3295 return if $Coro::current == $Coro::main;
3296
3297 my $signal = new Coro::Signal;
3298 push @WAIT_FOR_TICK, $signal;
3299 $signal->wait;
3300}
3301
3302sub wait_for_tick_begin {
3303 return unless $TICK_WATCHER->is_active;
3304 return if $Coro::current == $Coro::main;
3305
3306 my $signal = new Coro::Signal;
3307 push @WAIT_FOR_TICK_BEGIN, $signal;
3308 $signal->wait;
3309}
3310
3311 my $min = 1e6;#d#
3312 my $avg = 10;
2596$TICK_WATCHER = Event->timer ( 3313$TICK_WATCHER = Event->timer (
2597 reentrant => 0, 3314 reentrant => 0,
2598 parked => 1, 3315 parked => 1,
2599 prio => 0, 3316 prio => 0,
2600 at => $NEXT_TICK || $TICK, 3317 at => $NEXT_TICK || $TICK,
2604 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3321 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2605 unless ++$bug_warning > 10; 3322 unless ++$bug_warning > 10;
2606 return; 3323 return;
2607 } 3324 }
2608 3325
2609 $NOW = Event::time; 3326 $NOW = $tick_start = Event::time;
2610 3327
2611 cf::server_tick; # one server iteration 3328 cf::server_tick; # one server iteration
3329
3330 0 && sync_job {#d#
3331 for(1..10) {
3332 my $t = Event::time;
3333 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3334 or die;
3335
3336 $map->width (50);
3337 $map->height (50);
3338 $map->alloc;
3339 $map->_load_objects ("/tmp/x.map", 1);
3340 my $t = Event::time - $t;
3341
3342 #next unless $t < 0.0013;#d#
3343 if ($t < $min) {
3344 $min = $t;
3345 }
3346 $avg = $avg * 0.99 + $t * 0.01;
3347 }
3348 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3349 exit 0;
3350 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3351 };
3352
2612 $RUNTIME += $TICK; 3353 $RUNTIME += $TICK;
2613 $NEXT_TICK += $TICK; 3354 $NEXT_TICK += $TICK;
2614 3355
2615 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3356 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2616 $NEXT_RUNTIME_WRITE = $NOW + 10; 3357 $NEXT_RUNTIME_WRITE = $NOW + 10;
2618 write_runtime 3359 write_runtime
2619 or warn "ERROR: unable to write runtime file: $!"; 3360 or warn "ERROR: unable to write runtime file: $!";
2620 }; 3361 };
2621 } 3362 }
2622 3363
2623 $WAIT_FOR_TICK->broadcast;
2624 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2625
2626# my $AFTER = Event::time; 3364# my $AFTER = Event::time;
2627# warn $AFTER - $NOW;#d# 3365# warn $AFTER - $NOW;#d#
2628 3366
3367 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3368 $sig->send;
3369 }
3370 while (my $sig = shift @WAIT_FOR_TICK) {
3371 $sig->send;
3372 }
3373
3374 $NOW = Event::time;
3375
2629 # if we are delayed by four ticks or more, skip them all 3376 # if we are delayed by four ticks or more, skip them all
2630 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3377 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2631 3378
2632 $TICK_WATCHER->at ($NEXT_TICK); 3379 $TICK_WATCHER->at ($NEXT_TICK);
2633 $TICK_WATCHER->start; 3380 $TICK_WATCHER->start;
3381
3382 $LOAD = ($NOW - $tick_start) / $TICK;
3383 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3384
3385 _post_tick;
3386
3387
2634 }, 3388 },
2635); 3389);
2636 3390
2637{ 3391{
2638 BDB::max_poll_time $TICK * 0.1; 3392 BDB::max_poll_time $TICK * 0.1;
2666 3420
2667 cf::sync_job { 3421 cf::sync_job {
2668 eval { 3422 eval {
2669 BDB::db_env_open 3423 BDB::db_env_open
2670 $DB_ENV, 3424 $DB_ENV,
2671 $BDB_ENV_DIR, 3425 $BDBDIR,
2672 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3426 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2673 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3427 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2674 0666; 3428 0666;
2675 3429
2676 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3430 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2677 3431
2678 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3432 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2679 $DB_ENV->set_lk_detect; 3433 $DB_ENV->set_lk_detect;
2680 }; 3434 };
2681 3435
2697 prio => 6, 3451 prio => 6,
2698 cb => \&IO::AIO::poll_cb, 3452 cb => \&IO::AIO::poll_cb,
2699 ); 3453 );
2700} 3454}
2701 3455
3456my $_log_backtrace;
3457
3458sub _log_backtrace {
3459 my ($msg, @addr) = @_;
3460
3461 $msg =~ s/\n//;
3462
3463 # limit the # of concurrent backtraces
3464 if ($_log_backtrace < 2) {
3465 ++$_log_backtrace;
3466 async {
3467 my @bt = fork_call {
3468 @addr = map { sprintf "%x", $_ } @addr;
3469 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3470 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3471 or die "addr2line: $!";
3472
3473 my @funcs;
3474 my @res = <$fh>;
3475 chomp for @res;
3476 while (@res) {
3477 my ($func, $line) = splice @res, 0, 2, ();
3478 push @funcs, "[$func] $line";
3479 }
3480
3481 @funcs
3482 };
3483
3484 LOG llevInfo, "[ABT] $msg\n";
3485 LOG llevInfo, "[ABT] $_\n" for @bt;
3486 --$_log_backtrace;
3487 };
3488 } else {
3489 LOG llevInfo, "[ABT] $msg\n";
3490 LOG llevInfo, "[ABT] [suppressed]\n";
3491 }
3492}
3493
3494# load additional modules
3495use cf::pod;
3496
2702END { cf::emergency_save } 3497END { cf::emergency_save }
2703 3498
27041 34991
2705 3500

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines