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.231 by root, Wed Apr 4 00:02:06 2007 UTC vs.
Revision 1.347 by root, Thu Aug 30 05:16:09 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];
967 1278
968 (playerdir $login) . "/$login.pl" 1279 (playerdir $login) . "/playerdata"
969} 1280}
970 1281
971sub find_active($) { 1282sub find_active($) {
972 $cf::PLAYER{$_[0]} 1283 $cf::PLAYER{$_[0]}
973 and $cf::PLAYER{$_[0]}->active 1284 and $cf::PLAYER{$_[0]}->active
986 my $login = $_[0]; 1297 my $login = $_[0];
987 1298
988 my $guard = cf::lock_acquire "user_find:$login"; 1299 my $guard = cf::lock_acquire "user_find:$login";
989 1300
990 $cf::PLAYER{$_[0]} || do { 1301 $cf::PLAYER{$_[0]} || do {
1302 # rename old playerfiles to new ones
1303 #TODO: remove when no longer required
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl";
1308
991 my $pl = load_pl path $login 1309 my $pl = load_pl path $login
992 or return; 1310 or return;
993 $cf::PLAYER{$login} = $pl 1311 $cf::PLAYER{$login} = $pl
994 } 1312 }
995 } 1313 }
1007 1325
1008 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1009 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1010 1328
1011 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1012 Coro::cede; 1330 cf::cede_to_tick;
1013} 1331}
1014 1332
1015sub new($) { 1333sub new($) {
1016 my ($login) = @_; 1334 my ($login) = @_;
1017 1335
1021 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1022 1340
1023 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1024 1342
1025 $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 (@_);
1026} 1354}
1027 1355
1028=item $pl->quit_character 1356=item $pl->quit_character
1029 1357
1030Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
1079while and may block, so not sync_job-capable, ever. 1407while and may block, so not sync_job-capable, ever.
1080 1408
1081=cut 1409=cut
1082 1410
1083sub list_logins { 1411sub list_logins {
1084 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1412 my $dirs = aio_readdir $PLAYERDIR
1085 or return []; 1413 or return [];
1086 1414
1087 my @logins; 1415 my @logins;
1088 1416
1089 for my $login (@$dirs) { 1417 for my $login (@$dirs) {
1124 } 1452 }
1125 1453
1126 \@paths 1454 \@paths
1127} 1455}
1128 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
1129=item $player->ext_reply ($msgid, %msg) 1507=item $player->ext_reply ($msgid, @msg)
1130 1508
1131Sends an ext reply to the player. 1509Sends an ext reply to the player.
1132 1510
1133=cut 1511=cut
1134 1512
1135sub ext_reply($$%) { 1513sub ext_reply($$@) {
1136 my ($self, $id, %msg) = @_; 1514 my ($self, $id, @msg) = @_;
1137 1515
1138 $msg{msgid} = $id; 1516 $self->ns->ext_reply ($id, @msg)
1139
1140 $self->send ("ext " . cf::to_json \%msg);
1141} 1517}
1142 1518
1143=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1144 1520
1145Sends an ext event to the client. 1521Sends an ext event to the client.
1146 1522
1147=cut 1523=cut
1148 1524
1149sub ext_event($$%) { 1525sub ext_msg($$@) {
1150 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1151 1527
1152 delete $msg{msgid}; 1528 $self->ns->ext_msg ($type, @msg);
1153 $msg{msgtype} = "event";
1154 $msg{eventtype} = $type;
1155
1156 $self->send ("ext " . cf::to_json \%msg);
1157} 1529}
1158 1530
1159package 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}
1160 1559
1161=back 1560=back
1162
1163 1561
1164=head3 cf::map 1562=head3 cf::map
1165 1563
1166=over 4 1564=over 4
1167 1565
1222 my ($self, $merge) = @_; 1620 my ($self, $merge) = @_;
1223 1621
1224 # we have to keep some variables in memory intact 1622 # we have to keep some variables in memory intact
1225 local $self->{path}; 1623 local $self->{path};
1226 local $self->{load_path}; 1624 local $self->{load_path};
1227 local $self->{deny_save};
1228 local $self->{deny_reset};
1229 1625
1230 $self->SUPER::thawer_merge ($merge); 1626 $self->SUPER::thawer_merge ($merge);
1231} 1627}
1232 1628
1233sub normalise { 1629sub normalise {
1280 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1281 return $self; 1677 return $self;
1282 } 1678 }
1283 } 1679 }
1284 1680
1285 Carp::carp "unable to resolve path '$path' (base '$base')."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1286 () 1682 ()
1287} 1683}
1288 1684
1289sub init { 1685sub init {
1290 my ($self) = @_; 1686 my ($self) = @_;
1305 1701
1306# the original (read-only) location 1702# the original (read-only) location
1307sub load_path { 1703sub load_path {
1308 my ($self) = @_; 1704 my ($self) = @_;
1309 1705
1310 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1706 "$MAPDIR/$self->{path}.map"
1311} 1707}
1312 1708
1313# the temporary/swap location 1709# the temporary/swap location
1314sub save_path { 1710sub save_path {
1315 my ($self) = @_; 1711 my ($self) = @_;
1316 1712
1317 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1318 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1714 "$TMPDIR/$path.map"
1319} 1715}
1320 1716
1321# the unique path, undef == no special unique path 1717# the unique path, undef == no special unique path
1322sub uniq_path { 1718sub uniq_path {
1323 my ($self) = @_; 1719 my ($self) = @_;
1324 1720
1325 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1326 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1722 "$UNIQUEDIR/$path"
1327} 1723}
1328 1724
1329# and all this just because we cannot iterate over 1725# and all this just because we cannot iterate over
1330# all maps in C++... 1726# all maps in C++...
1331sub change_all_map_light { 1727sub change_all_map_light {
1332 my ($change) = @_; 1728 my ($change) = @_;
1333 1729
1334 $_->change_map_light ($change) 1730 $_->change_map_light ($change)
1335 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;
1336} 1740}
1337 1741
1338sub unlink_save { 1742sub unlink_save {
1339 my ($self) = @_; 1743 my ($self) = @_;
1340 1744
1398 $self->load_header_orig 1802 $self->load_header_orig
1399 or return; 1803 or return;
1400 $self->prepare_orig; 1804 $self->prepare_orig;
1401 } 1805 }
1402 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
1403 1 1813 1
1404} 1814}
1405 1815
1406sub find; 1816sub find;
1407sub find { 1817sub find {
1419 $map->{last_save} = $cf::RUNTIME; 1829 $map->{last_save} = $cf::RUNTIME;
1420 1830
1421 $map->load_header 1831 $map->load_header
1422 or return; 1832 or return;
1423 1833
1424 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1425 # doing this can freeze the server in a sync job, obviously 1835 # doing this can freeze the server in a sync job, obviously
1426 #$cf::WAIT_FOR_TICK->wait; 1836 #$cf::WAIT_FOR_TICK->wait;
1427 $map->reset; 1837 $map->reset;
1428 undef $guard; 1838 undef $guard;
1429 return find $path; 1839 return find $path;
1440 my ($self) = @_; 1850 my ($self) = @_;
1441 1851
1442 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1443 1853
1444 my $path = $self->{path}; 1854 my $path = $self->{path};
1855
1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1445 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1446 1859
1447 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1448 1861
1449 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1450 1863
1451 $self->alloc; 1864 $self->alloc;
1452 1865
1453 $self->pre_load; 1866 $self->pre_load;
1867 cf::cede_to_tick;
1454 1868
1455 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1456 or return; 1870 or return;
1457 1871
1458 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1459 if delete $self->{load_original}; 1873 if delete $self->{load_original};
1460 1874
1461 if (my $uniq = $self->uniq_path) { 1875 if (my $uniq = $self->uniq_path) {
1462 utf8::encode $uniq; 1876 utf8::encode $uniq;
1463 if (aio_open $uniq, O_RDONLY, 0) { 1877 if (aio_open $uniq, O_RDONLY, 0) {
1464 $self->clear_unique_items; 1878 $self->clear_unique_items;
1465 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1466 } 1880 }
1467 } 1881 }
1468 1882
1469 Coro::cede; 1883 cf::cede_to_tick;
1470
1471 # now do the right thing for maps 1884 # now do the right thing for maps
1472 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1473
1474 unless ($self->{deny_activate}) {
1475 $self->decay_objects;
1476 $self->fix_auto_apply;
1477 $self->update_buttons;
1478 Coro::cede;
1479 $self->set_darkness_map;
1480 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1481 unless $self->difficulty; 1887 unless $self->difficulty;
1482 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;
1483 $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);
1484 } 1904 }
1485 1905
1486 $self->post_load; 1906 $self->post_load;
1487
1488 $self->in_memory (cf::MAP_IN_MEMORY);
1489} 1907}
1490 1908
1491sub customise_for { 1909sub customise_for {
1492 my ($self, $ob) = @_; 1910 my ($self, $ob) = @_;
1493 1911
1494 return find "~" . $ob->name . "/" . $self->{path} 1912 return find "~" . $ob->name . "/" . $self->{path}
1495 if $self->per_player; 1913 if $self->per_player;
1496 1914
1915# return find "?party/" . $ob->name . "/" . $self->{path}
1916# if $self->per_party;
1917
1497 $self 1918 $self
1498} 1919}
1499 1920
1500# 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
1501sub load_diag { 1922sub load_neighbours {
1502 my ($map) = @_; 1923 my ($map) = @_;
1503 1924
1504 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1505 1926
1506 for (0 .. 3) { 1927 for (0 .. 3) {
1507 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1508 or next; 1929 or next;
1509 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1510 or next; 1931 or next;
1511 $neigh->load; 1932 $neigh->load;
1512 1933
1934 push @neigh,
1513 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1514 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1515 } 1937 }
1516 1938
1517 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1518 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1519 or next; 1942 or next;
1520 $neigh->load; 1943 $neigh->load;
1521 } 1944 }
1522} 1945}
1523 1946
1528} 1951}
1529 1952
1530sub do_load_sync { 1953sub do_load_sync {
1531 my ($map) = @_; 1954 my ($map) = @_;
1532 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1533 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1534} 1960}
1535 1961
1536our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1537our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1538 1964
1539sub find_async { 1965sub find_async {
1540 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1541 1967
1542 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1543 1969
1544 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1545 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1546 } 1972 }
1547 1973
1548 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1549 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1550 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1551 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1552 my $map = find $path 1979 if (my $map = find $k) {
1553 or next;
1554 $map->load; 1980 $map->load if $v;
1981 }
1555 1982
1556 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
1557 } 1984 }
1558 } 1985 }
1559 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1560 }; 1987 };
1561 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
1564} 1991}
1565 1992
1566sub save { 1993sub save {
1567 my ($self) = @_; 1994 my ($self) = @_;
1568 1995
1569 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1570 1997
1571 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1572 1999
1573 return unless $self->dirty; 2000 return unless $self->dirty;
1574 2001
1597 my ($self) = @_; 2024 my ($self) = @_;
1598 2025
1599 # save first because save cedes 2026 # save first because save cedes
1600 $self->save; 2027 $self->save;
1601 2028
1602 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
1603 2030
1604 return if $self->players; 2031 return if $self->players;
1605 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
1606 return if $self->{deny_save}; 2033 return if $self->{deny_save};
1607 2034
1611 2038
1612sub reset_at { 2039sub reset_at {
1613 my ($self) = @_; 2040 my ($self) = @_;
1614 2041
1615 # TODO: safety, remove and allow resettable per-player maps 2042 # TODO: safety, remove and allow resettable per-player maps
1616 return 1e99 if $self->isa ("ext::map_per_player");#d#
1617 return 1e99 if $self->{deny_reset}; 2043 return 1e99 if $self->{deny_reset};
1618 2044
1619 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2045 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1620 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;
1621 2047
1632 my ($self) = @_; 2058 my ($self) = @_;
1633 2059
1634 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1635 2061
1636 return if $self->players; 2062 return if $self->players;
1637 return if $self->isa ("ext::map_per_player");#d#
1638 2063
1639 warn "resetting map ", $self->path;#d# 2064 warn "resetting map ", $self->path;
1640 2065
1641 $self->in_memory (cf::MAP_SWAPPED); 2066 $self->in_memory (cf::MAP_SWAPPED);
1642 2067
1643 # need to save uniques path 2068 # need to save uniques path
1644 unless ($self->{deny_save}) { 2069 unless ($self->{deny_save}) {
1676 $cf::MAP{$self->path} = $self; 2101 $cf::MAP{$self->path} = $self;
1677 2102
1678 $self->reset; # polite request, might not happen 2103 $self->reset; # polite request, might not happen
1679} 2104}
1680 2105
2106=item $maps = cf::map::tmp_maps
2107
2108Returns an arrayref with all map paths of currently instantiated and saved
2109maps. May block.
2110
2111=cut
2112
2113sub tmp_maps() {
2114 [
2115 map {
2116 utf8::decode $_;
2117 /\.map$/
2118 ? normalise $_
2119 : ()
2120 } @{ aio_readdir $TMPDIR or [] }
2121 ]
2122}
2123
2124=item $maps = cf::map::random_maps
2125
2126Returns an arrayref with all map paths of currently instantiated and saved
2127random maps. May block.
2128
2129=cut
2130
2131sub random_maps() {
2132 [
2133 map {
2134 utf8::decode $_;
2135 /\.map$/
2136 ? normalise "?random/$_"
2137 : ()
2138 } @{ aio_readdir $RANDOMDIR or [] }
2139 ]
2140}
2141
1681=item cf::map::unique_maps 2142=item cf::map::unique_maps
1682 2143
1683Returns an arrayref of paths of all shared maps that have 2144Returns an arrayref of paths of all shared maps that have
1684instantiated unique items. May block. 2145instantiated unique items. May block.
1685 2146
1686=cut 2147=cut
1687 2148
1688sub unique_maps() { 2149sub unique_maps() {
1689 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2150 [
1690 or return; 2151 map {
1691
1692 my @paths;
1693
1694 for (@$files) {
1695 utf8::decode $_; 2152 utf8::decode $_;
1696 next if /\.pst$/; 2153 /\.map$/
1697 next unless /^$PATH_SEP/o; 2154 ? normalise $_
1698 2155 : ()
1699 push @paths, cf::map::normalise $_; 2156 } @{ aio_readdir $UNIQUEDIR or [] }
1700 } 2157 ]
1701
1702 \@paths
1703} 2158}
1704 2159
1705package cf; 2160package cf;
1706 2161
1707=back 2162=back
1753 2208
1754 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2209 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1755 2210
1756 if ($self->{record_replies}) { 2211 if ($self->{record_replies}) {
1757 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2212 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2213
1758 } else { 2214 } else {
2215 my $pl = $self->contr;
2216
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $dialog = $pl->{npc_dialog};
2219 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220
2221 } else {
1759 $msg = $npc->name . " says: $msg" if $npc; 2222 $msg = $npc->name . " says: $msg" if $npc;
1760 $self->message ($msg, $flags); 2223 $self->message ($msg, $flags);
2224 }
1761 } 2225 }
2226}
2227
2228=item $object->send_msg ($channel, $msg, $color, [extra...])
2229
2230=cut
2231
2232sub cf::object::send_msg {
2233 my $pl = shift->contr
2234 or return;
2235 $pl->send_msg (@_);
1762} 2236}
1763 2237
1764=item $player_object->may ("access") 2238=item $player_object->may ("access")
1765 2239
1766Returns wether the given player is authorized to access resource "access" 2240Returns wether the given player is authorized to access resource "access"
1813 $self->deactivate_recursive; 2287 $self->deactivate_recursive;
1814 2288
1815 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2289 return if UNIVERSAL::isa $self->map, "ext::map_link";
1816 2290
1817 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2291 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1818 if $self->map; 2292 if $self->map && $self->map->{path} ne "{link}";
1819 2293
1820 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2294 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1821} 2295}
1822 2296
1823sub cf::object::player::leave_link { 2297sub cf::object::player::leave_link {
1824 my ($self, $map, $x, $y) = @_; 2298 my ($self, $map, $x, $y) = @_;
2299
2300 return unless $self->contr->active;
1825 2301
1826 my $link_pos = delete $self->{_link_pos}; 2302 my $link_pos = delete $self->{_link_pos};
1827 2303
1828 unless ($map) { 2304 unless ($map) {
1829 # restore original map position 2305 # restore original map position
1843 # use -1 or undef as default coordinates, not 0, 0 2319 # use -1 or undef as default coordinates, not 0, 0
1844 ($x, $y) = ($map->enter_x, $map->enter_y) 2320 ($x, $y) = ($map->enter_x, $map->enter_y)
1845 if $x <=0 && $y <= 0; 2321 if $x <=0 && $y <= 0;
1846 2322
1847 $map->load; 2323 $map->load;
1848 $map->load_diag; 2324 $map->load_neighbours;
1849 2325
1850 return unless $self->contr->active; 2326 return unless $self->contr->active;
1851 $self->activate_recursive; 2327 $self->activate_recursive;
1852 2328
1853 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2329 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1854 $self->enter_map ($map, $x, $y); 2330 $self->enter_map ($map, $x, $y);
1855} 2331}
1856 2332
1857cf::player->attach ( 2333=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1858 on_logout => sub {
1859 my ($pl) = @_;
1860 2334
1861 # abort map switching before logout 2335Moves the player to the given map-path and coordinates by first freezing
1862 if ($pl->ob->{_link_pos}) { 2336her, loading and preparing them map, calling the provided $check callback
1863 cf::sync_job { 2337that has to return the map if sucecssful, and then unfreezes the player on
1864 $pl->ob->leave_link 2338the new (success) or old (failed) map position. In either case, $done will
1865 }; 2339be called at the end of this process.
1866 }
1867 },
1868 on_login => sub {
1869 my ($pl) = @_;
1870 2340
1871 # try to abort aborted map switching on player login :)
1872 # should happen only on crashes
1873 if ($pl->ob->{_link_pos}) {
1874 $pl->ob->enter_link;
1875 (async {
1876 $pl->ob->reply (undef,
1877 "There was an internal problem at your last logout, "
1878 . "the server will try to bring you to your intended destination in a second.",
1879 cf::NDI_RED);
1880 # we need this sleep as the login has a concurrent enter_exit running
1881 # and this sleep increases chances of the player not ending up in scorn
1882 Coro::Timer::sleep 1;
1883 $pl->ob->leave_link;
1884 })->prio (2);
1885 }
1886 },
1887);
1888
1889=item $player_object->goto ($path, $x, $y)
1890
1891=cut 2341=cut
2342
2343our $GOTOGEN;
1892 2344
1893sub cf::object::player::goto { 2345sub cf::object::player::goto {
1894 my ($self, $path, $x, $y) = @_; 2346 my ($self, $path, $x, $y, $check, $done) = @_;
2347
2348 # do generation counting so two concurrent goto's will be executed in-order
2349 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1895 2350
1896 $self->enter_link; 2351 $self->enter_link;
1897 2352
1898 (async { 2353 (async {
1899 my $map = eval { 2354 my $map = eval {
1900 my $map = cf::map::find $path; 2355 my $map = cf::map::find $path;
2356
2357 if ($map) {
1901 $map = $map->customise_for ($self) if $map; 2358 $map = $map->customise_for ($self);
2359 $map = $check->($map) if $check && $map;
2360 } else {
2361 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2362 }
2363
1902 $map 2364 $map
2365 };
2366
2367 if ($@) {
2368 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2369 LOG llevError | logBacktrace, Carp::longmess $@;
1903 } or 2370 }
1904 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1905 2371
2372 if ($gen == $self->{_goto_generation}) {
2373 delete $self->{_goto_generation};
1906 $self->leave_link ($map, $x, $y); 2374 $self->leave_link ($map, $x, $y);
2375 }
2376
2377 $done->() if $done;
1907 })->prio (1); 2378 })->prio (1);
1908} 2379}
1909 2380
1910=item $player_object->enter_exit ($exit_object) 2381=item $player_object->enter_exit ($exit_object)
1911 2382
1950 2421
1951 $rmp->{random_seed} ||= $exit->random_seed; 2422 $rmp->{random_seed} ||= $exit->random_seed;
1952 2423
1953 my $data = cf::to_json $rmp; 2424 my $data = cf::to_json $rmp;
1954 my $md5 = Digest::MD5::md5_hex $data; 2425 my $md5 = Digest::MD5::md5_hex $data;
1955 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2426 my $meta = "$RANDOMDIR/$md5.meta";
1956 2427
1957 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2428 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1958 aio_write $fh, 0, (length $data), $data, 0; 2429 aio_write $fh, 0, (length $data), $data, 0;
1959 undef $fh; 2430 undef $fh;
1960 aio_rename "$meta~", $meta; 2431 aio_rename "$meta~", $meta;
1969 2440
1970 return unless $self->type == cf::PLAYER; 2441 return unless $self->type == cf::PLAYER;
1971 2442
1972 if ($exit->slaying eq "/!") { 2443 if ($exit->slaying eq "/!") {
1973 #TODO: this should de-fi-ni-te-ly not be a sync-job 2444 #TODO: this should de-fi-ni-te-ly not be a sync-job
2445 # the problem is that $exit might not survive long enough
2446 # so it needs to be done right now, right here
1974 cf::sync_job { prepare_random_map $exit }; 2447 cf::sync_job { prepare_random_map $exit };
1975 } 2448 }
1976 2449
1977 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2450 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1978 my $hp = $exit->stats->hp; 2451 my $hp = $exit->stats->hp;
1979 my $sp = $exit->stats->sp; 2452 my $sp = $exit->stats->sp;
1980 2453
1981 $self->enter_link; 2454 $self->enter_link;
2455
2456 # if exit is damned, update players death & WoR home-position
2457 $self->contr->savebed ($slaying, $hp, $sp)
2458 if $exit->flag (FLAG_DAMNED);
1982 2459
1983 (async { 2460 (async {
1984 $self->deactivate_recursive; # just to be sure 2461 $self->deactivate_recursive; # just to be sure
1985 unless (eval { 2462 unless (eval {
1986 $self->goto ($slaying, $hp, $sp); 2463 $self->goto ($slaying, $hp, $sp);
1987 2464
1988 1; 2465 1;
1989 }) { 2466 }) {
1990 $self->message ("Something went wrong deep within the crossfire server. " 2467 $self->message ("Something went wrong deep within the crossfire server. "
1991 . "I'll try to bring you back to the map you were before. " 2468 . "I'll try to bring you back to the map you were before. "
1992 . "Please report this to the dungeon master!", 2469 . "Please report this to the dungeon master!",
1993 cf::NDI_UNIQUE | cf::NDI_RED); 2470 cf::NDI_UNIQUE | cf::NDI_RED);
1994 2471
1995 warn "ERROR in enter_exit: $@"; 2472 warn "ERROR in enter_exit: $@";
1996 $self->leave_link; 2473 $self->leave_link;
1997 } 2474 }
1998 })->prio (1); 2475 })->prio (1);
2014 2491
2015 utf8::encode $text; 2492 utf8::encode $text;
2016 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2493 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2017} 2494}
2018 2495
2496=item $client->send_msg ($channel, $msg, $color, [extra...])
2497
2498Send a drawinfo or msg packet to the client, formatting the msg for the
2499client if neccessary. C<$type> should be a string identifying the type of
2500the message, with C<log> being the default. If C<$color> is negative, suppress
2501the message unless the client supports the msg packet.
2502
2503=cut
2504
2505sub cf::client::send_msg {
2506 my ($self, $channel, $msg, $color, @extra) = @_;
2507
2508 $msg = $self->pl->expand_cfpod ($msg);
2509
2510 $color &= cf::NDI_CLIENT_MASK; # just in case...
2511
2512 if (ref $channel) {
2513 # send meta info to client, if not yet sent
2514 unless (exists $self->{channel}{$channel->{id}}) {
2515 $self->{channel}{$channel->{id}} = $channel;
2516 $self->ext_msg (channel_info => $channel);
2517 }
2518
2519 $channel = $channel->{id};
2520 }
2521
2522 return unless @extra || length $msg;
2523
2524 if ($self->can_msg) {
2525 # default colour, mask it out
2526 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2527 if $color & cf::NDI_DEF;
2528
2529 $self->send_packet ("msg " . $self->{json_coder}->encode (
2530 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2531 } else {
2532 if ($color >= 0) {
2533 # replace some tags by gcfclient-compatible ones
2534 for ($msg) {
2535 1 while
2536 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2537 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2538 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2539 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2540 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2541 }
2542
2543 $color &= cf::NDI_COLOR_MASK;
2544
2545 utf8::encode $msg;
2546
2547 if (0 && $msg =~ /\[/) {
2548 # COMMAND/INFO
2549 $self->send_packet ("drawextinfo $color 10 8 $msg")
2550 } else {
2551 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2552 $self->send_packet ("drawinfo $color $msg")
2553 }
2554 }
2555 }
2556}
2557
2558=item $client->ext_msg ($type, @msg)
2559
2560Sends an ext event to the client.
2561
2562=cut
2563
2564sub cf::client::ext_msg($$@) {
2565 my ($self, $type, @msg) = @_;
2566
2567 if ($self->extcmd == 2) {
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2569 } elsif ($self->extcmd == 1) { # TODO: remove
2570 push @msg, msgtype => "event_$type";
2571 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2572 }
2573}
2574
2575=item $client->ext_reply ($msgid, @msg)
2576
2577Sends an ext reply to the client.
2578
2579=cut
2580
2581sub cf::client::ext_reply($$@) {
2582 my ($self, $id, @msg) = @_;
2583
2584 if ($self->extcmd == 2) {
2585 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2586 } elsif ($self->extcmd == 1) {
2587 #TODO: version 1, remove
2588 unshift @msg, msgtype => "reply", msgid => $id;
2589 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2590 }
2591}
2019 2592
2020=item $success = $client->query ($flags, "text", \&cb) 2593=item $success = $client->query ($flags, "text", \&cb)
2021 2594
2022Queues a query to the client, calling the given callback with 2595Queues a query to the client, calling the given callback with
2023the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2596the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2024C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2597C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2025 2598
2026Queries can fail, so check the return code. Or don't, as queries will become 2599Queries can fail, so check the return code. Or don't, as queries will
2027reliable at some point in the future. 2600become reliable at some point in the future.
2028 2601
2029=cut 2602=cut
2030 2603
2031sub cf::client::query { 2604sub cf::client::query {
2032 my ($self, $flags, $text, $cb) = @_; 2605 my ($self, $flags, $text, $cb) = @_;
2040 utf8::encode $text; 2613 utf8::encode $text;
2041 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2614 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2042 2615
2043 $self->send_packet ($self->{query_queue}[0][0]) 2616 $self->send_packet ($self->{query_queue}[0][0])
2044 if @{ $self->{query_queue} } == 1; 2617 if @{ $self->{query_queue} } == 1;
2618
2619 1
2045} 2620}
2046 2621
2047cf::client->attach ( 2622cf::client->attach (
2623 on_connect => sub {
2624 my ($ns) = @_;
2625
2626 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2627 },
2048 on_reply => sub { 2628 on_reply => sub {
2049 my ($ns, $msg) = @_; 2629 my ($ns, $msg) = @_;
2050 2630
2051 # this weird shuffling is so that direct followup queries 2631 # this weird shuffling is so that direct followup queries
2052 # get handled first 2632 # get handled first
2064 } else { 2644 } else {
2065 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2645 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2066 } 2646 }
2067 } 2647 }
2068 }, 2648 },
2649 on_exticmd => sub {
2650 my ($ns, $buf) = @_;
2651
2652 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2653
2654 if (ref $msg) {
2655 my ($type, $reply, @payload) =
2656 "ARRAY" eq ref $msg
2657 ? @$msg
2658 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2659
2660 my @reply;
2661
2662 if (my $cb = $EXTICMD{$type}) {
2663 @reply = $cb->($ns, @payload);
2664 }
2665
2666 $ns->ext_reply ($reply, @reply)
2667 if $reply;
2668
2669 } else {
2670 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2671 }
2672
2673 cf::override;
2674 },
2069); 2675);
2070 2676
2071=item $client->async (\&cb) 2677=item $client->async (\&cb)
2072 2678
2073Create a new coroutine, running the specified callback. The coroutine will 2679Create a new coroutine, running the specified callback. The coroutine will
2114our $safe = new Safe "safe"; 2720our $safe = new Safe "safe";
2115our $safe_hole = new Safe::Hole; 2721our $safe_hole = new Safe::Hole;
2116 2722
2117$SIG{FPE} = 'IGNORE'; 2723$SIG{FPE} = 'IGNORE';
2118 2724
2119$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2725$safe->permit_only (Opcode::opset qw(
2726 :base_core :base_mem :base_orig :base_math
2727 grepstart grepwhile mapstart mapwhile
2728 sort time
2729));
2120 2730
2121# here we export the classes and methods available to script code 2731# here we export the classes and methods available to script code
2122 2732
2123=pod 2733=pod
2124 2734
2125The following functions and methods are available within a safe environment: 2735The following functions and methods are available within a safe environment:
2126 2736
2127 cf::object contr pay_amount pay_player map 2737 cf::object
2738 contr pay_amount pay_player map x y force_find force_add
2739 insert remove name archname title slaying race decrease_ob_nr
2740
2128 cf::object::player player 2741 cf::object::player
2129 cf::player peaceful 2742 player
2130 cf::map trigger 2743
2744 cf::player
2745 peaceful
2746
2747 cf::map
2748 trigger
2131 2749
2132=cut 2750=cut
2133 2751
2134for ( 2752for (
2135 ["cf::object" => qw(contr pay_amount pay_player map)], 2753 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2754 insert remove inv name archname title slaying race
2755 decrease_ob_nr)],
2136 ["cf::object::player" => qw(player)], 2756 ["cf::object::player" => qw(player)],
2137 ["cf::player" => qw(peaceful)], 2757 ["cf::player" => qw(peaceful)],
2138 ["cf::map" => qw(trigger)], 2758 ["cf::map" => qw(trigger)],
2139) { 2759) {
2140 no strict 'refs'; 2760 no strict 'refs';
2211=back 2831=back
2212 2832
2213=cut 2833=cut
2214 2834
2215############################################################################# 2835#############################################################################
2216
2217=head2 EXTENSION DATABASE SUPPORT
2218
2219Crossfire maintains a very simple database for extension use. It can
2220currently store anything that can be serialised using Storable, which
2221excludes objects.
2222
2223The parameter C<$family> should best start with the name of the extension
2224using it, it should be unique.
2225
2226=over 4
2227
2228=item $value = cf::db_get $family => $key
2229
2230Returns a single value from the database.
2231
2232=item cf::db_put $family => $key => $value
2233
2234Stores the given C<$value> in the family.
2235
2236=cut
2237
2238our $DB;
2239
2240sub db_init {
2241 unless ($DB) {
2242 $DB = BDB::db_create $DB_ENV;
2243
2244 cf::sync_job {
2245 eval {
2246 $DB->set_flags (BDB::CHKSUM);
2247
2248 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2249 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2250 cf::cleanup "db_open(db): $!" if $!;
2251 };
2252 cf::cleanup "db_open(db): $@" if $@;
2253 };
2254
2255 my $path = cf::localdir . "/database.pst";
2256 if (stat $path) {
2257 cf::sync_job {
2258 my $pst = Storable::retrieve $path;
2259
2260 cf::db_put (board => data => $pst->{board});
2261 cf::db_put (guildrules => data => $pst->{guildrules});
2262 cf::db_put (rent => balance => $pst->{rent}{balance});
2263 BDB::db_env_txn_checkpoint $DB_ENV;
2264
2265 unlink $path;
2266 };
2267 }
2268 }
2269}
2270
2271sub db_get($$) {
2272 my $key = "$_[0]/$_[1]";
2273
2274 cf::sync_job {
2275 BDB::db_get $DB, undef, $key, my $data;
2276
2277 $! ? ()
2278 : Compress::LZF::sthaw $data
2279 }
2280}
2281
2282sub db_put($$$) {
2283 BDB::dbreq_pri 4;
2284 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2285}
2286
2287#############################################################################
2288# the server's init and main functions 2836# the server's init and main functions
2289 2837
2290sub load_facedata { 2838sub load_facedata($) {
2291 my $path = sprintf "%s/facedata", cf::datadir; 2839 my ($path) = @_;
2840
2841 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2292 2842
2293 warn "loading facedata from $path\n"; 2843 warn "loading facedata from $path\n";
2294 2844
2295 my $faces; 2845 my $facedata;
2296 0 < aio_load $path, $faces 2846 0 < aio_load $path, $facedata
2297 or die "$path: $!"; 2847 or die "$path: $!";
2298 2848
2299 Coro::cede;
2300 $faces = Storable::thaw $faces; 2849 $facedata = Coro::Storable::thaw $facedata;
2301 Coro::cede;
2302 2850
2303 my $meta = delete $faces->{""};
2304 $meta->{version} == 1 2851 $facedata->{version} == 2
2305 or cf::cleanup "$path: version mismatch, cannot proceed."; 2852 or cf::cleanup "$path: version mismatch, cannot proceed.";
2306 2853
2854 # patch in the exptable
2855 $facedata->{resource}{"res/exp_table"} = {
2856 type => FT_RSRC,
2857 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2858 };
2859 cf::cede_to_tick;
2860
2861 {
2862 my $faces = $facedata->{faceinfo};
2863
2307 while (my ($face, $info) = each %$faces) { 2864 while (my ($face, $info) = each %$faces) {
2308 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2865 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2309 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2866 cf::face::set_visibility $idx, $info->{visibility};
2867 cf::face::set_magicmap $idx, $info->{magicmap};
2310 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2868 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2311 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2869 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2312 Coro::cede;
2313 }
2314 2870
2871 cf::cede_to_tick;
2872 }
2873
2315 while (my ($face, $info) = each %$faces) { 2874 while (my ($face, $info) = each %$faces) {
2316 next unless $info->{smooth}; 2875 next unless $info->{smooth};
2317 my $idx = cf::face::find $face 2876 my $idx = cf::face::find $face
2318 or next; 2877 or next;
2319 if (my $smooth = cf::face::find $info->{smooth}) { 2878 if (my $smooth = cf::face::find $info->{smooth}) {
2320 cf::face::set_smooth $idx, $smooth; 2879 cf::face::set_smooth $idx, $smooth;
2880 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2321 } else { 2881 } else {
2322 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2882 warn "smooth face '$info->{smooth}' not found for face '$face'";
2323 } 2883 }
2324 Coro::cede; 2884
2885 cf::cede_to_tick;
2886 }
2887 }
2888
2889 {
2890 my $anims = $facedata->{animinfo};
2891
2892 while (my ($anim, $info) = each %$anims) {
2893 cf::anim::set $anim, $info->{frames}, $info->{facings};
2894 cf::cede_to_tick;
2895 }
2896
2897 cf::anim::invalidate_all; # d'oh
2898 }
2899
2900 {
2901 # TODO: for gcfclient pleasure, we should give resources
2902 # that gcfclient doesn't grok a >10000 face index.
2903 my $res = $facedata->{resource};
2904
2905 my $soundconf = delete $res->{"res/sound.conf"};
2906
2907 while (my ($name, $info) = each %$res) {
2908 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2909 my $data;
2910
2911 if ($info->{type} & 1) {
2912 # prepend meta info
2913
2914 my $meta = $enc->encode ({
2915 name => $name,
2916 %{ $info->{meta} || {} },
2917 });
2918
2919 $data = pack "(w/a*)*", $meta, $info->{data};
2920 } else {
2921 $data = $info->{data};
2922 }
2923
2924 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2925 cf::face::set_type $idx, $info->{type};
2926
2927 cf::cede_to_tick;
2928 }
2929
2930 if ($soundconf) {
2931 $soundconf = $enc->decode (delete $soundconf->{data});
2932
2933 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2934 my $sound = $soundconf->{compat}[$_]
2935 or next;
2936
2937 my $face = cf::face::find "sound/$sound->[1]";
2938 cf::sound::set $sound->[0] => $face;
2939 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2940 }
2941
2942 while (my ($k, $v) = each %{$soundconf->{event}}) {
2943 my $face = cf::face::find "sound/$v";
2944 cf::sound::set $k => $face;
2945 }
2946 }
2325 } 2947 }
2326 2948
2327 1 2949 1
2328} 2950}
2329 2951
2952register_exticmd fx_want => sub {
2953 my ($ns, $want) = @_;
2954
2955 while (my ($k, $v) = each %$want) {
2956 $ns->fx_want ($k, $v);
2957 }
2958};
2959
2960sub reload_regions {
2961 load_resource_file "$MAPDIR/regions"
2962 or die "unable to load regions file\n";
2963
2964 for (cf::region::list) {
2965 $_->{match} = qr/$_->{match}/
2966 if exists $_->{match};
2967 }
2968}
2969
2970sub reload_facedata {
2971 load_facedata "$DATADIR/facedata"
2972 or die "unable to load facedata\n";
2973}
2974
2975sub reload_archetypes {
2976 load_resource_file "$DATADIR/archetypes"
2977 or die "unable to load archetypes\n";
2978 #d# NEED to laod twice to resolve forward references
2979 # this really needs to be done in an extra post-pass
2980 # (which needs to be synchronous, so solve it differently)
2981 load_resource_file "$DATADIR/archetypes"
2982 or die "unable to load archetypes\n";
2983}
2984
2985sub reload_treasures {
2986 load_resource_file "$DATADIR/treasures"
2987 or die "unable to load treasurelists\n";
2988}
2989
2330sub reload_resources { 2990sub reload_resources {
2331 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2991 warn "reloading resource files...\n";
2332 or die "unable to load regions file\n";#d# 2992
2993 reload_regions;
2333 load_facedata 2994 reload_facedata;
2334 or die "unable to load facedata\n";#d# 2995 #reload_archetypes;#d#
2996 reload_archetypes;
2997 reload_treasures;
2998
2999 warn "finished reloading resource files\n";
2335} 3000}
2336 3001
2337sub init { 3002sub init {
2338 reload_resources; 3003 reload_resources;
2339} 3004}
2340 3005
2341sub cfg_load { 3006sub reload_config {
2342 open my $fh, "<:utf8", cf::confdir . "/config" 3007 open my $fh, "<:utf8", "$CONFDIR/config"
2343 or return; 3008 or return;
2344 3009
2345 local $/; 3010 local $/;
2346 *CFG = YAML::Syck::Load <$fh>; 3011 *CFG = YAML::Syck::Load <$fh>;
2347 3012
2366 (async { 3031 (async {
2367 Event::one_event; 3032 Event::one_event;
2368 })->prio (Coro::PRIO_MAX); 3033 })->prio (Coro::PRIO_MAX);
2369 }; 3034 };
2370 3035
2371 cfg_load; 3036 reload_config;
2372 db_init; 3037 db_init;
2373 load_extensions; 3038 load_extensions;
2374 3039
2375 $TICK_WATCHER->start; 3040 $TICK_WATCHER->start;
2376 Event::loop; 3041 Event::loop;
2392 }, 3057 },
2393 ); 3058 );
2394 } 3059 }
2395} 3060}
2396 3061
3062sub write_runtime {
3063 my $runtime = "$LOCALDIR/runtime";
3064
3065 # first touch the runtime file to show we are still running:
3066 # the fsync below can take a very very long time.
3067
3068 IO::AIO::aio_utime $runtime, undef, undef;
3069
3070 my $guard = cf::lock_acquire "write_runtime";
3071
3072 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3073 or return;
3074
3075 my $value = $cf::RUNTIME + 90 + 10;
3076 # 10 is the runtime save interval, for a monotonic clock
3077 # 60 allows for the watchdog to kill the server.
3078
3079 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3080 and return;
3081
3082 # always fsync - this file is important
3083 aio_fsync $fh
3084 and return;
3085
3086 # touch it again to show we are up-to-date
3087 aio_utime $fh, undef, undef;
3088
3089 close $fh
3090 or return;
3091
3092 aio_rename "$runtime~", $runtime
3093 and return;
3094
3095 warn "runtime file written.\n";
3096
3097 1
3098}
3099
2397sub emergency_save() { 3100sub emergency_save() {
2398 my $freeze_guard = cf::freeze_mainloop; 3101 my $freeze_guard = cf::freeze_mainloop;
2399 3102
2400 warn "enter emergency perl save\n"; 3103 warn "enter emergency perl save\n";
2401 3104
2432 3135
2433 warn Carp::longmess "post_cleanup backtrace" 3136 warn Carp::longmess "post_cleanup backtrace"
2434 if $make_core; 3137 if $make_core;
2435} 3138}
2436 3139
2437sub reload() { 3140sub do_reload_perl() {
2438 # can/must only be called in main 3141 # can/must only be called in main
2439 if ($Coro::current != $Coro::main) { 3142 if ($Coro::current != $Coro::main) {
2440 warn "can only reload from main coroutine"; 3143 warn "can only reload from main coroutine";
2441 return; 3144 return;
2442 } 3145 }
2476 %EXT_CORO = (); 3179 %EXT_CORO = ();
2477 3180
2478 warn "removing commands"; 3181 warn "removing commands";
2479 %COMMAND = (); 3182 %COMMAND = ();
2480 3183
2481 warn "removing ext commands"; 3184 warn "removing ext/exti commands";
2482 %EXTCMD = (); 3185 %EXTCMD = ();
3186 %EXTICMD = ();
2483 3187
2484 warn "unloading/nuking all extensions"; 3188 warn "unloading/nuking all extensions";
2485 for my $pkg (@EXTS) { 3189 for my $pkg (@EXTS) {
2486 warn "... unloading $pkg"; 3190 warn "... unloading $pkg";
2487 3191
2517 Symbol::delete_package "safe::$_" 3221 Symbol::delete_package "safe::$_"
2518 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3222 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2519 3223
2520 warn "unloading cf.pm \"a bit\""; 3224 warn "unloading cf.pm \"a bit\"";
2521 delete $INC{"cf.pm"}; 3225 delete $INC{"cf.pm"};
3226 delete $INC{"cf/pod.pm"};
2522 3227
2523 # don't, removes xs symbols, too, 3228 # don't, removes xs symbols, too,
2524 # and global variables created in xs 3229 # and global variables created in xs
2525 #Symbol::delete_package __PACKAGE__; 3230 #Symbol::delete_package __PACKAGE__;
2526 3231
2529 warn "reloading cf.pm"; 3234 warn "reloading cf.pm";
2530 require cf; 3235 require cf;
2531 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3236 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2532 3237
2533 warn "loading config and database again"; 3238 warn "loading config and database again";
2534 cf::cfg_load; 3239 cf::reload_config;
2535 3240
2536 warn "loading extensions"; 3241 warn "loading extensions";
2537 cf::load_extensions; 3242 cf::load_extensions;
2538 3243
2539 warn "reattaching attachments to objects/players"; 3244 warn "reattaching attachments to objects/players";
2541 warn "reattaching attachments to maps"; 3246 warn "reattaching attachments to maps";
2542 reattach $_ for values %MAP; 3247 reattach $_ for values %MAP;
2543 warn "reattaching attachments to players"; 3248 warn "reattaching attachments to players";
2544 reattach $_ for values %PLAYER; 3249 reattach $_ for values %PLAYER;
2545 3250
2546 warn "loading reloadable resources";
2547 reload_resources;
2548
2549 warn "leaving sync_job"; 3251 warn "leaving sync_job";
2550 3252
2551 1 3253 1
2552 } or do { 3254 } or do {
2553 warn $@; 3255 warn $@;
2558 warn "reloaded"; 3260 warn "reloaded";
2559}; 3261};
2560 3262
2561our $RELOAD_WATCHER; # used only during reload 3263our $RELOAD_WATCHER; # used only during reload
2562 3264
3265sub reload_perl() {
3266 # doing reload synchronously and two reloads happen back-to-back,
3267 # coro crashes during coro_state_free->destroy here.
3268
3269 $RELOAD_WATCHER ||= Event->timer (
3270 reentrant => 0,
3271 after => 0,
3272 data => WF_AUTOCANCEL,
3273 cb => sub {
3274 do_reload_perl;
3275 undef $RELOAD_WATCHER;
3276 },
3277 );
3278}
3279
2563register_command "reload" => sub { 3280register_command "reload" => sub {
2564 my ($who, $arg) = @_; 3281 my ($who, $arg) = @_;
2565 3282
2566 if ($who->flag (FLAG_WIZ)) { 3283 if ($who->flag (FLAG_WIZ)) {
2567 $who->message ("reloading server."); 3284 $who->message ("reloading server.");
2568 3285 async { reload_perl };
2569 # doing reload synchronously and two reloads happen back-to-back,
2570 # coro crashes during coro_state_free->destroy here.
2571
2572 $RELOAD_WATCHER ||= Event->timer (
2573 reentrant => 0,
2574 after => 0,
2575 data => WF_AUTOCANCEL,
2576 cb => sub {
2577 reload;
2578 undef $RELOAD_WATCHER;
2579 },
2580 );
2581 } 3286 }
2582}; 3287};
2583 3288
2584unshift @INC, $LIBDIR; 3289unshift @INC, $LIBDIR;
2585 3290
2586my $bug_warning = 0; 3291my $bug_warning = 0;
2587 3292
3293our @WAIT_FOR_TICK;
3294our @WAIT_FOR_TICK_BEGIN;
3295
3296sub wait_for_tick {
3297 return unless $TICK_WATCHER->is_active;
3298 return if $Coro::current == $Coro::main;
3299
3300 my $signal = new Coro::Signal;
3301 push @WAIT_FOR_TICK, $signal;
3302 $signal->wait;
3303}
3304
3305sub wait_for_tick_begin {
3306 return unless $TICK_WATCHER->is_active;
3307 return if $Coro::current == $Coro::main;
3308
3309 my $signal = new Coro::Signal;
3310 push @WAIT_FOR_TICK_BEGIN, $signal;
3311 $signal->wait;
3312}
3313
3314 my $min = 1e6;#d#
3315 my $avg = 10;
2588$TICK_WATCHER = Event->timer ( 3316$TICK_WATCHER = Event->timer (
2589 reentrant => 0, 3317 reentrant => 0,
2590 parked => 1, 3318 parked => 1,
2591 prio => 0, 3319 prio => 0,
2592 at => $NEXT_TICK || $TICK, 3320 at => $NEXT_TICK || $TICK,
2596 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3324 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2597 unless ++$bug_warning > 10; 3325 unless ++$bug_warning > 10;
2598 return; 3326 return;
2599 } 3327 }
2600 3328
2601 $NOW = Event::time; 3329 $NOW = $tick_start = Event::time;
2602 3330
2603 cf::server_tick; # one server iteration 3331 cf::server_tick; # one server iteration
3332
3333 0 && sync_job {#d#
3334 for(1..10) {
3335 my $t = Event::time;
3336 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3337 or die;
3338
3339 $map->width (50);
3340 $map->height (50);
3341 $map->alloc;
3342 $map->_load_objects ("/tmp/x.map", 1);
3343 my $t = Event::time - $t;
3344
3345 #next unless $t < 0.0013;#d#
3346 if ($t < $min) {
3347 $min = $t;
3348 }
3349 $avg = $avg * 0.99 + $t * 0.01;
3350 }
3351 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3352 exit 0;
3353 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3354 };
3355
2604 $RUNTIME += $TICK; 3356 $RUNTIME += $TICK;
2605 $NEXT_TICK += $TICK; 3357 $NEXT_TICK += $TICK;
2606 3358
2607 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3359 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2608 $NEXT_RUNTIME_WRITE = $NOW + 10; 3360 $NEXT_RUNTIME_WRITE = $NOW + 10;
2610 write_runtime 3362 write_runtime
2611 or warn "ERROR: unable to write runtime file: $!"; 3363 or warn "ERROR: unable to write runtime file: $!";
2612 }; 3364 };
2613 } 3365 }
2614 3366
2615 $WAIT_FOR_TICK->broadcast;
2616 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2617
2618# my $AFTER = Event::time; 3367# my $AFTER = Event::time;
2619# warn $AFTER - $NOW;#d# 3368# warn $AFTER - $NOW;#d#
2620 3369
3370 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3371 $sig->send;
3372 }
3373 while (my $sig = shift @WAIT_FOR_TICK) {
3374 $sig->send;
3375 }
3376
3377 $NOW = Event::time;
3378
2621 # if we are delayed by four ticks or more, skip them all 3379 # if we are delayed by four ticks or more, skip them all
2622 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3380 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2623 3381
2624 $TICK_WATCHER->at ($NEXT_TICK); 3382 $TICK_WATCHER->at ($NEXT_TICK);
2625 $TICK_WATCHER->start; 3383 $TICK_WATCHER->start;
3384
3385 $LOAD = ($NOW - $tick_start) / $TICK;
3386 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3387
3388 _post_tick;
3389
3390
2626 }, 3391 },
2627); 3392);
2628 3393
2629{ 3394{
2630 BDB::max_poll_time $TICK * 0.1; 3395 BDB::max_poll_time $TICK * 0.1;
2658 3423
2659 cf::sync_job { 3424 cf::sync_job {
2660 eval { 3425 eval {
2661 BDB::db_env_open 3426 BDB::db_env_open
2662 $DB_ENV, 3427 $DB_ENV,
2663 $BDB_ENV_DIR, 3428 $BDBDIR,
2664 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3429 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2665 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3430 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2666 0666; 3431 0666;
2667 3432
2668 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3433 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2669 3434
2670 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3435 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2671 $DB_ENV->set_lk_detect; 3436 $DB_ENV->set_lk_detect;
2672 }; 3437 };
2673 3438
2689 prio => 6, 3454 prio => 6,
2690 cb => \&IO::AIO::poll_cb, 3455 cb => \&IO::AIO::poll_cb,
2691 ); 3456 );
2692} 3457}
2693 3458
3459my $_log_backtrace;
3460
3461sub _log_backtrace {
3462 my ($msg, @addr) = @_;
3463
3464 $msg =~ s/\n//;
3465
3466 # limit the # of concurrent backtraces
3467 if ($_log_backtrace < 2) {
3468 ++$_log_backtrace;
3469 async {
3470 my @bt = fork_call {
3471 @addr = map { sprintf "%x", $_ } @addr;
3472 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3473 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3474 or die "addr2line: $!";
3475
3476 my @funcs;
3477 my @res = <$fh>;
3478 chomp for @res;
3479 while (@res) {
3480 my ($func, $line) = splice @res, 0, 2, ();
3481 push @funcs, "[$func] $line";
3482 }
3483
3484 @funcs
3485 };
3486
3487 LOG llevInfo, "[ABT] $msg\n";
3488 LOG llevInfo, "[ABT] $_\n" for @bt;
3489 --$_log_backtrace;
3490 };
3491 } else {
3492 LOG llevInfo, "[ABT] $msg\n";
3493 LOG llevInfo, "[ABT] [suppressed]\n";
3494 }
3495}
3496
3497# load additional modules
3498use cf::pod;
3499
2694END { cf::emergency_save } 3500END { cf::emergency_save }
2695 3501
26961 35021
2697 3503

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines