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.355 by root, Sun Sep 2 12:45:44 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 (likely 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) {
1418 my $path = path $login;
1419
1420 # a .pst is a dead give-away for a valid player
1421 unless (-e "$path.pst") {
1090 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1422 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1091 aio_read $fh, 0, 512, my $buf, 0 or next; 1423 aio_read $fh, 0, 512, my $buf, 0 or next;
1092 $buf !~ /^password -------------$/m or next; # official not-valid tag 1424 $buf !~ /^password -------------$/m or next; # official not-valid tag
1425 }
1093 1426
1094 utf8::decode $login; 1427 utf8::decode $login;
1095 push @logins, $login; 1428 push @logins, $login;
1096 } 1429 }
1097 1430
1124 } 1457 }
1125 1458
1126 \@paths 1459 \@paths
1127} 1460}
1128 1461
1462=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1463
1464Expand crossfire pod fragments into protocol xml.
1465
1466=cut
1467
1468sub expand_cfpod {
1469 ((my $self), (local $_)) = @_;
1470
1471 # escape & and <
1472 s/&/&amp;/g;
1473 s/(?<![BIUGHT])</&lt;/g;
1474
1475 # this is buggy, it needs to properly take care of nested <'s
1476
1477 1 while
1478 # replace B<>, I<>, U<> etc.
1479 s/B<([^\>]*)>/<b>$1<\/b>/
1480 || s/I<([^\>]*)>/<i>$1<\/i>/
1481 || s/U<([^\>]*)>/<u>$1<\/u>/
1482 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1483 # replace G<male|female> tags
1484 || s{G<([^>|]*)\|([^>]*)>}{
1485 $self->gender ? $2 : $1
1486 }ge
1487 # replace H<hint text>
1488 || s{H<([^\>]*)>}
1489 {
1490 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1491 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1492 "")
1493 [$self->{hintmode}]
1494 }ge;
1495
1496 # create single paragraphs (very hackish)
1497 s/(?<=\S)\n(?=\w)/ /g;
1498
1499 # compress some whitespace
1500 s/\s+\n/\n/g; # ws line-ends
1501 s/\n\n+/\n/g; # double lines
1502 s/^\n+//; # beginning lines
1503 s/\n+$//; # ending lines
1504
1505 $_
1506}
1507
1508sub hintmode {
1509 $_[0]{hintmode} = $_[1] if @_ > 1;
1510 $_[0]{hintmode}
1511}
1512
1129=item $player->ext_reply ($msgid, %msg) 1513=item $player->ext_reply ($msgid, @msg)
1130 1514
1131Sends an ext reply to the player. 1515Sends an ext reply to the player.
1132 1516
1133=cut 1517=cut
1134 1518
1135sub ext_reply($$%) { 1519sub ext_reply($$@) {
1136 my ($self, $id, %msg) = @_; 1520 my ($self, $id, @msg) = @_;
1137 1521
1138 $msg{msgid} = $id; 1522 $self->ns->ext_reply ($id, @msg)
1139
1140 $self->send ("ext " . cf::to_json \%msg);
1141} 1523}
1142 1524
1143=item $player->ext_event ($type, %msg) 1525=item $player->ext_msg ($type, @msg)
1144 1526
1145Sends an ext event to the client. 1527Sends an ext event to the client.
1146 1528
1147=cut 1529=cut
1148 1530
1149sub ext_event($$%) { 1531sub ext_msg($$@) {
1150 my ($self, $type, %msg) = @_; 1532 my ($self, $type, @msg) = @_;
1151 1533
1152 delete $msg{msgid}; 1534 $self->ns->ext_msg ($type, @msg);
1153 $msg{msgtype} = "event";
1154 $msg{eventtype} = $type;
1155
1156 $self->send ("ext " . cf::to_json \%msg);
1157} 1535}
1158 1536
1159package cf; 1537=head3 cf::region
1538
1539=over 4
1540
1541=cut
1542
1543package cf::region;
1544
1545=item cf::region::find_by_path $path
1546
1547Tries to decuce the likely region for a map knowing only its path.
1548
1549=cut
1550
1551sub find_by_path($) {
1552 my ($path) = @_;
1553
1554 my ($match, $specificity);
1555
1556 for my $region (list) {
1557 if ($region->{match} && $path =~ $region->{match}) {
1558 ($match, $specificity) = ($region, $region->specificity)
1559 if $region->specificity > $specificity;
1560 }
1561 }
1562
1563 $match
1564}
1160 1565
1161=back 1566=back
1162
1163 1567
1164=head3 cf::map 1568=head3 cf::map
1165 1569
1166=over 4 1570=over 4
1167 1571
1222 my ($self, $merge) = @_; 1626 my ($self, $merge) = @_;
1223 1627
1224 # we have to keep some variables in memory intact 1628 # we have to keep some variables in memory intact
1225 local $self->{path}; 1629 local $self->{path};
1226 local $self->{load_path}; 1630 local $self->{load_path};
1227 local $self->{deny_save};
1228 local $self->{deny_reset};
1229 1631
1230 $self->SUPER::thawer_merge ($merge); 1632 $self->SUPER::thawer_merge ($merge);
1231} 1633}
1232 1634
1233sub normalise { 1635sub normalise {
1280 $self->init; # pass $1 etc. 1682 $self->init; # pass $1 etc.
1281 return $self; 1683 return $self;
1282 } 1684 }
1283 } 1685 }
1284 1686
1285 Carp::carp "unable to resolve path '$path' (base '$base')."; 1687 Carp::cluck "unable to resolve path '$path' (base '$base').";
1286 () 1688 ()
1287} 1689}
1288 1690
1289sub init { 1691sub init {
1290 my ($self) = @_; 1692 my ($self) = @_;
1305 1707
1306# the original (read-only) location 1708# the original (read-only) location
1307sub load_path { 1709sub load_path {
1308 my ($self) = @_; 1710 my ($self) = @_;
1309 1711
1310 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1712 "$MAPDIR/$self->{path}.map"
1311} 1713}
1312 1714
1313# the temporary/swap location 1715# the temporary/swap location
1314sub save_path { 1716sub save_path {
1315 my ($self) = @_; 1717 my ($self) = @_;
1316 1718
1317 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1719 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1318 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1720 "$TMPDIR/$path.map"
1319} 1721}
1320 1722
1321# the unique path, undef == no special unique path 1723# the unique path, undef == no special unique path
1322sub uniq_path { 1724sub uniq_path {
1323 my ($self) = @_; 1725 my ($self) = @_;
1324 1726
1325 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1727 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1326 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1728 "$UNIQUEDIR/$path"
1327} 1729}
1328 1730
1329# and all this just because we cannot iterate over 1731# and all this just because we cannot iterate over
1330# all maps in C++... 1732# all maps in C++...
1331sub change_all_map_light { 1733sub change_all_map_light {
1332 my ($change) = @_; 1734 my ($change) = @_;
1333 1735
1334 $_->change_map_light ($change) 1736 $_->change_map_light ($change)
1335 for grep $_->outdoor, values %cf::MAP; 1737 for grep $_->outdoor, values %cf::MAP;
1738}
1739
1740sub decay_objects {
1741 my ($self) = @_;
1742
1743 return if $self->{deny_reset};
1744
1745 $self->do_decay_objects;
1336} 1746}
1337 1747
1338sub unlink_save { 1748sub unlink_save {
1339 my ($self) = @_; 1749 my ($self) = @_;
1340 1750
1398 $self->load_header_orig 1808 $self->load_header_orig
1399 or return; 1809 or return;
1400 $self->prepare_orig; 1810 $self->prepare_orig;
1401 } 1811 }
1402 1812
1813 $self->{deny_reset} = 1
1814 if $self->no_reset;
1815
1816 $self->default_region (cf::region::find_by_path $self->{path})
1817 unless $self->default_region;
1818
1403 1 1819 1
1404} 1820}
1405 1821
1406sub find; 1822sub find;
1407sub find { 1823sub find {
1419 $map->{last_save} = $cf::RUNTIME; 1835 $map->{last_save} = $cf::RUNTIME;
1420 1836
1421 $map->load_header 1837 $map->load_header
1422 or return; 1838 or return;
1423 1839
1424 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1840 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1425 # doing this can freeze the server in a sync job, obviously 1841 # doing this can freeze the server in a sync job, obviously
1426 #$cf::WAIT_FOR_TICK->wait; 1842 #$cf::WAIT_FOR_TICK->wait;
1427 $map->reset; 1843 $map->reset;
1428 undef $guard; 1844 undef $guard;
1429 return find $path; 1845 return find $path;
1440 my ($self) = @_; 1856 my ($self) = @_;
1441 1857
1442 local $self->{deny_reset} = 1; # loading can take a long time 1858 local $self->{deny_reset} = 1; # loading can take a long time
1443 1859
1444 my $path = $self->{path}; 1860 my $path = $self->{path};
1861
1862 {
1863 my $guard1 = cf::lock_acquire "map_data:$path";
1445 my $guard = cf::lock_acquire "map_load:$path"; 1864 my $guard2 = cf::lock_acquire "map_load:$path";
1446 1865
1447 return if $self->in_memory != cf::MAP_SWAPPED; 1866 return if $self->in_memory != cf::MAP_SWAPPED;
1448 1867
1449 $self->in_memory (cf::MAP_LOADING); 1868 $self->in_memory (cf::MAP_LOADING);
1450 1869
1451 $self->alloc; 1870 $self->alloc;
1452 1871
1453 $self->pre_load; 1872 $self->pre_load;
1873 cf::cede_to_tick;
1454 1874
1455 $self->_load_objects ($self->{load_path}, 1) 1875 $self->_load_objects ($self->{load_path}, 1)
1456 or return; 1876 or return;
1457 1877
1458 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1878 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1459 if delete $self->{load_original}; 1879 if delete $self->{load_original};
1460 1880
1461 if (my $uniq = $self->uniq_path) { 1881 if (my $uniq = $self->uniq_path) {
1462 utf8::encode $uniq; 1882 utf8::encode $uniq;
1463 if (aio_open $uniq, O_RDONLY, 0) { 1883 if (aio_open $uniq, O_RDONLY, 0) {
1464 $self->clear_unique_items; 1884 $self->clear_unique_items;
1465 $self->_load_objects ($uniq, 0); 1885 $self->_load_objects ($uniq, 0);
1466 } 1886 }
1467 } 1887 }
1468 1888
1469 Coro::cede; 1889 cf::cede_to_tick;
1470
1471 # now do the right thing for maps 1890 # now do the right thing for maps
1472 $self->link_multipart_objects; 1891 $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) 1892 $self->difficulty ($self->estimate_difficulty)
1481 unless $self->difficulty; 1893 unless $self->difficulty;
1482 Coro::cede; 1894 cf::cede_to_tick;
1895
1896 unless ($self->{deny_activate}) {
1897 $self->decay_objects;
1898 $self->fix_auto_apply;
1899 $self->update_buttons;
1900 cf::cede_to_tick;
1901 $self->set_darkness_map;
1902 cf::cede_to_tick;
1483 $self->activate; 1903 $self->activate;
1904 }
1905
1906 $self->{last_save} = $cf::RUNTIME;
1907 $self->last_access ($cf::RUNTIME);
1908
1909 $self->in_memory (cf::MAP_IN_MEMORY);
1484 } 1910 }
1485 1911
1486 $self->post_load; 1912 $self->post_load;
1487
1488 $self->in_memory (cf::MAP_IN_MEMORY);
1489} 1913}
1490 1914
1491sub customise_for { 1915sub customise_for {
1492 my ($self, $ob) = @_; 1916 my ($self, $ob) = @_;
1493 1917
1494 return find "~" . $ob->name . "/" . $self->{path} 1918 return find "~" . $ob->name . "/" . $self->{path}
1495 if $self->per_player; 1919 if $self->per_player;
1496 1920
1921# return find "?party/" . $ob->name . "/" . $self->{path}
1922# if $self->per_party;
1923
1497 $self 1924 $self
1498} 1925}
1499 1926
1500# find and load all maps in the 3x3 area around a map 1927# find and load all maps in the 3x3 area around a map
1501sub load_diag { 1928sub load_neighbours {
1502 my ($map) = @_; 1929 my ($map) = @_;
1503 1930
1504 my @diag; # diagonal neighbours 1931 my @neigh; # diagonal neighbours
1505 1932
1506 for (0 .. 3) { 1933 for (0 .. 3) {
1507 my $neigh = $map->tile_path ($_) 1934 my $neigh = $map->tile_path ($_)
1508 or next; 1935 or next;
1509 $neigh = find $neigh, $map 1936 $neigh = find $neigh, $map
1510 or next; 1937 or next;
1511 $neigh->load; 1938 $neigh->load;
1512 1939
1940 push @neigh,
1513 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1941 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1514 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1942 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1515 } 1943 }
1516 1944
1517 for (@diag) { 1945 for (grep defined $_->[0], @neigh) {
1946 my ($path, $origin) = @$_;
1518 my $neigh = find @$_ 1947 my $neigh = find $path, $origin
1519 or next; 1948 or next;
1520 $neigh->load; 1949 $neigh->load;
1521 } 1950 }
1522} 1951}
1523 1952
1528} 1957}
1529 1958
1530sub do_load_sync { 1959sub do_load_sync {
1531 my ($map) = @_; 1960 my ($map) = @_;
1532 1961
1962 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1963 if $Coro::current == $Coro::main;
1964
1533 cf::sync_job { $map->load }; 1965 cf::sync_job { $map->load };
1534} 1966}
1535 1967
1536our %MAP_PREFETCH; 1968our %MAP_PREFETCH;
1537our $MAP_PREFETCHER = undef; 1969our $MAP_PREFETCHER = undef;
1538 1970
1539sub find_async { 1971sub find_async {
1540 my ($path, $origin) = @_; 1972 my ($path, $origin, $load) = @_;
1541 1973
1542 $path = normalise $path, $origin && $origin->{path}; 1974 $path = normalise $path, $origin && $origin->{path};
1543 1975
1544 if (my $map = $cf::MAP{$path}) { 1976 if (my $map = $cf::MAP{$path}) {
1545 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1977 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1546 } 1978 }
1547 1979
1548 undef $MAP_PREFETCH{$path}; 1980 $MAP_PREFETCH{$path} |= $load;
1981
1549 $MAP_PREFETCHER ||= cf::async { 1982 $MAP_PREFETCHER ||= cf::async {
1550 while (%MAP_PREFETCH) { 1983 while (%MAP_PREFETCH) {
1551 for my $path (keys %MAP_PREFETCH) { 1984 while (my ($k, $v) = each %MAP_PREFETCH) {
1552 my $map = find $path 1985 if (my $map = find $k) {
1553 or next;
1554 $map->load; 1986 $map->load if $v;
1987 }
1555 1988
1556 delete $MAP_PREFETCH{$path}; 1989 delete $MAP_PREFETCH{$k};
1557 } 1990 }
1558 } 1991 }
1559 undef $MAP_PREFETCHER; 1992 undef $MAP_PREFETCHER;
1560 }; 1993 };
1561 $MAP_PREFETCHER->prio (6); 1994 $MAP_PREFETCHER->prio (6);
1564} 1997}
1565 1998
1566sub save { 1999sub save {
1567 my ($self) = @_; 2000 my ($self) = @_;
1568 2001
1569 my $lock = cf::lock_acquire "map_data:" . $self->path; 2002 my $lock = cf::lock_acquire "map_data:$self->{path}";
1570 2003
1571 $self->{last_save} = $cf::RUNTIME; 2004 $self->{last_save} = $cf::RUNTIME;
1572 2005
1573 return unless $self->dirty; 2006 return unless $self->dirty;
1574 2007
1597 my ($self) = @_; 2030 my ($self) = @_;
1598 2031
1599 # save first because save cedes 2032 # save first because save cedes
1600 $self->save; 2033 $self->save;
1601 2034
1602 my $lock = cf::lock_acquire "map_data:" . $self->path; 2035 my $lock = cf::lock_acquire "map_data:$self->{path}";
1603 2036
1604 return if $self->players; 2037 return if $self->players;
1605 return if $self->in_memory != cf::MAP_IN_MEMORY; 2038 return if $self->in_memory != cf::MAP_IN_MEMORY;
1606 return if $self->{deny_save}; 2039 return if $self->{deny_save};
1607 2040
1611 2044
1612sub reset_at { 2045sub reset_at {
1613 my ($self) = @_; 2046 my ($self) = @_;
1614 2047
1615 # TODO: safety, remove and allow resettable per-player maps 2048 # 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}; 2049 return 1e99 if $self->{deny_reset};
1618 2050
1619 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2051 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1620 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2052 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1621 2053
1632 my ($self) = @_; 2064 my ($self) = @_;
1633 2065
1634 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2066 my $lock = cf::lock_acquire "map_data:$self->{path}";
1635 2067
1636 return if $self->players; 2068 return if $self->players;
1637 return if $self->isa ("ext::map_per_player");#d#
1638 2069
1639 warn "resetting map ", $self->path;#d# 2070 warn "resetting map ", $self->path;
1640 2071
1641 $self->in_memory (cf::MAP_SWAPPED); 2072 $self->in_memory (cf::MAP_SWAPPED);
1642 2073
1643 # need to save uniques path 2074 # need to save uniques path
1644 unless ($self->{deny_save}) { 2075 unless ($self->{deny_save}) {
1661my $nuke_counter = "aaaa"; 2092my $nuke_counter = "aaaa";
1662 2093
1663sub nuke { 2094sub nuke {
1664 my ($self) = @_; 2095 my ($self) = @_;
1665 2096
2097 {
2098 my $lock = cf::lock_acquire "map_data:$self->{path}";
2099
1666 delete $cf::MAP{$self->path}; 2100 delete $cf::MAP{$self->path};
1667 2101
1668 $self->unlink_save; 2102 $self->unlink_save;
1669 2103
1670 bless $self, "cf::map"; 2104 bless $self, "cf::map";
1671 delete $self->{deny_reset}; 2105 delete $self->{deny_reset};
1672 $self->{deny_save} = 1; 2106 $self->{deny_save} = 1;
1673 $self->reset_timeout (1); 2107 $self->reset_timeout (1);
1674 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2108 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1675 2109
1676 $cf::MAP{$self->path} = $self; 2110 $cf::MAP{$self->path} = $self;
2111 }
1677 2112
1678 $self->reset; # polite request, might not happen 2113 $self->reset; # polite request, might not happen
2114}
2115
2116=item $maps = cf::map::tmp_maps
2117
2118Returns an arrayref with all map paths of currently instantiated and saved
2119maps. May block.
2120
2121=cut
2122
2123sub tmp_maps() {
2124 [
2125 map {
2126 utf8::decode $_;
2127 /\.map$/
2128 ? normalise $_
2129 : ()
2130 } @{ aio_readdir $TMPDIR or [] }
2131 ]
2132}
2133
2134=item $maps = cf::map::random_maps
2135
2136Returns an arrayref with all map paths of currently instantiated and saved
2137random maps. May block.
2138
2139=cut
2140
2141sub random_maps() {
2142 [
2143 map {
2144 utf8::decode $_;
2145 /\.map$/
2146 ? normalise "?random/$_"
2147 : ()
2148 } @{ aio_readdir $RANDOMDIR or [] }
2149 ]
1679} 2150}
1680 2151
1681=item cf::map::unique_maps 2152=item cf::map::unique_maps
1682 2153
1683Returns an arrayref of paths of all shared maps that have 2154Returns an arrayref of paths of all shared maps that have
1684instantiated unique items. May block. 2155instantiated unique items. May block.
1685 2156
1686=cut 2157=cut
1687 2158
1688sub unique_maps() { 2159sub unique_maps() {
1689 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2160 [
1690 or return; 2161 map {
1691
1692 my @paths;
1693
1694 for (@$files) {
1695 utf8::decode $_; 2162 utf8::decode $_;
1696 next if /\.pst$/; 2163 /\.map$/
1697 next unless /^$PATH_SEP/o; 2164 ? normalise $_
1698 2165 : ()
1699 push @paths, cf::map::normalise $_; 2166 } @{ aio_readdir $UNIQUEDIR or [] }
1700 } 2167 ]
1701
1702 \@paths
1703} 2168}
1704 2169
1705package cf; 2170package cf;
1706 2171
1707=back 2172=back
1753 2218
1754 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2219 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1755 2220
1756 if ($self->{record_replies}) { 2221 if ($self->{record_replies}) {
1757 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2222 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2223
1758 } else { 2224 } else {
2225 my $pl = $self->contr;
2226
2227 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2228 my $dialog = $pl->{npc_dialog};
2229 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2230
2231 } else {
1759 $msg = $npc->name . " says: $msg" if $npc; 2232 $msg = $npc->name . " says: $msg" if $npc;
1760 $self->message ($msg, $flags); 2233 $self->message ($msg, $flags);
2234 }
1761 } 2235 }
2236}
2237
2238=item $object->send_msg ($channel, $msg, $color, [extra...])
2239
2240=cut
2241
2242sub cf::object::send_msg {
2243 my $pl = shift->contr
2244 or return;
2245 $pl->send_msg (@_);
1762} 2246}
1763 2247
1764=item $player_object->may ("access") 2248=item $player_object->may ("access")
1765 2249
1766Returns wether the given player is authorized to access resource "access" 2250Returns wether the given player is authorized to access resource "access"
1813 $self->deactivate_recursive; 2297 $self->deactivate_recursive;
1814 2298
1815 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2299 return if UNIVERSAL::isa $self->map, "ext::map_link";
1816 2300
1817 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2301 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1818 if $self->map; 2302 if $self->map && $self->map->{path} ne "{link}";
1819 2303
1820 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2304 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1821} 2305}
1822 2306
1823sub cf::object::player::leave_link { 2307sub cf::object::player::leave_link {
1824 my ($self, $map, $x, $y) = @_; 2308 my ($self, $map, $x, $y) = @_;
2309
2310 return unless $self->contr->active;
1825 2311
1826 my $link_pos = delete $self->{_link_pos}; 2312 my $link_pos = delete $self->{_link_pos};
1827 2313
1828 unless ($map) { 2314 unless ($map) {
1829 # restore original map position 2315 # restore original map position
1843 # use -1 or undef as default coordinates, not 0, 0 2329 # use -1 or undef as default coordinates, not 0, 0
1844 ($x, $y) = ($map->enter_x, $map->enter_y) 2330 ($x, $y) = ($map->enter_x, $map->enter_y)
1845 if $x <=0 && $y <= 0; 2331 if $x <=0 && $y <= 0;
1846 2332
1847 $map->load; 2333 $map->load;
1848 $map->load_diag; 2334 $map->load_neighbours;
1849 2335
1850 return unless $self->contr->active; 2336 return unless $self->contr->active;
1851 $self->activate_recursive; 2337 $self->activate_recursive;
1852 2338
1853 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1854 $self->enter_map ($map, $x, $y); 2340 $self->enter_map ($map, $x, $y);
1855} 2341}
1856 2342
1857cf::player->attach ( 2343=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1858 on_logout => sub {
1859 my ($pl) = @_;
1860 2344
1861 # abort map switching before logout 2345Moves the player to the given map-path and coordinates by first freezing
1862 if ($pl->ob->{_link_pos}) { 2346her, loading and preparing them map, calling the provided $check callback
1863 cf::sync_job { 2347that has to return the map if sucecssful, and then unfreezes the player on
1864 $pl->ob->leave_link 2348the new (success) or old (failed) map position. In either case, $done will
1865 }; 2349be called at the end of this process.
1866 }
1867 },
1868 on_login => sub {
1869 my ($pl) = @_;
1870 2350
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 2351=cut
2352
2353our $GOTOGEN;
1892 2354
1893sub cf::object::player::goto { 2355sub cf::object::player::goto {
1894 my ($self, $path, $x, $y) = @_; 2356 my ($self, $path, $x, $y, $check, $done) = @_;
2357
2358 # do generation counting so two concurrent goto's will be executed in-order
2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1895 2360
1896 $self->enter_link; 2361 $self->enter_link;
1897 2362
1898 (async { 2363 (async {
1899 my $map = eval { 2364 my $map = eval {
1900 my $map = cf::map::find $path; 2365 my $map = cf::map::find $path;
2366
2367 if ($map) {
1901 $map = $map->customise_for ($self) if $map; 2368 $map = $map->customise_for ($self);
2369 $map = $check->($map) if $check && $map;
2370 } else {
2371 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2372 }
2373
1902 $map 2374 $map
2375 };
2376
2377 if ($@) {
2378 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2379 LOG llevError | logBacktrace, Carp::longmess $@;
1903 } or 2380 }
1904 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1905 2381
2382 if ($gen == $self->{_goto_generation}) {
2383 delete $self->{_goto_generation};
1906 $self->leave_link ($map, $x, $y); 2384 $self->leave_link ($map, $x, $y);
2385 }
2386
2387 $done->() if $done;
1907 })->prio (1); 2388 })->prio (1);
1908} 2389}
1909 2390
1910=item $player_object->enter_exit ($exit_object) 2391=item $player_object->enter_exit ($exit_object)
1911 2392
1950 2431
1951 $rmp->{random_seed} ||= $exit->random_seed; 2432 $rmp->{random_seed} ||= $exit->random_seed;
1952 2433
1953 my $data = cf::to_json $rmp; 2434 my $data = cf::to_json $rmp;
1954 my $md5 = Digest::MD5::md5_hex $data; 2435 my $md5 = Digest::MD5::md5_hex $data;
1955 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2436 my $meta = "$RANDOMDIR/$md5.meta";
1956 2437
1957 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2438 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1958 aio_write $fh, 0, (length $data), $data, 0; 2439 aio_write $fh, 0, (length $data), $data, 0;
1959 undef $fh; 2440 undef $fh;
1960 aio_rename "$meta~", $meta; 2441 aio_rename "$meta~", $meta;
1969 2450
1970 return unless $self->type == cf::PLAYER; 2451 return unless $self->type == cf::PLAYER;
1971 2452
1972 if ($exit->slaying eq "/!") { 2453 if ($exit->slaying eq "/!") {
1973 #TODO: this should de-fi-ni-te-ly not be a sync-job 2454 #TODO: this should de-fi-ni-te-ly not be a sync-job
2455 # the problem is that $exit might not survive long enough
2456 # so it needs to be done right now, right here
1974 cf::sync_job { prepare_random_map $exit }; 2457 cf::sync_job { prepare_random_map $exit };
1975 } 2458 }
1976 2459
1977 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2460 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1978 my $hp = $exit->stats->hp; 2461 my $hp = $exit->stats->hp;
1979 my $sp = $exit->stats->sp; 2462 my $sp = $exit->stats->sp;
1980 2463
1981 $self->enter_link; 2464 $self->enter_link;
2465
2466 # if exit is damned, update players death & WoR home-position
2467 $self->contr->savebed ($slaying, $hp, $sp)
2468 if $exit->flag (FLAG_DAMNED);
1982 2469
1983 (async { 2470 (async {
1984 $self->deactivate_recursive; # just to be sure 2471 $self->deactivate_recursive; # just to be sure
1985 unless (eval { 2472 unless (eval {
1986 $self->goto ($slaying, $hp, $sp); 2473 $self->goto ($slaying, $hp, $sp);
1987 2474
1988 1; 2475 1;
1989 }) { 2476 }) {
1990 $self->message ("Something went wrong deep within the crossfire server. " 2477 $self->message ("Something went wrong deep within the crossfire server. "
1991 . "I'll try to bring you back to the map you were before. " 2478 . "I'll try to bring you back to the map you were before. "
1992 . "Please report this to the dungeon master!", 2479 . "Please report this to the dungeon master!",
1993 cf::NDI_UNIQUE | cf::NDI_RED); 2480 cf::NDI_UNIQUE | cf::NDI_RED);
1994 2481
1995 warn "ERROR in enter_exit: $@"; 2482 warn "ERROR in enter_exit: $@";
1996 $self->leave_link; 2483 $self->leave_link;
1997 } 2484 }
1998 })->prio (1); 2485 })->prio (1);
2014 2501
2015 utf8::encode $text; 2502 utf8::encode $text;
2016 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2503 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2017} 2504}
2018 2505
2506=item $client->send_msg ($channel, $msg, $color, [extra...])
2507
2508Send a drawinfo or msg packet to the client, formatting the msg for the
2509client if neccessary. C<$type> should be a string identifying the type of
2510the message, with C<log> being the default. If C<$color> is negative, suppress
2511the message unless the client supports the msg packet.
2512
2513=cut
2514
2515our %CHANNEL = (
2516 "c/identify" => {
2517 id => "identify",
2518 title => "Identify",
2519 reply => undef,
2520 tooltip => "Items recently identified",
2521 },
2522 "c/examine" => {
2523 id => "examine",
2524 title => "Examine",
2525 reply => undef,
2526 tooltip => "Signs and other items you examined",
2527 },
2528);
2529
2530sub cf::client::send_msg {
2531 my ($self, $channel, $msg, $color, @extra) = @_;
2532
2533 $msg = $self->pl->expand_cfpod ($msg);
2534
2535 $color &= cf::NDI_CLIENT_MASK; # just in case...
2536
2537 # check predefined channels, for the benefit of C
2538 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2539
2540 if (ref $channel) {
2541 # send meta info to client, if not yet sent
2542 unless (exists $self->{channel}{$channel->{id}}) {
2543 $self->{channel}{$channel->{id}} = $channel;
2544 $self->ext_msg (channel_info => $channel)
2545 if $self->can_msg;
2546 }
2547
2548 $channel = $channel->{id};
2549 }
2550
2551 return unless @extra || length $msg;
2552
2553 if ($self->can_msg) {
2554 # default colour, mask it out
2555 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2556 if $color & cf::NDI_DEF;
2557
2558 $self->send_packet ("msg " . $self->{json_coder}->encode (
2559 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2560 } else {
2561 if ($color >= 0) {
2562 # replace some tags by gcfclient-compatible ones
2563 for ($msg) {
2564 1 while
2565 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2566 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2567 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2568 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2569 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2570 }
2571
2572 $color &= cf::NDI_COLOR_MASK;
2573
2574 utf8::encode $msg;
2575
2576 if (0 && $msg =~ /\[/) {
2577 # COMMAND/INFO
2578 $self->send_packet ("drawextinfo $color 10 8 $msg")
2579 } else {
2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2581 $self->send_packet ("drawinfo $color $msg")
2582 }
2583 }
2584 }
2585}
2586
2587=item $client->ext_msg ($type, @msg)
2588
2589Sends an ext event to the client.
2590
2591=cut
2592
2593sub cf::client::ext_msg($$@) {
2594 my ($self, $type, @msg) = @_;
2595
2596 if ($self->extcmd == 2) {
2597 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2598 } elsif ($self->extcmd == 1) { # TODO: remove
2599 push @msg, msgtype => "event_$type";
2600 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2601 }
2602}
2603
2604=item $client->ext_reply ($msgid, @msg)
2605
2606Sends an ext reply to the client.
2607
2608=cut
2609
2610sub cf::client::ext_reply($$@) {
2611 my ($self, $id, @msg) = @_;
2612
2613 if ($self->extcmd == 2) {
2614 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2615 } elsif ($self->extcmd == 1) {
2616 #TODO: version 1, remove
2617 unshift @msg, msgtype => "reply", msgid => $id;
2618 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2619 }
2620}
2019 2621
2020=item $success = $client->query ($flags, "text", \&cb) 2622=item $success = $client->query ($flags, "text", \&cb)
2021 2623
2022Queues a query to the client, calling the given callback with 2624Queues a query to the client, calling the given callback with
2023the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2625the 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>. 2626C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2025 2627
2026Queries can fail, so check the return code. Or don't, as queries will become 2628Queries can fail, so check the return code. Or don't, as queries will
2027reliable at some point in the future. 2629become reliable at some point in the future.
2028 2630
2029=cut 2631=cut
2030 2632
2031sub cf::client::query { 2633sub cf::client::query {
2032 my ($self, $flags, $text, $cb) = @_; 2634 my ($self, $flags, $text, $cb) = @_;
2040 utf8::encode $text; 2642 utf8::encode $text;
2041 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2643 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2042 2644
2043 $self->send_packet ($self->{query_queue}[0][0]) 2645 $self->send_packet ($self->{query_queue}[0][0])
2044 if @{ $self->{query_queue} } == 1; 2646 if @{ $self->{query_queue} } == 1;
2647
2648 1
2045} 2649}
2046 2650
2047cf::client->attach ( 2651cf::client->attach (
2652 on_connect => sub {
2653 my ($ns) = @_;
2654
2655 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2656 },
2048 on_reply => sub { 2657 on_reply => sub {
2049 my ($ns, $msg) = @_; 2658 my ($ns, $msg) = @_;
2050 2659
2051 # this weird shuffling is so that direct followup queries 2660 # this weird shuffling is so that direct followup queries
2052 # get handled first 2661 # get handled first
2064 } else { 2673 } else {
2065 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2674 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2066 } 2675 }
2067 } 2676 }
2068 }, 2677 },
2678 on_exticmd => sub {
2679 my ($ns, $buf) = @_;
2680
2681 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2682
2683 if (ref $msg) {
2684 my ($type, $reply, @payload) =
2685 "ARRAY" eq ref $msg
2686 ? @$msg
2687 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2688
2689 my @reply;
2690
2691 if (my $cb = $EXTICMD{$type}) {
2692 @reply = $cb->($ns, @payload);
2693 }
2694
2695 $ns->ext_reply ($reply, @reply)
2696 if $reply;
2697
2698 } else {
2699 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2700 }
2701
2702 cf::override;
2703 },
2069); 2704);
2070 2705
2071=item $client->async (\&cb) 2706=item $client->async (\&cb)
2072 2707
2073Create a new coroutine, running the specified callback. The coroutine will 2708Create a new coroutine, running the specified callback. The coroutine will
2114our $safe = new Safe "safe"; 2749our $safe = new Safe "safe";
2115our $safe_hole = new Safe::Hole; 2750our $safe_hole = new Safe::Hole;
2116 2751
2117$SIG{FPE} = 'IGNORE'; 2752$SIG{FPE} = 'IGNORE';
2118 2753
2119$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2754$safe->permit_only (Opcode::opset qw(
2755 :base_core :base_mem :base_orig :base_math
2756 grepstart grepwhile mapstart mapwhile
2757 sort time
2758));
2120 2759
2121# here we export the classes and methods available to script code 2760# here we export the classes and methods available to script code
2122 2761
2123=pod 2762=pod
2124 2763
2125The following functions and methods are available within a safe environment: 2764The following functions and methods are available within a safe environment:
2126 2765
2127 cf::object contr pay_amount pay_player map 2766 cf::object
2767 contr pay_amount pay_player map x y force_find force_add
2768 insert remove name archname title slaying race decrease_ob_nr
2769
2128 cf::object::player player 2770 cf::object::player
2129 cf::player peaceful 2771 player
2130 cf::map trigger 2772
2773 cf::player
2774 peaceful
2775
2776 cf::map
2777 trigger
2131 2778
2132=cut 2779=cut
2133 2780
2134for ( 2781for (
2135 ["cf::object" => qw(contr pay_amount pay_player map)], 2782 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2783 insert remove inv name archname title slaying race
2784 decrease_ob_nr)],
2136 ["cf::object::player" => qw(player)], 2785 ["cf::object::player" => qw(player)],
2137 ["cf::player" => qw(peaceful)], 2786 ["cf::player" => qw(peaceful)],
2138 ["cf::map" => qw(trigger)], 2787 ["cf::map" => qw(trigger)],
2139) { 2788) {
2140 no strict 'refs'; 2789 no strict 'refs';
2211=back 2860=back
2212 2861
2213=cut 2862=cut
2214 2863
2215############################################################################# 2864#############################################################################
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 2865# the server's init and main functions
2289 2866
2290sub load_facedata { 2867sub load_facedata($) {
2291 my $path = sprintf "%s/facedata", cf::datadir; 2868 my ($path) = @_;
2869
2870 # HACK to clear player env face cache, we need some signal framework
2871 # for this (global event?)
2872 %ext::player_env::MUSIC_FACE_CACHE = ();
2873
2874 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2292 2875
2293 warn "loading facedata from $path\n"; 2876 warn "loading facedata from $path\n";
2294 2877
2295 my $faces; 2878 my $facedata;
2296 0 < aio_load $path, $faces 2879 0 < aio_load $path, $facedata
2297 or die "$path: $!"; 2880 or die "$path: $!";
2298 2881
2299 Coro::cede;
2300 $faces = Storable::thaw $faces; 2882 $facedata = Coro::Storable::thaw $facedata;
2301 Coro::cede;
2302 2883
2303 my $meta = delete $faces->{""};
2304 $meta->{version} == 1 2884 $facedata->{version} == 2
2305 or cf::cleanup "$path: version mismatch, cannot proceed."; 2885 or cf::cleanup "$path: version mismatch, cannot proceed.";
2306 2886
2887 # patch in the exptable
2888 $facedata->{resource}{"res/exp_table"} = {
2889 type => FT_RSRC,
2890 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2891 };
2892 cf::cede_to_tick;
2893
2894 {
2895 my $faces = $facedata->{faceinfo};
2896
2307 while (my ($face, $info) = each %$faces) { 2897 while (my ($face, $info) = each %$faces) {
2308 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2898 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2309 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2899 cf::face::set_visibility $idx, $info->{visibility};
2900 cf::face::set_magicmap $idx, $info->{magicmap};
2310 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2901 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2311 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2902 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2312 Coro::cede;
2313 }
2314 2903
2904 cf::cede_to_tick;
2905 }
2906
2315 while (my ($face, $info) = each %$faces) { 2907 while (my ($face, $info) = each %$faces) {
2316 next unless $info->{smooth}; 2908 next unless $info->{smooth};
2317 my $idx = cf::face::find $face 2909 my $idx = cf::face::find $face
2318 or next; 2910 or next;
2319 if (my $smooth = cf::face::find $info->{smooth}) { 2911 if (my $smooth = cf::face::find $info->{smooth}) {
2320 cf::face::set_smooth $idx, $smooth; 2912 cf::face::set_smooth $idx, $smooth;
2913 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2321 } else { 2914 } else {
2322 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2915 warn "smooth face '$info->{smooth}' not found for face '$face'";
2323 } 2916 }
2324 Coro::cede; 2917
2918 cf::cede_to_tick;
2919 }
2920 }
2921
2922 {
2923 my $anims = $facedata->{animinfo};
2924
2925 while (my ($anim, $info) = each %$anims) {
2926 cf::anim::set $anim, $info->{frames}, $info->{facings};
2927 cf::cede_to_tick;
2928 }
2929
2930 cf::anim::invalidate_all; # d'oh
2931 }
2932
2933 {
2934 # TODO: for gcfclient pleasure, we should give resources
2935 # that gcfclient doesn't grok a >10000 face index.
2936 my $res = $facedata->{resource};
2937
2938 my $soundconf = delete $res->{"res/sound.conf"};
2939
2940 while (my ($name, $info) = each %$res) {
2941 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2942 my $data;
2943
2944 if ($info->{type} & 1) {
2945 # prepend meta info
2946
2947 my $meta = $enc->encode ({
2948 name => $name,
2949 %{ $info->{meta} || {} },
2950 });
2951
2952 $data = pack "(w/a*)*", $meta, $info->{data};
2953 } else {
2954 $data = $info->{data};
2955 }
2956
2957 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2958 cf::face::set_type $idx, $info->{type};
2959
2960 cf::cede_to_tick;
2961 }
2962
2963 if ($soundconf) {
2964 $soundconf = $enc->decode (delete $soundconf->{data});
2965
2966 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2967 my $sound = $soundconf->{compat}[$_]
2968 or next;
2969
2970 my $face = cf::face::find "sound/$sound->[1]";
2971 cf::sound::set $sound->[0] => $face;
2972 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2973 }
2974
2975 while (my ($k, $v) = each %{$soundconf->{event}}) {
2976 my $face = cf::face::find "sound/$v";
2977 cf::sound::set $k => $face;
2978 }
2979 }
2325 } 2980 }
2326 2981
2327 1 2982 1
2328} 2983}
2329 2984
2985register_exticmd fx_want => sub {
2986 my ($ns, $want) = @_;
2987
2988 while (my ($k, $v) = each %$want) {
2989 $ns->fx_want ($k, $v);
2990 }
2991};
2992
2993sub reload_regions {
2994 # HACK to clear player env face cache, we need some signal framework
2995 # for this (global event?)
2996 %ext::player_env::MUSIC_FACE_CACHE = ();
2997
2998 load_resource_file "$MAPDIR/regions"
2999 or die "unable to load regions file\n";
3000
3001 for (cf::region::list) {
3002 $_->{match} = qr/$_->{match}/
3003 if exists $_->{match};
3004 }
3005}
3006
3007sub reload_facedata {
3008 load_facedata "$DATADIR/facedata"
3009 or die "unable to load facedata\n";
3010}
3011
3012sub reload_archetypes {
3013 load_resource_file "$DATADIR/archetypes"
3014 or die "unable to load archetypes\n";
3015 #d# NEED to laod twice to resolve forward references
3016 # this really needs to be done in an extra post-pass
3017 # (which needs to be synchronous, so solve it differently)
3018 load_resource_file "$DATADIR/archetypes"
3019 or die "unable to load archetypes\n";
3020}
3021
3022sub reload_treasures {
3023 load_resource_file "$DATADIR/treasures"
3024 or die "unable to load treasurelists\n";
3025}
3026
2330sub reload_resources { 3027sub reload_resources {
2331 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 3028 warn "reloading resource files...\n";
2332 or die "unable to load regions file\n";#d# 3029
3030 reload_regions;
2333 load_facedata 3031 reload_facedata;
2334 or die "unable to load facedata\n";#d# 3032 #reload_archetypes;#d#
3033 reload_archetypes;
3034 reload_treasures;
3035
3036 warn "finished reloading resource files\n";
2335} 3037}
2336 3038
2337sub init { 3039sub init {
2338 reload_resources; 3040 reload_resources;
2339} 3041}
2340 3042
2341sub cfg_load { 3043sub reload_config {
2342 open my $fh, "<:utf8", cf::confdir . "/config" 3044 open my $fh, "<:utf8", "$CONFDIR/config"
2343 or return; 3045 or return;
2344 3046
2345 local $/; 3047 local $/;
2346 *CFG = YAML::Syck::Load <$fh>; 3048 *CFG = YAML::Syck::Load <$fh>;
2347 3049
2366 (async { 3068 (async {
2367 Event::one_event; 3069 Event::one_event;
2368 })->prio (Coro::PRIO_MAX); 3070 })->prio (Coro::PRIO_MAX);
2369 }; 3071 };
2370 3072
2371 cfg_load; 3073 reload_config;
2372 db_init; 3074 db_init;
2373 load_extensions; 3075 load_extensions;
2374 3076
2375 $TICK_WATCHER->start; 3077 $TICK_WATCHER->start;
2376 Event::loop; 3078 Event::loop;
2392 }, 3094 },
2393 ); 3095 );
2394 } 3096 }
2395} 3097}
2396 3098
3099sub write_runtime {
3100 my $runtime = "$LOCALDIR/runtime";
3101
3102 # first touch the runtime file to show we are still running:
3103 # the fsync below can take a very very long time.
3104
3105 IO::AIO::aio_utime $runtime, undef, undef;
3106
3107 my $guard = cf::lock_acquire "write_runtime";
3108
3109 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3110 or return;
3111
3112 my $value = $cf::RUNTIME + 90 + 10;
3113 # 10 is the runtime save interval, for a monotonic clock
3114 # 60 allows for the watchdog to kill the server.
3115
3116 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3117 and return;
3118
3119 # always fsync - this file is important
3120 aio_fsync $fh
3121 and return;
3122
3123 # touch it again to show we are up-to-date
3124 aio_utime $fh, undef, undef;
3125
3126 close $fh
3127 or return;
3128
3129 aio_rename "$runtime~", $runtime
3130 and return;
3131
3132 warn "runtime file written.\n";
3133
3134 1
3135}
3136
2397sub emergency_save() { 3137sub emergency_save() {
2398 my $freeze_guard = cf::freeze_mainloop; 3138 my $freeze_guard = cf::freeze_mainloop;
2399 3139
2400 warn "enter emergency perl save\n"; 3140 warn "enter emergency perl save\n";
2401 3141
2432 3172
2433 warn Carp::longmess "post_cleanup backtrace" 3173 warn Carp::longmess "post_cleanup backtrace"
2434 if $make_core; 3174 if $make_core;
2435} 3175}
2436 3176
2437sub reload() { 3177sub do_reload_perl() {
2438 # can/must only be called in main 3178 # can/must only be called in main
2439 if ($Coro::current != $Coro::main) { 3179 if ($Coro::current != $Coro::main) {
2440 warn "can only reload from main coroutine"; 3180 warn "can only reload from main coroutine";
2441 return; 3181 return;
2442 } 3182 }
2476 %EXT_CORO = (); 3216 %EXT_CORO = ();
2477 3217
2478 warn "removing commands"; 3218 warn "removing commands";
2479 %COMMAND = (); 3219 %COMMAND = ();
2480 3220
2481 warn "removing ext commands"; 3221 warn "removing ext/exti commands";
2482 %EXTCMD = (); 3222 %EXTCMD = ();
3223 %EXTICMD = ();
2483 3224
2484 warn "unloading/nuking all extensions"; 3225 warn "unloading/nuking all extensions";
2485 for my $pkg (@EXTS) { 3226 for my $pkg (@EXTS) {
2486 warn "... unloading $pkg"; 3227 warn "... unloading $pkg";
2487 3228
2517 Symbol::delete_package "safe::$_" 3258 Symbol::delete_package "safe::$_"
2518 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3259 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2519 3260
2520 warn "unloading cf.pm \"a bit\""; 3261 warn "unloading cf.pm \"a bit\"";
2521 delete $INC{"cf.pm"}; 3262 delete $INC{"cf.pm"};
3263 delete $INC{"cf/pod.pm"};
2522 3264
2523 # don't, removes xs symbols, too, 3265 # don't, removes xs symbols, too,
2524 # and global variables created in xs 3266 # and global variables created in xs
2525 #Symbol::delete_package __PACKAGE__; 3267 #Symbol::delete_package __PACKAGE__;
2526 3268
2529 warn "reloading cf.pm"; 3271 warn "reloading cf.pm";
2530 require cf; 3272 require cf;
2531 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3273 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2532 3274
2533 warn "loading config and database again"; 3275 warn "loading config and database again";
2534 cf::cfg_load; 3276 cf::reload_config;
2535 3277
2536 warn "loading extensions"; 3278 warn "loading extensions";
2537 cf::load_extensions; 3279 cf::load_extensions;
2538 3280
2539 warn "reattaching attachments to objects/players"; 3281 warn "reattaching attachments to objects/players";
2541 warn "reattaching attachments to maps"; 3283 warn "reattaching attachments to maps";
2542 reattach $_ for values %MAP; 3284 reattach $_ for values %MAP;
2543 warn "reattaching attachments to players"; 3285 warn "reattaching attachments to players";
2544 reattach $_ for values %PLAYER; 3286 reattach $_ for values %PLAYER;
2545 3287
2546 warn "loading reloadable resources";
2547 reload_resources;
2548
2549 warn "leaving sync_job"; 3288 warn "leaving sync_job";
2550 3289
2551 1 3290 1
2552 } or do { 3291 } or do {
2553 warn $@; 3292 warn $@;
2558 warn "reloaded"; 3297 warn "reloaded";
2559}; 3298};
2560 3299
2561our $RELOAD_WATCHER; # used only during reload 3300our $RELOAD_WATCHER; # used only during reload
2562 3301
3302sub reload_perl() {
3303 # doing reload synchronously and two reloads happen back-to-back,
3304 # coro crashes during coro_state_free->destroy here.
3305
3306 $RELOAD_WATCHER ||= Event->timer (
3307 reentrant => 0,
3308 after => 0,
3309 data => WF_AUTOCANCEL,
3310 cb => sub {
3311 do_reload_perl;
3312 undef $RELOAD_WATCHER;
3313 },
3314 );
3315}
3316
2563register_command "reload" => sub { 3317register_command "reload" => sub {
2564 my ($who, $arg) = @_; 3318 my ($who, $arg) = @_;
2565 3319
2566 if ($who->flag (FLAG_WIZ)) { 3320 if ($who->flag (FLAG_WIZ)) {
2567 $who->message ("reloading server."); 3321 $who->message ("reloading server.");
2568 3322 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 } 3323 }
2582}; 3324};
2583 3325
2584unshift @INC, $LIBDIR; 3326unshift @INC, $LIBDIR;
2585 3327
2586my $bug_warning = 0; 3328my $bug_warning = 0;
2587 3329
3330our @WAIT_FOR_TICK;
3331our @WAIT_FOR_TICK_BEGIN;
3332
3333sub wait_for_tick {
3334 return unless $TICK_WATCHER->is_active;
3335 return if $Coro::current == $Coro::main;
3336
3337 my $signal = new Coro::Signal;
3338 push @WAIT_FOR_TICK, $signal;
3339 $signal->wait;
3340}
3341
3342sub wait_for_tick_begin {
3343 return unless $TICK_WATCHER->is_active;
3344 return if $Coro::current == $Coro::main;
3345
3346 my $signal = new Coro::Signal;
3347 push @WAIT_FOR_TICK_BEGIN, $signal;
3348 $signal->wait;
3349}
3350
3351 my $min = 1e6;#d#
3352 my $avg = 10;
2588$TICK_WATCHER = Event->timer ( 3353$TICK_WATCHER = Event->timer (
2589 reentrant => 0, 3354 reentrant => 0,
2590 parked => 1, 3355 parked => 1,
2591 prio => 0, 3356 prio => 0,
2592 at => $NEXT_TICK || $TICK, 3357 at => $NEXT_TICK || $TICK,
2596 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3361 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2597 unless ++$bug_warning > 10; 3362 unless ++$bug_warning > 10;
2598 return; 3363 return;
2599 } 3364 }
2600 3365
2601 $NOW = Event::time; 3366 $NOW = $tick_start = Event::time;
2602 3367
2603 cf::server_tick; # one server iteration 3368 cf::server_tick; # one server iteration
3369
3370 0 && sync_job {#d#
3371 for(1..10) {
3372 my $t = Event::time;
3373 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3374 or die;
3375
3376 $map->width (50);
3377 $map->height (50);
3378 $map->alloc;
3379 $map->_load_objects ("/tmp/x.map", 1);
3380 my $t = Event::time - $t;
3381
3382 #next unless $t < 0.0013;#d#
3383 if ($t < $min) {
3384 $min = $t;
3385 }
3386 $avg = $avg * 0.99 + $t * 0.01;
3387 }
3388 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3389 exit 0;
3390 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3391 };
3392
2604 $RUNTIME += $TICK; 3393 $RUNTIME += $TICK;
2605 $NEXT_TICK += $TICK; 3394 $NEXT_TICK += $TICK;
2606 3395
2607 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3396 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2608 $NEXT_RUNTIME_WRITE = $NOW + 10; 3397 $NEXT_RUNTIME_WRITE = $NOW + 10;
2610 write_runtime 3399 write_runtime
2611 or warn "ERROR: unable to write runtime file: $!"; 3400 or warn "ERROR: unable to write runtime file: $!";
2612 }; 3401 };
2613 } 3402 }
2614 3403
2615 $WAIT_FOR_TICK->broadcast;
2616 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2617
2618# my $AFTER = Event::time; 3404# my $AFTER = Event::time;
2619# warn $AFTER - $NOW;#d# 3405# warn $AFTER - $NOW;#d#
2620 3406
3407 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3408 $sig->send;
3409 }
3410 while (my $sig = shift @WAIT_FOR_TICK) {
3411 $sig->send;
3412 }
3413
3414 $NOW = Event::time;
3415
2621 # if we are delayed by four ticks or more, skip them all 3416 # if we are delayed by four ticks or more, skip them all
2622 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3417 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2623 3418
2624 $TICK_WATCHER->at ($NEXT_TICK); 3419 $TICK_WATCHER->at ($NEXT_TICK);
2625 $TICK_WATCHER->start; 3420 $TICK_WATCHER->start;
3421
3422 $LOAD = ($NOW - $tick_start) / $TICK;
3423 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3424
3425 _post_tick;
3426
3427
2626 }, 3428 },
2627); 3429);
2628 3430
2629{ 3431{
2630 BDB::max_poll_time $TICK * 0.1; 3432 BDB::max_poll_time $TICK * 0.1;
2658 3460
2659 cf::sync_job { 3461 cf::sync_job {
2660 eval { 3462 eval {
2661 BDB::db_env_open 3463 BDB::db_env_open
2662 $DB_ENV, 3464 $DB_ENV,
2663 $BDB_ENV_DIR, 3465 $BDBDIR,
2664 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3466 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2665 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3467 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2666 0666; 3468 0666;
2667 3469
2668 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3470 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2669 3471
2670 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3472 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2671 $DB_ENV->set_lk_detect; 3473 $DB_ENV->set_lk_detect;
2672 }; 3474 };
2673 3475
2689 prio => 6, 3491 prio => 6,
2690 cb => \&IO::AIO::poll_cb, 3492 cb => \&IO::AIO::poll_cb,
2691 ); 3493 );
2692} 3494}
2693 3495
3496my $_log_backtrace;
3497
3498sub _log_backtrace {
3499 my ($msg, @addr) = @_;
3500
3501 $msg =~ s/\n//;
3502
3503 # limit the # of concurrent backtraces
3504 if ($_log_backtrace < 2) {
3505 ++$_log_backtrace;
3506 async {
3507 my @bt = fork_call {
3508 @addr = map { sprintf "%x", $_ } @addr;
3509 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3510 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3511 or die "addr2line: $!";
3512
3513 my @funcs;
3514 my @res = <$fh>;
3515 chomp for @res;
3516 while (@res) {
3517 my ($func, $line) = splice @res, 0, 2, ();
3518 push @funcs, "[$func] $line";
3519 }
3520
3521 @funcs
3522 };
3523
3524 LOG llevInfo, "[ABT] $msg\n";
3525 LOG llevInfo, "[ABT] $_\n" for @bt;
3526 --$_log_backtrace;
3527 };
3528 } else {
3529 LOG llevInfo, "[ABT] $msg\n";
3530 LOG llevInfo, "[ABT] [suppressed]\n";
3531 }
3532}
3533
3534# load additional modules
3535use cf::pod;
3536
2694END { cf::emergency_save } 3537END { cf::emergency_save }
2695 3538
26961 35391
2697 3540

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines