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.234 by root, Thu Apr 5 13:44:31 2007 UTC vs.
Revision 1.349 by root, Fri Aug 31 04:10:43 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
229Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
230a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
231for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
232returned. 275returned.
233 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
234Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
235uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
282
283=item $locked = cf::lock_active $string
284
285Return true if the lock is currently active, i.e. somebody has locked it.
236 286
237=cut 287=cut
238 288
239our %LOCK; 289our %LOCK;
240 290
258 308
259 Coro::guard { 309 Coro::guard {
260 # wake up all waiters, to be on the safe side 310 # wake up all waiters, to be on the safe side
261 $_->ready for @{ delete $LOCK{$key} }; 311 $_->ready for @{ delete $LOCK{$key} };
262 } 312 }
313}
314
315sub lock_active($) {
316 my ($key) = @_;
317
318 ! ! $LOCK{$key}
263} 319}
264 320
265sub freeze_mainloop { 321sub freeze_mainloop {
266 return unless $TICK_WATCHER->is_active; 322 return unless $TICK_WATCHER->is_active;
267 323
270 }; 326 };
271 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
272 $guard 328 $guard
273} 329}
274 330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
385}
386
275=item cf::async { BLOCK } 387=item cf::async { BLOCK }
276 388
277Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
278C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 390C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
279thing you are allowed to do is call C<prio> on it. 391thing you are allowed to do is call C<prio> on it.
282 394
283BEGIN { *async = \&Coro::async_pool } 395BEGIN { *async = \&Coro::async_pool }
284 396
285=item cf::sync_job { BLOCK } 397=item cf::sync_job { BLOCK }
286 398
287The design of crossfire+ requires that the main coro ($Coro::main) is 399The design of Crossfire TRT requires that the main coroutine ($Coro::main)
288always able to handle events or runnable, as crossfire+ is only partly 400is 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. 401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable.
290 403
291If it must be done, put the blocking parts into C<sync_job>. This will run 404If 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 405the given BLOCK in another coroutine while waiting for the result. The
293server will be frozen during this time, so the block should either finish 406server will be frozen during this time, so the block should either finish
294fast or be very important. 407fast or be very important.
297 410
298sub sync_job(&) { 411sub sync_job(&) {
299 my ($job) = @_; 412 my ($job) = @_;
300 413
301 if ($Coro::current == $Coro::main) { 414 if ($Coro::current == $Coro::main) {
415 my $time = Event::time;
416
302 # this is the main coro, too bad, we have to block 417 # this is the main coro, too bad, we have to block
303 # till the operation succeeds, freezing the server :/ 418 # till the operation succeeds, freezing the server :/
304 419
305 # TODO: use suspend/resume instead 420 # TODO: use suspend/resume instead
306 # (but this is cancel-safe) 421 # (but this is cancel-safe)
317 432
318 while ($busy) { 433 while ($busy) {
319 Coro::cede or Event::one_event; 434 Coro::cede or Event::one_event;
320 } 435 }
321 436
437 $time = Event::time - $time;
438
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load
443
322 wantarray ? @res : $res[0] 444 wantarray ? @res : $res[0]
323 } else { 445 } else {
324 # we are in another coroutine, how wonderful, everything just works 446 # we are in another coroutine, how wonderful, everything just works
325 447
326 $job->() 448 $job->()
345 $EXT_CORO{$coro+0} = $coro; 467 $EXT_CORO{$coro+0} = $coro;
346 468
347 $coro 469 $coro
348} 470}
349 471
350sub write_runtime { 472=item fork_call { }, $args
351 my $guard = cf::lock_acquire "write_runtime";
352 473
353 my $runtime = cf::localdir . "/runtime"; 474Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling.
354 478
355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 479=cut
356 or return;
357 480
358 my $value = $cf::RUNTIME + 90 + 10; 481sub fork_call(&@) {
359 # 10 is the runtime save interval, for a monotonic clock 482 my ($cb, @args) = @_;
360 # 60 allows for the watchdog to kill the server.
361 483
362 (aio_write $fh, 0, (length $value), $value, 0) <= 0 484 # we seemingly have to make a local copy of the whole thing,
363 and return; 485 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious)
364 487
365 # always fsync - this file is important 488 my @res = Coro::Util::fork_eval {
366 aio_fsync $fh 489 reset_signals;
367 and return; 490 &$cb
491 }, @args;
368 492
369 close $fh 493 wantarray ? @res : $res[-1]
370 or return; 494}
371 495
372 aio_rename "$runtime~", $runtime 496=item $value = cf::db_get $family => $key
373 and return;
374 497
498Returns a single value from the environment database.
499
500=item cf::db_put $family => $key => $value
501
502Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504
505=cut
506
507our $DB;
508
509sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job {
514 eval {
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
375 1 523 }
524}
525
526sub db_get($$) {
527 my $key = "$_[0]/$_[1]";
528
529 cf::sync_job {
530 BDB::db_get $DB, undef, $key, my $data;
531
532 $! ? ()
533 : $data
534 }
535}
536
537sub db_put($$$) {
538 BDB::dbreq_pri 4;
539 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
540}
541
542=item cf::cache $id => [$paths...], $processversion => $process
543
544Generic caching function that returns the value of the resource $id,
545caching and regenerating as required.
546
547This function can block.
548
549=cut
550
551sub cache {
552 my ($id, $src, $processversion, $process) = @_;
553
554 my $meta =
555 join "\x00",
556 $processversion,
557 map {
558 aio_stat $_
559 and Carp::croak "$_: $!";
560
561 ($_, (stat _)[7,9])
562 } @$src;
563
564 my $dbmeta = db_get cache => "$id/meta";
565 if ($dbmeta ne $meta) {
566 # changed, we may need to process
567
568 my @data;
569 my $md5;
570
571 for (0 .. $#$src) {
572 0 <= aio_load $src->[$_], $data[$_]
573 or Carp::croak "$src->[$_]: $!";
574 }
575
576 # if processing is expensive, check
577 # checksum first
578 if (1) {
579 $md5 =
580 join "\x00",
581 $processversion,
582 map {
583 cf::cede_to_tick;
584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
585 } 0.. $#$src;
586
587
588 my $dbmd5 = db_get cache => "$id/md5";
589 if ($dbmd5 eq $md5) {
590 db_put cache => "$id/meta", $meta;
591
592 return db_get cache => "$id/data";
593 }
594 }
595
596 my $t1 = Time::HiRes::time;
597 my $data = $process->(\@data);
598 my $t2 = Time::HiRes::time;
599
600 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
601
602 db_put cache => "$id/data", $data;
603 db_put cache => "$id/md5" , $md5;
604 db_put cache => "$id/meta", $meta;
605
606 return $data;
607 }
608
609 db_get cache => "$id/data"
376} 610}
377 611
378=item cf::datalog type => key => value, ... 612=item cf::datalog type => key => value, ...
379 613
380Log a datalog packet of the given type with the given key-value pairs. 614Log 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") 632attach callbacks/event handlers (a collection of which is called an "attachment")
399to it. All such attachable objects support the following methods. 633to it. All such attachable objects support the following methods.
400 634
401In the following description, CLASS can be any of C<global>, C<object> 635In 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 636C<player>, C<client> or C<map> (i.e. the attachable objects in
403crossfire+). 637Crossfire TRT).
404 638
405=over 4 639=over 4
406 640
407=item $attachable->attach ($attachment, key => $value...) 641=item $attachable->attach ($attachment, key => $value...)
408 642
571 $registry = $CB_TYPE[$object_type] ||= []; 805 $registry = $CB_TYPE[$object_type] ||= [];
572 806
573 } elsif ($type eq "subtype") { 807 } elsif ($type eq "subtype") {
574 defined $object_type or Carp::croak "subtype specified without type"; 808 defined $object_type or Carp::croak "subtype specified without type";
575 my $object_subtype = shift @arg; 809 my $object_subtype = shift @arg;
576 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 810 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
577 811
578 } elsif ($type eq "package") { 812 } elsif ($type eq "package") {
579 my $pkg = shift @arg; 813 my $pkg = shift @arg;
580 814
581 while (my ($name, $id) = each %cb_id) { 815 while (my ($name, $id) = each %cb_id) {
610 _attach $registry, $klass, @attach; 844 _attach $registry, $klass, @attach;
611 } 845 }
612 846
613 $obj->{$name} = \%arg; 847 $obj->{$name} = \%arg;
614 } else { 848 } else {
615 warn "object uses attachment '$name' that is not available, postponing.\n"; 849 warn "object uses attachment '$name' which is not available, postponing.\n";
616 } 850 }
617 851
618 $obj->{_attachment}{$name} = undef; 852 $obj->{_attachment}{$name} = undef;
619} 853}
620 854
622 if (ref $_[0]) { 856 if (ref $_[0]) {
623 _object_attach @_; 857 _object_attach @_;
624 } else { 858 } else {
625 _attach shift->_attach_registry, @_; 859 _attach shift->_attach_registry, @_;
626 } 860 }
861 _recalc_want;
627}; 862};
628 863
629# all those should be optimised 864# all those should be optimised
630sub cf::attachable::detach { 865sub cf::attachable::detach {
631 my ($obj, $name) = @_; 866 my ($obj, $name) = @_;
634 delete $obj->{_attachment}{$name}; 869 delete $obj->{_attachment}{$name};
635 reattach ($obj); 870 reattach ($obj);
636 } else { 871 } else {
637 Carp::croak "cannot, currently, detach class attachments"; 872 Carp::croak "cannot, currently, detach class attachments";
638 } 873 }
874 _recalc_want;
639}; 875};
640 876
641sub cf::attachable::attached { 877sub cf::attachable::attached {
642 my ($obj, $name) = @_; 878 my ($obj, $name) = @_;
643 879
658 "; 894 ";
659 die if $@; 895 die if $@;
660} 896}
661 897
662our $override; 898our $override;
663our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 899our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
664 900
665sub override { 901sub override {
666 $override = 1; 902 $override = 1;
667 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
668} 904}
669 905
670sub do_invoke { 906sub do_invoke {
671 my $event = shift; 907 my $event = shift;
672 my $callbacks = shift; 908 my $callbacks = shift;
673 909
674 @invoke_results = (); 910 @INVOKE_RESULTS = ();
675 911
676 local $override; 912 local $override;
677 913
678 for (@$callbacks) { 914 for (@$callbacks) {
679 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
696 932
697Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
698 934
699This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 935This 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 936removed in future versions), and there is no public API to access override
701results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
702 938
703=back 939=back
704 940
705=cut 941=cut
706 942
707############################################################################# 943#############################################################################
708# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
709 956
710sub reattach { 957sub reattach {
711 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
712 my ($obj) = @_; 959 my ($obj) = @_;
713 960
816 or return; 1063 or return;
817 $av = eval { (Storable::thaw $av)->{objs} }; 1064 $av = eval { (Storable::thaw $av)->{objs} };
818 } 1065 }
819 1066
820 warn sprintf "loading %s (%d)\n", 1067 warn sprintf "loading %s (%d)\n",
821 $filename, length $data, scalar @{$av || []};#d# 1068 $filename, length $data, scalar @{$av || []};
822 return ($data, $av); 1069 return ($data, $av);
823} 1070}
1071
1072=head2 COMMAND CALLBACKS
1073
1074=over 4
1075
1076=cut
824 1077
825############################################################################# 1078#############################################################################
826# command handling &c 1079# command handling &c
827 1080
828=item cf::register_command $name => \&callback($ob,$args); 1081=item cf::register_command $name => \&callback($ob,$args);
841 push @{ $COMMAND{$name} }, [$caller, $cb]; 1094 push @{ $COMMAND{$name} }, [$caller, $cb];
842} 1095}
843 1096
844=item cf::register_extcmd $name => \&callback($pl,$packet); 1097=item cf::register_extcmd $name => \&callback($pl,$packet);
845 1098
846Register a callbackf ro execution when the client sends an extcmd packet. 1099Register a callback for execution when the client sends an (synchronous)
1100extcmd packet. Ext commands will be processed in the order they are
1101received by the server, like other user commands. The first argument is
1102the logged-in player. Ext commands can only be processed after a player
1103has logged in successfully.
847 1104
848If the callback returns something, it is sent back as if reply was being 1105If the callback returns something, it is sent back as if reply was being
849called. 1106called.
850 1107
1108=item cf::register_exticmd $name => \&callback($ns,$packet);
1109
1110Register a callback for execution when the client sends an (asynchronous)
1111exticmd packet. Exti commands are processed by the server as soon as they
1112are received, i.e. out of order w.r.t. other commands. The first argument
1113is a client socket. Exti commands can be received anytime, even before
1114log-in.
1115
1116If the callback returns something, it is sent back as if reply was being
1117called.
1118
851=cut 1119=cut
852 1120
853sub register_extcmd { 1121sub register_extcmd {
854 my ($name, $cb) = @_; 1122 my ($name, $cb) = @_;
855 1123
856 $EXTCMD{$name} = $cb; 1124 $EXTCMD{$name} = $cb;
1125}
1126
1127sub register_exticmd {
1128 my ($name, $cb) = @_;
1129
1130 $EXTICMD{$name} = $cb;
857} 1131}
858 1132
859cf::player->attach ( 1133cf::player->attach (
860 on_command => sub { 1134 on_command => sub {
861 my ($pl, $name, $params) = @_; 1135 my ($pl, $name, $params) = @_;
870 cf::override; 1144 cf::override;
871 }, 1145 },
872 on_extcmd => sub { 1146 on_extcmd => sub {
873 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
874 1148
875 my $msg = eval { from_json $buf }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
876 1150
877 if (ref $msg) { 1151 if (ref $msg) {
1152 my ($type, $reply, @payload) =
1153 "ARRAY" eq ref $msg
1154 ? @$msg
1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1156
1157 my @reply;
1158
878 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
879 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
880 $pl->ext_reply ($msg->{msgid}, %reply);
881 }
882 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
883 } else { 1166 } else {
884 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
885 } 1168 }
886 1169
887 cf::override; 1170 cf::override;
888 }, 1171 },
889); 1172);
890 1173
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 { 1174sub load_extensions {
1175 cf::sync_job {
1176 my %todo;
1177
926 for my $ext (<$LIBDIR/*.ext>) { 1178 for my $path (<$LIBDIR/*.ext>) {
927 next unless -r $ext; 1179 next unless -r $path;
928 eval { 1180
929 load_extension $ext; 1181 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1182 my $base = $1;
1183 my $pkg = $1;
1184 $pkg =~ s/[^[:word:]]/_/g;
1185 $pkg = "ext::$pkg";
1186
1187 open my $fh, "<:utf8", $path
1188 or die "$path: $!";
1189
1190 my $source = do { local $/; <$fh> };
1191
1192 my %ext = (
1193 path => $path,
1194 base => $base,
1195 pkg => $pkg,
1196 );
1197
1198 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1199 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1200
1201 $ext{source} =
1202 "package $pkg; use strict; use utf8;\n"
1203 . "#line 1 \"$path\"\n{\n"
1204 . $source
1205 . "\n};\n1";
1206
1207 $todo{$base} = \%ext;
1208 }
1209
1210 my %done;
1211 while (%todo) {
1212 my $progress;
1213
1214 while (my ($k, $v) = each %todo) {
1215 for (split /,\s*/, $v->{meta}{depends}) {
1216 goto skip
1217 unless exists $done{$_};
1218 }
1219
1220 warn "... loading '$k' into '$v->{pkg}'\n";
1221
1222 unless (eval $v->{source}) {
1223 my $msg = $@ ? "$v->{path}: $@\n"
1224 : "$v->{base}: extension inactive.\n";
1225
1226 if (exists $v->{meta}{mandatory}) {
1227 warn $msg;
1228 warn "mandatory extension failed to load, exiting.\n";
1229 exit 1;
1230 }
1231
1232 warn $msg;
1233 }
1234
1235 $done{$k} = delete $todo{$k};
1236 push @EXTS, $v->{pkg};
1237 $progress = 1;
930 1 1238 }
931 } or warn "$ext not loaded: $@"; 1239
1240 skip:
1241 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1242 unless $progress;
1243 }
932 } 1244 };
933} 1245}
934 1246
935############################################################################# 1247#############################################################################
936 1248
1249=back
1250
937=head2 CORE EXTENSIONS 1251=head2 CORE EXTENSIONS
938 1252
939Functions and methods that extend core crossfire objects. 1253Functions and methods that extend core crossfire objects.
940 1254
941=cut 1255=cut
953Returns the given player object, loading it if necessary (might block). 1267Returns the given player object, loading it if necessary (might block).
954 1268
955=cut 1269=cut
956 1270
957sub playerdir($) { 1271sub playerdir($) {
958 cf::localdir 1272 "$PLAYERDIR/"
959 . "/"
960 . cf::playerdir
961 . "/"
962 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1273 . (ref $_[0] ? $_[0]->ob->name : $_[0])
963} 1274}
964 1275
965sub path($) { 1276sub path($) {
966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1277 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1014 1325
1015 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1016 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1017 1328
1018 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1019 Coro::cede; 1330 cf::cede_to_tick;
1020} 1331}
1021 1332
1022sub new($) { 1333sub new($) {
1023 my ($login) = @_; 1334 my ($login) = @_;
1024 1335
1028 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1029 1340
1030 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1031 1342
1032 $self 1343 $self
1344}
1345
1346=item $player->send_msg ($channel, $msg, $color, [extra...])
1347
1348=cut
1349
1350sub send_msg {
1351 my $ns = shift->ns
1352 or return;
1353 $ns->send_msg (@_);
1033} 1354}
1034 1355
1035=item $pl->quit_character 1356=item $pl->quit_character
1036 1357
1037Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
1086while and may block, so not sync_job-capable, ever. 1407while and may block, so not sync_job-capable, ever.
1087 1408
1088=cut 1409=cut
1089 1410
1090sub list_logins { 1411sub list_logins {
1091 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1412 my $dirs = aio_readdir $PLAYERDIR
1092 or return []; 1413 or return [];
1093 1414
1094 my @logins; 1415 my @logins;
1095 1416
1096 for my $login (@$dirs) { 1417 for my $login (@$dirs) {
1131 } 1452 }
1132 1453
1133 \@paths 1454 \@paths
1134} 1455}
1135 1456
1457=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1458
1459Expand crossfire pod fragments into protocol xml.
1460
1461=cut
1462
1463sub expand_cfpod {
1464 ((my $self), (local $_)) = @_;
1465
1466 # escape & and <
1467 s/&/&amp;/g;
1468 s/(?<![BIUGH])</&lt;/g;
1469
1470 # this is buggy, it needs to properly take care of nested <'s
1471
1472 1 while
1473 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 # replace G<male|female> tags
1478 || s{G<([^>|]*)\|([^>]*)>}{
1479 $self->gender ? $2 : $1
1480 }ge
1481 # replace H<hint text>
1482 || s{H<([^\>]*)>}
1483 {
1484 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1485 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1486 "")
1487 [$self->{hintmode}]
1488 }ge;
1489
1490 # create single paragraphs (very hackish)
1491 s/(?<=\S)\n(?=\w)/ /g;
1492
1493 # compress some whitespace
1494 s/\s+\n/\n/g; # ws line-ends
1495 s/\n\n+/\n/g; # double lines
1496 s/^\n+//; # beginning lines
1497 s/\n+$//; # ending lines
1498
1499 $_
1500}
1501
1502sub hintmode {
1503 $_[0]{hintmode} = $_[1] if @_ > 1;
1504 $_[0]{hintmode}
1505}
1506
1136=item $player->ext_reply ($msgid, %msg) 1507=item $player->ext_reply ($msgid, @msg)
1137 1508
1138Sends an ext reply to the player. 1509Sends an ext reply to the player.
1139 1510
1140=cut 1511=cut
1141 1512
1142sub ext_reply($$%) { 1513sub ext_reply($$@) {
1143 my ($self, $id, %msg) = @_; 1514 my ($self, $id, @msg) = @_;
1144 1515
1145 $msg{msgid} = $id; 1516 $self->ns->ext_reply ($id, @msg)
1146
1147 $self->send ("ext " . cf::to_json \%msg);
1148} 1517}
1149 1518
1150=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1151 1520
1152Sends an ext event to the client. 1521Sends an ext event to the client.
1153 1522
1154=cut 1523=cut
1155 1524
1156sub ext_event($$%) { 1525sub ext_msg($$@) {
1157 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1158 1527
1159 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1160} 1529}
1161 1530
1162package cf; 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}
1163 1559
1164=back 1560=back
1165
1166 1561
1167=head3 cf::map 1562=head3 cf::map
1168 1563
1169=over 4 1564=over 4
1170 1565
1225 my ($self, $merge) = @_; 1620 my ($self, $merge) = @_;
1226 1621
1227 # we have to keep some variables in memory intact 1622 # we have to keep some variables in memory intact
1228 local $self->{path}; 1623 local $self->{path};
1229 local $self->{load_path}; 1624 local $self->{load_path};
1230 local $self->{deny_save};
1231 local $self->{deny_reset};
1232 1625
1233 $self->SUPER::thawer_merge ($merge); 1626 $self->SUPER::thawer_merge ($merge);
1234} 1627}
1235 1628
1236sub normalise { 1629sub normalise {
1283 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1284 return $self; 1677 return $self;
1285 } 1678 }
1286 } 1679 }
1287 1680
1288 Carp::carp "unable to resolve path '$path' (base '$base')."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1289 () 1682 ()
1290} 1683}
1291 1684
1292sub init { 1685sub init {
1293 my ($self) = @_; 1686 my ($self) = @_;
1308 1701
1309# the original (read-only) location 1702# the original (read-only) location
1310sub load_path { 1703sub load_path {
1311 my ($self) = @_; 1704 my ($self) = @_;
1312 1705
1313 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1706 "$MAPDIR/$self->{path}.map"
1314} 1707}
1315 1708
1316# the temporary/swap location 1709# the temporary/swap location
1317sub save_path { 1710sub save_path {
1318 my ($self) = @_; 1711 my ($self) = @_;
1319 1712
1320 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1321 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1714 "$TMPDIR/$path.map"
1322} 1715}
1323 1716
1324# the unique path, undef == no special unique path 1717# the unique path, undef == no special unique path
1325sub uniq_path { 1718sub uniq_path {
1326 my ($self) = @_; 1719 my ($self) = @_;
1327 1720
1328 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1329 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1722 "$UNIQUEDIR/$path"
1330} 1723}
1331 1724
1332# and all this just because we cannot iterate over 1725# and all this just because we cannot iterate over
1333# all maps in C++... 1726# all maps in C++...
1334sub change_all_map_light { 1727sub change_all_map_light {
1335 my ($change) = @_; 1728 my ($change) = @_;
1336 1729
1337 $_->change_map_light ($change) 1730 $_->change_map_light ($change)
1338 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;
1339} 1740}
1340 1741
1341sub unlink_save { 1742sub unlink_save {
1342 my ($self) = @_; 1743 my ($self) = @_;
1343 1744
1401 $self->load_header_orig 1802 $self->load_header_orig
1402 or return; 1803 or return;
1403 $self->prepare_orig; 1804 $self->prepare_orig;
1404 } 1805 }
1405 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
1406 1 1813 1
1407} 1814}
1408 1815
1409sub find; 1816sub find;
1410sub find { 1817sub find {
1422 $map->{last_save} = $cf::RUNTIME; 1829 $map->{last_save} = $cf::RUNTIME;
1423 1830
1424 $map->load_header 1831 $map->load_header
1425 or return; 1832 or return;
1426 1833
1427 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1428 # doing this can freeze the server in a sync job, obviously 1835 # doing this can freeze the server in a sync job, obviously
1429 #$cf::WAIT_FOR_TICK->wait; 1836 #$cf::WAIT_FOR_TICK->wait;
1430 $map->reset; 1837 $map->reset;
1431 undef $guard; 1838 undef $guard;
1432 return find $path; 1839 return find $path;
1443 my ($self) = @_; 1850 my ($self) = @_;
1444 1851
1445 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1446 1853
1447 my $path = $self->{path}; 1854 my $path = $self->{path};
1855
1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1448 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1449 1859
1450 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1451 1861
1452 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1453 1863
1454 $self->alloc; 1864 $self->alloc;
1455 1865
1456 $self->pre_load; 1866 $self->pre_load;
1867 cf::cede_to_tick;
1457 1868
1458 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1459 or return; 1870 or return;
1460 1871
1461 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1462 if delete $self->{load_original}; 1873 if delete $self->{load_original};
1463 1874
1464 if (my $uniq = $self->uniq_path) { 1875 if (my $uniq = $self->uniq_path) {
1465 utf8::encode $uniq; 1876 utf8::encode $uniq;
1466 if (aio_open $uniq, O_RDONLY, 0) { 1877 if (aio_open $uniq, O_RDONLY, 0) {
1467 $self->clear_unique_items; 1878 $self->clear_unique_items;
1468 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1469 } 1880 }
1470 } 1881 }
1471 1882
1472 Coro::cede; 1883 cf::cede_to_tick;
1473
1474 # now do the right thing for maps 1884 # now do the right thing for maps
1475 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1476
1477 unless ($self->{deny_activate}) {
1478 $self->decay_objects;
1479 $self->fix_auto_apply;
1480 $self->update_buttons;
1481 Coro::cede;
1482 $self->set_darkness_map;
1483 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1484 unless $self->difficulty; 1887 unless $self->difficulty;
1485 Coro::cede; 1888 cf::cede_to_tick;
1889
1890 unless ($self->{deny_activate}) {
1891 $self->decay_objects;
1892 $self->fix_auto_apply;
1893 $self->update_buttons;
1894 cf::cede_to_tick;
1895 $self->set_darkness_map;
1896 cf::cede_to_tick;
1486 $self->activate; 1897 $self->activate;
1898 }
1899
1900 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME);
1902
1903 $self->in_memory (cf::MAP_IN_MEMORY);
1487 } 1904 }
1488 1905
1489 $self->post_load; 1906 $self->post_load;
1490
1491 $self->in_memory (cf::MAP_IN_MEMORY);
1492} 1907}
1493 1908
1494sub customise_for { 1909sub customise_for {
1495 my ($self, $ob) = @_; 1910 my ($self, $ob) = @_;
1496 1911
1497 return find "~" . $ob->name . "/" . $self->{path} 1912 return find "~" . $ob->name . "/" . $self->{path}
1498 if $self->per_player; 1913 if $self->per_player;
1499 1914
1915# return find "?party/" . $ob->name . "/" . $self->{path}
1916# if $self->per_party;
1917
1500 $self 1918 $self
1501} 1919}
1502 1920
1503# find and load all maps in the 3x3 area around a map 1921# find and load all maps in the 3x3 area around a map
1504sub load_diag { 1922sub load_neighbours {
1505 my ($map) = @_; 1923 my ($map) = @_;
1506 1924
1507 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1508 1926
1509 for (0 .. 3) { 1927 for (0 .. 3) {
1510 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1511 or next; 1929 or next;
1512 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1513 or next; 1931 or next;
1514 $neigh->load; 1932 $neigh->load;
1515 1933
1934 push @neigh,
1516 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1517 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1518 } 1937 }
1519 1938
1520 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1521 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1522 or next; 1942 or next;
1523 $neigh->load; 1943 $neigh->load;
1524 } 1944 }
1525} 1945}
1526 1946
1531} 1951}
1532 1952
1533sub do_load_sync { 1953sub do_load_sync {
1534 my ($map) = @_; 1954 my ($map) = @_;
1535 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1536 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1537} 1960}
1538 1961
1539our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1540our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1541 1964
1542sub find_async { 1965sub find_async {
1543 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1544 1967
1545 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1546 1969
1547 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1548 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1549 } 1972 }
1550 1973
1551 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1552 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1553 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1554 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1555 my $map = find $path 1979 if (my $map = find $k) {
1556 or next;
1557 $map->load; 1980 $map->load if $v;
1981 }
1558 1982
1559 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
1560 } 1984 }
1561 } 1985 }
1562 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1563 }; 1987 };
1564 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
1567} 1991}
1568 1992
1569sub save { 1993sub save {
1570 my ($self) = @_; 1994 my ($self) = @_;
1571 1995
1572 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1573 1997
1574 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1575 1999
1576 return unless $self->dirty; 2000 return unless $self->dirty;
1577 2001
1600 my ($self) = @_; 2024 my ($self) = @_;
1601 2025
1602 # save first because save cedes 2026 # save first because save cedes
1603 $self->save; 2027 $self->save;
1604 2028
1605 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
1606 2030
1607 return if $self->players; 2031 return if $self->players;
1608 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
1609 return if $self->{deny_save}; 2033 return if $self->{deny_save};
1610 2034
1614 2038
1615sub reset_at { 2039sub reset_at {
1616 my ($self) = @_; 2040 my ($self) = @_;
1617 2041
1618 # TODO: safety, remove and allow resettable per-player maps 2042 # TODO: safety, remove and allow resettable per-player maps
1619 return 1e99 if $self->isa ("ext::map_per_player");#d#
1620 return 1e99 if $self->{deny_reset}; 2043 return 1e99 if $self->{deny_reset};
1621 2044
1622 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2045 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1623 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2046 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1624 2047
1635 my ($self) = @_; 2058 my ($self) = @_;
1636 2059
1637 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1638 2061
1639 return if $self->players; 2062 return if $self->players;
1640 return if $self->isa ("ext::map_per_player");#d#
1641 2063
1642 warn "resetting map ", $self->path;#d# 2064 warn "resetting map ", $self->path;
1643 2065
1644 $self->in_memory (cf::MAP_SWAPPED); 2066 $self->in_memory (cf::MAP_SWAPPED);
1645 2067
1646 # need to save uniques path 2068 # need to save uniques path
1647 unless ($self->{deny_save}) { 2069 unless ($self->{deny_save}) {
1664my $nuke_counter = "aaaa"; 2086my $nuke_counter = "aaaa";
1665 2087
1666sub nuke { 2088sub nuke {
1667 my ($self) = @_; 2089 my ($self) = @_;
1668 2090
2091 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093
1669 delete $cf::MAP{$self->path}; 2094 delete $cf::MAP{$self->path};
1670 2095
1671 $self->unlink_save;
1672
1673 bless $self, "cf::map"; 2096 bless $self, "cf::map";
1674 delete $self->{deny_reset}; 2097 delete $self->{deny_reset};
1675 $self->{deny_save} = 1; 2098 $self->{deny_save} = 1;
1676 $self->reset_timeout (1); 2099 $self->reset_timeout (1);
1677 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1678 2101
2102 $self->unlink_save;
2103
1679 $cf::MAP{$self->path} = $self; 2104 $cf::MAP{$self->path} = $self;
2105 }
1680 2106
1681 $self->reset; # polite request, might not happen 2107 $self->reset; # polite request, might not happen
2108}
2109
2110=item $maps = cf::map::tmp_maps
2111
2112Returns an arrayref with all map paths of currently instantiated and saved
2113maps. May block.
2114
2115=cut
2116
2117sub tmp_maps() {
2118 [
2119 map {
2120 utf8::decode $_;
2121 /\.map$/
2122 ? normalise $_
2123 : ()
2124 } @{ aio_readdir $TMPDIR or [] }
2125 ]
2126}
2127
2128=item $maps = cf::map::random_maps
2129
2130Returns an arrayref with all map paths of currently instantiated and saved
2131random maps. May block.
2132
2133=cut
2134
2135sub random_maps() {
2136 [
2137 map {
2138 utf8::decode $_;
2139 /\.map$/
2140 ? normalise "?random/$_"
2141 : ()
2142 } @{ aio_readdir $RANDOMDIR or [] }
2143 ]
1682} 2144}
1683 2145
1684=item cf::map::unique_maps 2146=item cf::map::unique_maps
1685 2147
1686Returns an arrayref of paths of all shared maps that have 2148Returns an arrayref of paths of all shared maps that have
1687instantiated unique items. May block. 2149instantiated unique items. May block.
1688 2150
1689=cut 2151=cut
1690 2152
1691sub unique_maps() { 2153sub unique_maps() {
1692 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2154 [
1693 or return; 2155 map {
1694
1695 my @paths;
1696
1697 for (@$files) {
1698 utf8::decode $_; 2156 utf8::decode $_;
1699 next if /\.pst$/; 2157 /\.map$/
1700 next unless /^$PATH_SEP/o; 2158 ? normalise $_
1701 2159 : ()
1702 push @paths, cf::map::normalise $_; 2160 } @{ aio_readdir $UNIQUEDIR or [] }
1703 } 2161 ]
1704
1705 \@paths
1706} 2162}
1707 2163
1708package cf; 2164package cf;
1709 2165
1710=back 2166=back
1756 2212
1757 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2213 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1758 2214
1759 if ($self->{record_replies}) { 2215 if ($self->{record_replies}) {
1760 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2216 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2217
1761 } else { 2218 } else {
2219 my $pl = $self->contr;
2220
2221 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2222 my $dialog = $pl->{npc_dialog};
2223 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2224
2225 } else {
1762 $msg = $npc->name . " says: $msg" if $npc; 2226 $msg = $npc->name . " says: $msg" if $npc;
1763 $self->message ($msg, $flags); 2227 $self->message ($msg, $flags);
2228 }
1764 } 2229 }
2230}
2231
2232=item $object->send_msg ($channel, $msg, $color, [extra...])
2233
2234=cut
2235
2236sub cf::object::send_msg {
2237 my $pl = shift->contr
2238 or return;
2239 $pl->send_msg (@_);
1765} 2240}
1766 2241
1767=item $player_object->may ("access") 2242=item $player_object->may ("access")
1768 2243
1769Returns wether the given player is authorized to access resource "access" 2244Returns wether the given player is authorized to access resource "access"
1816 $self->deactivate_recursive; 2291 $self->deactivate_recursive;
1817 2292
1818 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2293 return if UNIVERSAL::isa $self->map, "ext::map_link";
1819 2294
1820 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2295 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1821 if $self->map; 2296 if $self->map && $self->map->{path} ne "{link}";
1822 2297
1823 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2298 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1824} 2299}
1825 2300
1826sub cf::object::player::leave_link { 2301sub cf::object::player::leave_link {
1827 my ($self, $map, $x, $y) = @_; 2302 my ($self, $map, $x, $y) = @_;
2303
2304 return unless $self->contr->active;
1828 2305
1829 my $link_pos = delete $self->{_link_pos}; 2306 my $link_pos = delete $self->{_link_pos};
1830 2307
1831 unless ($map) { 2308 unless ($map) {
1832 # restore original map position 2309 # restore original map position
1846 # use -1 or undef as default coordinates, not 0, 0 2323 # use -1 or undef as default coordinates, not 0, 0
1847 ($x, $y) = ($map->enter_x, $map->enter_y) 2324 ($x, $y) = ($map->enter_x, $map->enter_y)
1848 if $x <=0 && $y <= 0; 2325 if $x <=0 && $y <= 0;
1849 2326
1850 $map->load; 2327 $map->load;
1851 $map->load_diag; 2328 $map->load_neighbours;
1852 2329
1853 return unless $self->contr->active; 2330 return unless $self->contr->active;
1854 $self->activate_recursive; 2331 $self->activate_recursive;
1855 2332
1856 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2333 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1857 $self->enter_map ($map, $x, $y); 2334 $self->enter_map ($map, $x, $y);
1858} 2335}
1859 2336
1860cf::player->attach ( 2337=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1861 on_logout => sub {
1862 my ($pl) = @_;
1863 2338
1864 # abort map switching before logout 2339Moves the player to the given map-path and coordinates by first freezing
1865 if ($pl->ob->{_link_pos}) { 2340her, loading and preparing them map, calling the provided $check callback
1866 cf::sync_job { 2341that has to return the map if sucecssful, and then unfreezes the player on
1867 $pl->ob->leave_link 2342the new (success) or old (failed) map position. In either case, $done will
1868 }; 2343be called at the end of this process.
1869 }
1870 },
1871 on_login => sub {
1872 my ($pl) = @_;
1873 2344
1874 # try to abort aborted map switching on player login :)
1875 # should happen only on crashes
1876 if ($pl->ob->{_link_pos}) {
1877 $pl->ob->enter_link;
1878 (async {
1879 $pl->ob->reply (undef,
1880 "There was an internal problem at your last logout, "
1881 . "the server will try to bring you to your intended destination in a second.",
1882 cf::NDI_RED);
1883 # we need this sleep as the login has a concurrent enter_exit running
1884 # and this sleep increases chances of the player not ending up in scorn
1885 Coro::Timer::sleep 1;
1886 $pl->ob->leave_link;
1887 })->prio (2);
1888 }
1889 },
1890);
1891
1892=item $player_object->goto ($path, $x, $y)
1893
1894=cut 2345=cut
2346
2347our $GOTOGEN;
1895 2348
1896sub cf::object::player::goto { 2349sub cf::object::player::goto {
1897 my ($self, $path, $x, $y) = @_; 2350 my ($self, $path, $x, $y, $check, $done) = @_;
2351
2352 # do generation counting so two concurrent goto's will be executed in-order
2353 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1898 2354
1899 $self->enter_link; 2355 $self->enter_link;
1900 2356
1901 (async { 2357 (async {
1902 my $map = eval { 2358 my $map = eval {
1903 my $map = cf::map::find $path; 2359 my $map = cf::map::find $path;
2360
2361 if ($map) {
1904 $map = $map->customise_for ($self) if $map; 2362 $map = $map->customise_for ($self);
2363 $map = $check->($map) if $check && $map;
2364 } else {
2365 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2366 }
2367
1905 $map 2368 $map
2369 };
2370
2371 if ($@) {
2372 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2373 LOG llevError | logBacktrace, Carp::longmess $@;
1906 } or 2374 }
1907 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1908 2375
2376 if ($gen == $self->{_goto_generation}) {
2377 delete $self->{_goto_generation};
1909 $self->leave_link ($map, $x, $y); 2378 $self->leave_link ($map, $x, $y);
2379 }
2380
2381 $done->() if $done;
1910 })->prio (1); 2382 })->prio (1);
1911} 2383}
1912 2384
1913=item $player_object->enter_exit ($exit_object) 2385=item $player_object->enter_exit ($exit_object)
1914 2386
1953 2425
1954 $rmp->{random_seed} ||= $exit->random_seed; 2426 $rmp->{random_seed} ||= $exit->random_seed;
1955 2427
1956 my $data = cf::to_json $rmp; 2428 my $data = cf::to_json $rmp;
1957 my $md5 = Digest::MD5::md5_hex $data; 2429 my $md5 = Digest::MD5::md5_hex $data;
1958 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2430 my $meta = "$RANDOMDIR/$md5.meta";
1959 2431
1960 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2432 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1961 aio_write $fh, 0, (length $data), $data, 0; 2433 aio_write $fh, 0, (length $data), $data, 0;
1962 undef $fh; 2434 undef $fh;
1963 aio_rename "$meta~", $meta; 2435 aio_rename "$meta~", $meta;
1982 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2454 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1983 my $hp = $exit->stats->hp; 2455 my $hp = $exit->stats->hp;
1984 my $sp = $exit->stats->sp; 2456 my $sp = $exit->stats->sp;
1985 2457
1986 $self->enter_link; 2458 $self->enter_link;
2459
2460 # if exit is damned, update players death & WoR home-position
2461 $self->contr->savebed ($slaying, $hp, $sp)
2462 if $exit->flag (FLAG_DAMNED);
1987 2463
1988 (async { 2464 (async {
1989 $self->deactivate_recursive; # just to be sure 2465 $self->deactivate_recursive; # just to be sure
1990 unless (eval { 2466 unless (eval {
1991 $self->goto ($slaying, $hp, $sp); 2467 $self->goto ($slaying, $hp, $sp);
2019 2495
2020 utf8::encode $text; 2496 utf8::encode $text;
2021 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2497 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2022} 2498}
2023 2499
2500=item $client->send_msg ($channel, $msg, $color, [extra...])
2501
2502Send a drawinfo or msg packet to the client, formatting the msg for the
2503client if neccessary. C<$type> should be a string identifying the type of
2504the message, with C<log> being the default. If C<$color> is negative, suppress
2505the message unless the client supports the msg packet.
2506
2507=cut
2508
2509sub cf::client::send_msg {
2510 my ($self, $channel, $msg, $color, @extra) = @_;
2511
2512 $msg = $self->pl->expand_cfpod ($msg);
2513
2514 $color &= cf::NDI_CLIENT_MASK; # just in case...
2515
2516 if (ref $channel) {
2517 # send meta info to client, if not yet sent
2518 unless (exists $self->{channel}{$channel->{id}}) {
2519 $self->{channel}{$channel->{id}} = $channel;
2520 $self->ext_msg (channel_info => $channel);
2521 }
2522
2523 $channel = $channel->{id};
2524 }
2525
2526 return unless @extra || length $msg;
2527
2528 if ($self->can_msg) {
2529 # default colour, mask it out
2530 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2531 if $color & cf::NDI_DEF;
2532
2533 $self->send_packet ("msg " . $self->{json_coder}->encode (
2534 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2535 } else {
2536 if ($color >= 0) {
2537 # replace some tags by gcfclient-compatible ones
2538 for ($msg) {
2539 1 while
2540 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2541 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2542 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2543 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2544 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2545 }
2546
2547 $color &= cf::NDI_COLOR_MASK;
2548
2549 utf8::encode $msg;
2550
2551 if (0 && $msg =~ /\[/) {
2552 # COMMAND/INFO
2553 $self->send_packet ("drawextinfo $color 10 8 $msg")
2554 } else {
2555 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2556 $self->send_packet ("drawinfo $color $msg")
2557 }
2558 }
2559 }
2560}
2561
2024=item $client->ext_event ($type, %msg) 2562=item $client->ext_msg ($type, @msg)
2025 2563
2026Sends an exti event to the client. 2564Sends an ext event to the client.
2027 2565
2028=cut 2566=cut
2029 2567
2030sub cf::client::ext_event($$%) { 2568sub cf::client::ext_msg($$@) {
2031 my ($self, $type, %msg) = @_; 2569 my ($self, $type, @msg) = @_;
2032 2570
2571 if ($self->extcmd == 2) {
2572 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2573 } elsif ($self->extcmd == 1) { # TODO: remove
2033 $msg{msgtype} = "event_$type"; 2574 push @msg, msgtype => "event_$type";
2034 $self->send_packet ("ext " . cf::to_json \%msg); 2575 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2576 }
2577}
2578
2579=item $client->ext_reply ($msgid, @msg)
2580
2581Sends an ext reply to the client.
2582
2583=cut
2584
2585sub cf::client::ext_reply($$@) {
2586 my ($self, $id, @msg) = @_;
2587
2588 if ($self->extcmd == 2) {
2589 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2590 } elsif ($self->extcmd == 1) {
2591 #TODO: version 1, remove
2592 unshift @msg, msgtype => "reply", msgid => $id;
2593 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2594 }
2035} 2595}
2036 2596
2037=item $success = $client->query ($flags, "text", \&cb) 2597=item $success = $client->query ($flags, "text", \&cb)
2038 2598
2039Queues a query to the client, calling the given callback with 2599Queues a query to the client, calling the given callback with
2040the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2600the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2041C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2601C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2042 2602
2043Queries can fail, so check the return code. Or don't, as queries will become 2603Queries can fail, so check the return code. Or don't, as queries will
2044reliable at some point in the future. 2604become reliable at some point in the future.
2045 2605
2046=cut 2606=cut
2047 2607
2048sub cf::client::query { 2608sub cf::client::query {
2049 my ($self, $flags, $text, $cb) = @_; 2609 my ($self, $flags, $text, $cb) = @_;
2057 utf8::encode $text; 2617 utf8::encode $text;
2058 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2618 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2059 2619
2060 $self->send_packet ($self->{query_queue}[0][0]) 2620 $self->send_packet ($self->{query_queue}[0][0])
2061 if @{ $self->{query_queue} } == 1; 2621 if @{ $self->{query_queue} } == 1;
2622
2623 1
2062} 2624}
2063 2625
2064cf::client->attach ( 2626cf::client->attach (
2627 on_connect => sub {
2628 my ($ns) = @_;
2629
2630 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2631 },
2065 on_reply => sub { 2632 on_reply => sub {
2066 my ($ns, $msg) = @_; 2633 my ($ns, $msg) = @_;
2067 2634
2068 # this weird shuffling is so that direct followup queries 2635 # this weird shuffling is so that direct followup queries
2069 # get handled first 2636 # get handled first
2081 } else { 2648 } else {
2082 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2649 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2083 } 2650 }
2084 } 2651 }
2085 }, 2652 },
2653 on_exticmd => sub {
2654 my ($ns, $buf) = @_;
2655
2656 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2657
2658 if (ref $msg) {
2659 my ($type, $reply, @payload) =
2660 "ARRAY" eq ref $msg
2661 ? @$msg
2662 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2663
2664 my @reply;
2665
2666 if (my $cb = $EXTICMD{$type}) {
2667 @reply = $cb->($ns, @payload);
2668 }
2669
2670 $ns->ext_reply ($reply, @reply)
2671 if $reply;
2672
2673 } else {
2674 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2675 }
2676
2677 cf::override;
2678 },
2086); 2679);
2087 2680
2088=item $client->async (\&cb) 2681=item $client->async (\&cb)
2089 2682
2090Create a new coroutine, running the specified callback. The coroutine will 2683Create a new coroutine, running the specified callback. The coroutine will
2131our $safe = new Safe "safe"; 2724our $safe = new Safe "safe";
2132our $safe_hole = new Safe::Hole; 2725our $safe_hole = new Safe::Hole;
2133 2726
2134$SIG{FPE} = 'IGNORE'; 2727$SIG{FPE} = 'IGNORE';
2135 2728
2136$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2729$safe->permit_only (Opcode::opset qw(
2730 :base_core :base_mem :base_orig :base_math
2731 grepstart grepwhile mapstart mapwhile
2732 sort time
2733));
2137 2734
2138# here we export the classes and methods available to script code 2735# here we export the classes and methods available to script code
2139 2736
2140=pod 2737=pod
2141 2738
2142The following functions and methods are available within a safe environment: 2739The following functions and methods are available within a safe environment:
2143 2740
2144 cf::object contr pay_amount pay_player map 2741 cf::object
2742 contr pay_amount pay_player map x y force_find force_add
2743 insert remove name archname title slaying race decrease_ob_nr
2744
2145 cf::object::player player 2745 cf::object::player
2146 cf::player peaceful 2746 player
2147 cf::map trigger 2747
2748 cf::player
2749 peaceful
2750
2751 cf::map
2752 trigger
2148 2753
2149=cut 2754=cut
2150 2755
2151for ( 2756for (
2152 ["cf::object" => qw(contr pay_amount pay_player map)], 2757 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2758 insert remove inv name archname title slaying race
2759 decrease_ob_nr)],
2153 ["cf::object::player" => qw(player)], 2760 ["cf::object::player" => qw(player)],
2154 ["cf::player" => qw(peaceful)], 2761 ["cf::player" => qw(peaceful)],
2155 ["cf::map" => qw(trigger)], 2762 ["cf::map" => qw(trigger)],
2156) { 2763) {
2157 no strict 'refs'; 2764 no strict 'refs';
2228=back 2835=back
2229 2836
2230=cut 2837=cut
2231 2838
2232############################################################################# 2839#############################################################################
2233
2234=head2 EXTENSION DATABASE SUPPORT
2235
2236Crossfire maintains a very simple database for extension use. It can
2237currently store anything that can be serialised using Storable, which
2238excludes objects.
2239
2240The parameter C<$family> should best start with the name of the extension
2241using it, it should be unique.
2242
2243=over 4
2244
2245=item $value = cf::db_get $family => $key
2246
2247Returns a single value from the database.
2248
2249=item cf::db_put $family => $key => $value
2250
2251Stores the given C<$value> in the family.
2252
2253=cut
2254
2255our $DB;
2256
2257sub db_init {
2258 unless ($DB) {
2259 $DB = BDB::db_create $DB_ENV;
2260
2261 cf::sync_job {
2262 eval {
2263 $DB->set_flags (BDB::CHKSUM);
2264
2265 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2266 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2267 cf::cleanup "db_open(db): $!" if $!;
2268 };
2269 cf::cleanup "db_open(db): $@" if $@;
2270 };
2271
2272 my $path = cf::localdir . "/database.pst";
2273 if (stat $path) {
2274 cf::sync_job {
2275 my $pst = Storable::retrieve $path;
2276
2277 cf::db_put (board => data => $pst->{board});
2278 cf::db_put (guildrules => data => $pst->{guildrules});
2279 cf::db_put (rent => balance => $pst->{rent}{balance});
2280 BDB::db_env_txn_checkpoint $DB_ENV;
2281
2282 unlink $path;
2283 };
2284 }
2285 }
2286}
2287
2288sub db_get($$) {
2289 my $key = "$_[0]/$_[1]";
2290
2291 cf::sync_job {
2292 BDB::db_get $DB, undef, $key, my $data;
2293
2294 $! ? ()
2295 : Compress::LZF::sthaw $data
2296 }
2297}
2298
2299sub db_put($$$) {
2300 BDB::dbreq_pri 4;
2301 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2302}
2303
2304#############################################################################
2305# the server's init and main functions 2840# the server's init and main functions
2306 2841
2307sub load_facedata { 2842sub load_facedata($) {
2308 my $path = sprintf "%s/facedata", cf::datadir; 2843 my ($path) = @_;
2844
2845 # HACK to clear player env face cache, we need some signal framework
2846 # for this (global event?)
2847 %ext::player_env::MUSIC_FACE_CACHE = ();
2848
2849 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2309 2850
2310 warn "loading facedata from $path\n"; 2851 warn "loading facedata from $path\n";
2311 2852
2312 my $faces; 2853 my $facedata;
2313 0 < aio_load $path, $faces 2854 0 < aio_load $path, $facedata
2314 or die "$path: $!"; 2855 or die "$path: $!";
2315 2856
2316 Coro::cede;
2317 $faces = Storable::thaw $faces; 2857 $facedata = Coro::Storable::thaw $facedata;
2318 Coro::cede;
2319 2858
2320 my $meta = delete $faces->{""};
2321 $meta->{version} == 1 2859 $facedata->{version} == 2
2322 or cf::cleanup "$path: version mismatch, cannot proceed."; 2860 or cf::cleanup "$path: version mismatch, cannot proceed.";
2323 2861
2862 # patch in the exptable
2863 $facedata->{resource}{"res/exp_table"} = {
2864 type => FT_RSRC,
2865 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2866 };
2867 cf::cede_to_tick;
2868
2869 {
2870 my $faces = $facedata->{faceinfo};
2871
2324 while (my ($face, $info) = each %$faces) { 2872 while (my ($face, $info) = each %$faces) {
2325 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2873 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2326 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2874 cf::face::set_visibility $idx, $info->{visibility};
2875 cf::face::set_magicmap $idx, $info->{magicmap};
2327 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2876 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2328 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2877 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2329 Coro::cede;
2330 }
2331 2878
2879 cf::cede_to_tick;
2880 }
2881
2332 while (my ($face, $info) = each %$faces) { 2882 while (my ($face, $info) = each %$faces) {
2333 next unless $info->{smooth}; 2883 next unless $info->{smooth};
2334 my $idx = cf::face::find $face 2884 my $idx = cf::face::find $face
2335 or next; 2885 or next;
2336 if (my $smooth = cf::face::find $info->{smooth}) { 2886 if (my $smooth = cf::face::find $info->{smooth}) {
2337 cf::face::set_smooth $idx, $smooth; 2887 cf::face::set_smooth $idx, $smooth;
2888 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2338 } else { 2889 } else {
2339 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2890 warn "smooth face '$info->{smooth}' not found for face '$face'";
2340 } 2891 }
2341 Coro::cede; 2892
2893 cf::cede_to_tick;
2894 }
2895 }
2896
2897 {
2898 my $anims = $facedata->{animinfo};
2899
2900 while (my ($anim, $info) = each %$anims) {
2901 cf::anim::set $anim, $info->{frames}, $info->{facings};
2902 cf::cede_to_tick;
2903 }
2904
2905 cf::anim::invalidate_all; # d'oh
2906 }
2907
2908 {
2909 # TODO: for gcfclient pleasure, we should give resources
2910 # that gcfclient doesn't grok a >10000 face index.
2911 my $res = $facedata->{resource};
2912
2913 my $soundconf = delete $res->{"res/sound.conf"};
2914
2915 while (my ($name, $info) = each %$res) {
2916 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2917 my $data;
2918
2919 if ($info->{type} & 1) {
2920 # prepend meta info
2921
2922 my $meta = $enc->encode ({
2923 name => $name,
2924 %{ $info->{meta} || {} },
2925 });
2926
2927 $data = pack "(w/a*)*", $meta, $info->{data};
2928 } else {
2929 $data = $info->{data};
2930 }
2931
2932 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2933 cf::face::set_type $idx, $info->{type};
2934
2935 cf::cede_to_tick;
2936 }
2937
2938 if ($soundconf) {
2939 $soundconf = $enc->decode (delete $soundconf->{data});
2940
2941 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2942 my $sound = $soundconf->{compat}[$_]
2943 or next;
2944
2945 my $face = cf::face::find "sound/$sound->[1]";
2946 cf::sound::set $sound->[0] => $face;
2947 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2948 }
2949
2950 while (my ($k, $v) = each %{$soundconf->{event}}) {
2951 my $face = cf::face::find "sound/$v";
2952 cf::sound::set $k => $face;
2953 }
2954 }
2342 } 2955 }
2343 2956
2344 1 2957 1
2345} 2958}
2346 2959
2960register_exticmd fx_want => sub {
2961 my ($ns, $want) = @_;
2962
2963 while (my ($k, $v) = each %$want) {
2964 $ns->fx_want ($k, $v);
2965 }
2966};
2967
2968sub reload_regions {
2969 # HACK to clear player env face cache, we need some signal framework
2970 # for this (global event?)
2971 %ext::player_env::MUSIC_FACE_CACHE = ();
2972
2973 load_resource_file "$MAPDIR/regions"
2974 or die "unable to load regions file\n";
2975
2976 for (cf::region::list) {
2977 $_->{match} = qr/$_->{match}/
2978 if exists $_->{match};
2979 }
2980}
2981
2982sub reload_facedata {
2983 load_facedata "$DATADIR/facedata"
2984 or die "unable to load facedata\n";
2985}
2986
2987sub reload_archetypes {
2988 load_resource_file "$DATADIR/archetypes"
2989 or die "unable to load archetypes\n";
2990 #d# NEED to laod twice to resolve forward references
2991 # this really needs to be done in an extra post-pass
2992 # (which needs to be synchronous, so solve it differently)
2993 load_resource_file "$DATADIR/archetypes"
2994 or die "unable to load archetypes\n";
2995}
2996
2997sub reload_treasures {
2998 load_resource_file "$DATADIR/treasures"
2999 or die "unable to load treasurelists\n";
3000}
3001
2347sub reload_resources { 3002sub reload_resources {
2348 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 3003 warn "reloading resource files...\n";
2349 or die "unable to load regions file\n";#d# 3004
3005 reload_regions;
2350 load_facedata 3006 reload_facedata;
2351 or die "unable to load facedata\n";#d# 3007 #reload_archetypes;#d#
3008 reload_archetypes;
3009 reload_treasures;
3010
3011 warn "finished reloading resource files\n";
2352} 3012}
2353 3013
2354sub init { 3014sub init {
2355 reload_resources; 3015 reload_resources;
2356} 3016}
2357 3017
2358sub cfg_load { 3018sub reload_config {
2359 open my $fh, "<:utf8", cf::confdir . "/config" 3019 open my $fh, "<:utf8", "$CONFDIR/config"
2360 or return; 3020 or return;
2361 3021
2362 local $/; 3022 local $/;
2363 *CFG = YAML::Syck::Load <$fh>; 3023 *CFG = YAML::Syck::Load <$fh>;
2364 3024
2383 (async { 3043 (async {
2384 Event::one_event; 3044 Event::one_event;
2385 })->prio (Coro::PRIO_MAX); 3045 })->prio (Coro::PRIO_MAX);
2386 }; 3046 };
2387 3047
2388 cfg_load; 3048 reload_config;
2389 db_init; 3049 db_init;
2390 load_extensions; 3050 load_extensions;
2391 3051
2392 $TICK_WATCHER->start; 3052 $TICK_WATCHER->start;
2393 Event::loop; 3053 Event::loop;
2409 }, 3069 },
2410 ); 3070 );
2411 } 3071 }
2412} 3072}
2413 3073
3074sub write_runtime {
3075 my $runtime = "$LOCALDIR/runtime";
3076
3077 # first touch the runtime file to show we are still running:
3078 # the fsync below can take a very very long time.
3079
3080 IO::AIO::aio_utime $runtime, undef, undef;
3081
3082 my $guard = cf::lock_acquire "write_runtime";
3083
3084 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3085 or return;
3086
3087 my $value = $cf::RUNTIME + 90 + 10;
3088 # 10 is the runtime save interval, for a monotonic clock
3089 # 60 allows for the watchdog to kill the server.
3090
3091 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3092 and return;
3093
3094 # always fsync - this file is important
3095 aio_fsync $fh
3096 and return;
3097
3098 # touch it again to show we are up-to-date
3099 aio_utime $fh, undef, undef;
3100
3101 close $fh
3102 or return;
3103
3104 aio_rename "$runtime~", $runtime
3105 and return;
3106
3107 warn "runtime file written.\n";
3108
3109 1
3110}
3111
2414sub emergency_save() { 3112sub emergency_save() {
2415 my $freeze_guard = cf::freeze_mainloop; 3113 my $freeze_guard = cf::freeze_mainloop;
2416 3114
2417 warn "enter emergency perl save\n"; 3115 warn "enter emergency perl save\n";
2418 3116
2449 3147
2450 warn Carp::longmess "post_cleanup backtrace" 3148 warn Carp::longmess "post_cleanup backtrace"
2451 if $make_core; 3149 if $make_core;
2452} 3150}
2453 3151
2454sub reload() { 3152sub do_reload_perl() {
2455 # can/must only be called in main 3153 # can/must only be called in main
2456 if ($Coro::current != $Coro::main) { 3154 if ($Coro::current != $Coro::main) {
2457 warn "can only reload from main coroutine"; 3155 warn "can only reload from main coroutine";
2458 return; 3156 return;
2459 } 3157 }
2493 %EXT_CORO = (); 3191 %EXT_CORO = ();
2494 3192
2495 warn "removing commands"; 3193 warn "removing commands";
2496 %COMMAND = (); 3194 %COMMAND = ();
2497 3195
2498 warn "removing ext commands"; 3196 warn "removing ext/exti commands";
2499 %EXTCMD = (); 3197 %EXTCMD = ();
3198 %EXTICMD = ();
2500 3199
2501 warn "unloading/nuking all extensions"; 3200 warn "unloading/nuking all extensions";
2502 for my $pkg (@EXTS) { 3201 for my $pkg (@EXTS) {
2503 warn "... unloading $pkg"; 3202 warn "... unloading $pkg";
2504 3203
2534 Symbol::delete_package "safe::$_" 3233 Symbol::delete_package "safe::$_"
2535 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3234 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2536 3235
2537 warn "unloading cf.pm \"a bit\""; 3236 warn "unloading cf.pm \"a bit\"";
2538 delete $INC{"cf.pm"}; 3237 delete $INC{"cf.pm"};
3238 delete $INC{"cf/pod.pm"};
2539 3239
2540 # don't, removes xs symbols, too, 3240 # don't, removes xs symbols, too,
2541 # and global variables created in xs 3241 # and global variables created in xs
2542 #Symbol::delete_package __PACKAGE__; 3242 #Symbol::delete_package __PACKAGE__;
2543 3243
2546 warn "reloading cf.pm"; 3246 warn "reloading cf.pm";
2547 require cf; 3247 require cf;
2548 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3248 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2549 3249
2550 warn "loading config and database again"; 3250 warn "loading config and database again";
2551 cf::cfg_load; 3251 cf::reload_config;
2552 3252
2553 warn "loading extensions"; 3253 warn "loading extensions";
2554 cf::load_extensions; 3254 cf::load_extensions;
2555 3255
2556 warn "reattaching attachments to objects/players"; 3256 warn "reattaching attachments to objects/players";
2558 warn "reattaching attachments to maps"; 3258 warn "reattaching attachments to maps";
2559 reattach $_ for values %MAP; 3259 reattach $_ for values %MAP;
2560 warn "reattaching attachments to players"; 3260 warn "reattaching attachments to players";
2561 reattach $_ for values %PLAYER; 3261 reattach $_ for values %PLAYER;
2562 3262
2563 warn "loading reloadable resources";
2564 reload_resources;
2565
2566 warn "leaving sync_job"; 3263 warn "leaving sync_job";
2567 3264
2568 1 3265 1
2569 } or do { 3266 } or do {
2570 warn $@; 3267 warn $@;
2575 warn "reloaded"; 3272 warn "reloaded";
2576}; 3273};
2577 3274
2578our $RELOAD_WATCHER; # used only during reload 3275our $RELOAD_WATCHER; # used only during reload
2579 3276
3277sub reload_perl() {
3278 # doing reload synchronously and two reloads happen back-to-back,
3279 # coro crashes during coro_state_free->destroy here.
3280
3281 $RELOAD_WATCHER ||= Event->timer (
3282 reentrant => 0,
3283 after => 0,
3284 data => WF_AUTOCANCEL,
3285 cb => sub {
3286 do_reload_perl;
3287 undef $RELOAD_WATCHER;
3288 },
3289 );
3290}
3291
2580register_command "reload" => sub { 3292register_command "reload" => sub {
2581 my ($who, $arg) = @_; 3293 my ($who, $arg) = @_;
2582 3294
2583 if ($who->flag (FLAG_WIZ)) { 3295 if ($who->flag (FLAG_WIZ)) {
2584 $who->message ("reloading server."); 3296 $who->message ("reloading server.");
2585 3297 async { reload_perl };
2586 # doing reload synchronously and two reloads happen back-to-back,
2587 # coro crashes during coro_state_free->destroy here.
2588
2589 $RELOAD_WATCHER ||= Event->timer (
2590 reentrant => 0,
2591 after => 0,
2592 data => WF_AUTOCANCEL,
2593 cb => sub {
2594 reload;
2595 undef $RELOAD_WATCHER;
2596 },
2597 );
2598 } 3298 }
2599}; 3299};
2600 3300
2601unshift @INC, $LIBDIR; 3301unshift @INC, $LIBDIR;
2602 3302
2603my $bug_warning = 0; 3303my $bug_warning = 0;
2604 3304
3305our @WAIT_FOR_TICK;
3306our @WAIT_FOR_TICK_BEGIN;
3307
3308sub wait_for_tick {
3309 return unless $TICK_WATCHER->is_active;
3310 return if $Coro::current == $Coro::main;
3311
3312 my $signal = new Coro::Signal;
3313 push @WAIT_FOR_TICK, $signal;
3314 $signal->wait;
3315}
3316
3317sub wait_for_tick_begin {
3318 return unless $TICK_WATCHER->is_active;
3319 return if $Coro::current == $Coro::main;
3320
3321 my $signal = new Coro::Signal;
3322 push @WAIT_FOR_TICK_BEGIN, $signal;
3323 $signal->wait;
3324}
3325
3326 my $min = 1e6;#d#
3327 my $avg = 10;
2605$TICK_WATCHER = Event->timer ( 3328$TICK_WATCHER = Event->timer (
2606 reentrant => 0, 3329 reentrant => 0,
2607 parked => 1, 3330 parked => 1,
2608 prio => 0, 3331 prio => 0,
2609 at => $NEXT_TICK || $TICK, 3332 at => $NEXT_TICK || $TICK,
2613 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3336 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2614 unless ++$bug_warning > 10; 3337 unless ++$bug_warning > 10;
2615 return; 3338 return;
2616 } 3339 }
2617 3340
2618 $NOW = Event::time; 3341 $NOW = $tick_start = Event::time;
2619 3342
2620 cf::server_tick; # one server iteration 3343 cf::server_tick; # one server iteration
3344
3345 0 && sync_job {#d#
3346 for(1..10) {
3347 my $t = Event::time;
3348 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3349 or die;
3350
3351 $map->width (50);
3352 $map->height (50);
3353 $map->alloc;
3354 $map->_load_objects ("/tmp/x.map", 1);
3355 my $t = Event::time - $t;
3356
3357 #next unless $t < 0.0013;#d#
3358 if ($t < $min) {
3359 $min = $t;
3360 }
3361 $avg = $avg * 0.99 + $t * 0.01;
3362 }
3363 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3364 exit 0;
3365 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3366 };
3367
2621 $RUNTIME += $TICK; 3368 $RUNTIME += $TICK;
2622 $NEXT_TICK += $TICK; 3369 $NEXT_TICK += $TICK;
2623 3370
2624 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3371 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2625 $NEXT_RUNTIME_WRITE = $NOW + 10; 3372 $NEXT_RUNTIME_WRITE = $NOW + 10;
2627 write_runtime 3374 write_runtime
2628 or warn "ERROR: unable to write runtime file: $!"; 3375 or warn "ERROR: unable to write runtime file: $!";
2629 }; 3376 };
2630 } 3377 }
2631 3378
2632 $WAIT_FOR_TICK->broadcast;
2633 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2634
2635# my $AFTER = Event::time; 3379# my $AFTER = Event::time;
2636# warn $AFTER - $NOW;#d# 3380# warn $AFTER - $NOW;#d#
2637 3381
3382 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3383 $sig->send;
3384 }
3385 while (my $sig = shift @WAIT_FOR_TICK) {
3386 $sig->send;
3387 }
3388
3389 $NOW = Event::time;
3390
2638 # if we are delayed by four ticks or more, skip them all 3391 # if we are delayed by four ticks or more, skip them all
2639 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3392 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2640 3393
2641 $TICK_WATCHER->at ($NEXT_TICK); 3394 $TICK_WATCHER->at ($NEXT_TICK);
2642 $TICK_WATCHER->start; 3395 $TICK_WATCHER->start;
3396
3397 $LOAD = ($NOW - $tick_start) / $TICK;
3398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3399
3400 _post_tick;
3401
3402
2643 }, 3403 },
2644); 3404);
2645 3405
2646{ 3406{
2647 BDB::max_poll_time $TICK * 0.1; 3407 BDB::max_poll_time $TICK * 0.1;
2675 3435
2676 cf::sync_job { 3436 cf::sync_job {
2677 eval { 3437 eval {
2678 BDB::db_env_open 3438 BDB::db_env_open
2679 $DB_ENV, 3439 $DB_ENV,
2680 $BDB_ENV_DIR, 3440 $BDBDIR,
2681 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3441 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2682 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3442 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2683 0666; 3443 0666;
2684 3444
2685 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3445 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2686 3446
2687 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3447 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2688 $DB_ENV->set_lk_detect; 3448 $DB_ENV->set_lk_detect;
2689 }; 3449 };
2690 3450
2706 prio => 6, 3466 prio => 6,
2707 cb => \&IO::AIO::poll_cb, 3467 cb => \&IO::AIO::poll_cb,
2708 ); 3468 );
2709} 3469}
2710 3470
3471my $_log_backtrace;
3472
3473sub _log_backtrace {
3474 my ($msg, @addr) = @_;
3475
3476 $msg =~ s/\n//;
3477
3478 # limit the # of concurrent backtraces
3479 if ($_log_backtrace < 2) {
3480 ++$_log_backtrace;
3481 async {
3482 my @bt = fork_call {
3483 @addr = map { sprintf "%x", $_ } @addr;
3484 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3485 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3486 or die "addr2line: $!";
3487
3488 my @funcs;
3489 my @res = <$fh>;
3490 chomp for @res;
3491 while (@res) {
3492 my ($func, $line) = splice @res, 0, 2, ();
3493 push @funcs, "[$func] $line";
3494 }
3495
3496 @funcs
3497 };
3498
3499 LOG llevInfo, "[ABT] $msg\n";
3500 LOG llevInfo, "[ABT] $_\n" for @bt;
3501 --$_log_backtrace;
3502 };
3503 } else {
3504 LOG llevInfo, "[ABT] $msg\n";
3505 LOG llevInfo, "[ABT] [suppressed]\n";
3506 }
3507}
3508
3509# load additional modules
3510use cf::pod;
3511
2711END { cf::emergency_save } 3512END { cf::emergency_save }
2712 3513
27131 35141
2714 3515

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines