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.248 by root, Tue Apr 17 18:40:32 2007 UTC vs.
Revision 1.357 by root, Tue Sep 4 08:42:58 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.61 (); 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;
21use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
22 25
26use JSON::XS ();
23use BDB (); 27use BDB ();
24use Data::Dumper; 28use Data::Dumper;
25use Digest::MD5; 29use Digest::MD5;
26use Fcntl; 30use Fcntl;
27use YAML::Syck (); 31use YAML::Syck ();
28use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
29use Time::HiRes; 33use Time::HiRes;
30use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
31 36
32# configure various modules to our taste 37# configure various modules to our taste
33# 38#
34$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
35Coro::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
47our %COMMAND = (); 52our %COMMAND = ();
48our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
49 54
50our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
51our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
52our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
53our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
54 60
55our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
56our @EVENT; 62our @EVENT;
57our $LIBDIR = datadir . "/ext"; 63
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";
58 75
59our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
60our $TICK_WATCHER; 77our $TICK_WATCHER;
61our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
70our %CFG; 87our %CFG;
71 88
72our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
73our $RUNTIME; 90our $RUNTIME;
74 91
75our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
76our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
77our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
78our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db";
80 95
81# 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 ∕
82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
83 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
84binmode STDOUT; 103binmode STDOUT;
85binmode STDERR; 104binmode STDERR;
86 105
87# read virtual server time, if available 106# read virtual server time, if available
88unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
89 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
90 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
91 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
92} 111}
93 112
94mkdir cf::localdir; 113mkdir $_
95mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
96mkdir cf::localdir . "/" . cf::tmpdir;
97mkdir cf::localdir . "/" . cf::uniquedir;
98mkdir $RANDOM_MAPS;
99mkdir $BDB_ENV_DIR;
100 115
101our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
102 117
103sub cf::map::normalise; 118sub cf::map::normalise;
104 119
115=item $cf::RUNTIME 130=item $cf::RUNTIME
116 131
117The 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
118every server tick. 133every server tick.
119 134
120=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
121 138
122The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
123be 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.
124 143
125=item $cf::NOW 144=item $cf::NOW
126 145
127The time of the last (current) server tick. 146The time of the last (current) server tick.
128 147
129=item $cf::TICK 148=item $cf::TICK
130 149
131The 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.
132 161
133=item %cf::CFG 162=item %cf::CFG
134 163
135Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
136from wherever your confdir points to. 165from wherever your confdir points to.
139 168
140These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
141returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
142per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
143 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.
178
144=back 179=back
145 180
146=cut 181=cut
147 182
148BEGIN { 183BEGIN {
149 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
150 my $msg = join "", @_; 185 my $msg = join "", @_;
151 utf8::encode $msg;
152 186
153 $msg .= "\n" 187 $msg .= "\n"
154 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
155 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
192 utf8::encode $msg;
156 LOG llevError, $msg; 193 LOG llevError, $msg;
157 }; 194 };
158} 195}
159 196
160@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
161@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
162@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
163@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
164@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';
165@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)
166 204
167# 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
168# within the Safe compartment. 206# within the Safe compartment.
169for my $pkg (qw( 207for my $pkg (qw(
170 cf::global cf::attachable 208 cf::global cf::attachable
178} 216}
179 217
180$Event::DIED = sub { 218$Event::DIED = sub {
181 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
182}; 220};
221
222#############################################################################
183 223
184=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
185 225
186=over 4 226=over 4
187 227
206 $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;
207 $d 247 $d
208 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
209} 249}
210 250
211use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
212
213=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
214 252
215Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
216 254
217=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
218 256
219Converts 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]) }
220 265
221=item cf::lock_wait $string 266=item cf::lock_wait $string
222 267
223Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
224 269
227Wait 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
228a 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,
229for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
230returned. 275returned.
231 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
232Lock 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
233uses 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.
234 286
235=cut 287=cut
236 288
237our %LOCK; 289our %LOCK;
238 290
256 308
257 Coro::guard { 309 Coro::guard {
258 # wake up all waiters, to be on the safe side 310 # wake up all waiters, to be on the safe side
259 $_->ready for @{ delete $LOCK{$key} }; 311 $_->ready for @{ delete $LOCK{$key} };
260 } 312 }
313}
314
315sub lock_active($) {
316 my ($key) = @_;
317
318 ! ! $LOCK{$key}
261} 319}
262 320
263sub freeze_mainloop { 321sub freeze_mainloop {
264 return unless $TICK_WATCHER->is_active; 322 return unless $TICK_WATCHER->is_active;
265 323
268 }; 326 };
269 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
270 $guard 328 $guard
271} 329}
272 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
273=item cf::async { BLOCK } 387=item cf::async { BLOCK }
274 388
275Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
276C<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
277thing you are allowed to do is call C<prio> on it. 391thing you are allowed to do is call C<prio> on it.
280 394
281BEGIN { *async = \&Coro::async_pool } 395BEGIN { *async = \&Coro::async_pool }
282 396
283=item cf::sync_job { BLOCK } 397=item cf::sync_job { BLOCK }
284 398
285The design of crossfire+ requires that the main coro ($Coro::main) is 399The design of Crossfire TRT requires that the main coroutine ($Coro::main)
286always able to handle events or runnable, as crossfire+ is only partly 400is always able to handle events or runnable, as Crossfire TRT is only
287reentrant. 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.
288 403
289If 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
290the given BLOCK in another coroutine while waiting for the result. The 405the given BLOCK in another coroutine while waiting for the result. The
291server 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
292fast or be very important. 407fast or be very important.
295 410
296sub sync_job(&) { 411sub sync_job(&) {
297 my ($job) = @_; 412 my ($job) = @_;
298 413
299 if ($Coro::current == $Coro::main) { 414 if ($Coro::current == $Coro::main) {
415 my $time = Event::time;
416
300 # this is the main coro, too bad, we have to block 417 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 418 # till the operation succeeds, freezing the server :/
302 419
303 # TODO: use suspend/resume instead 420 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 421 # (but this is cancel-safe)
315 432
316 while ($busy) { 433 while ($busy) {
317 Coro::cede or Event::one_event; 434 Coro::cede or Event::one_event;
318 } 435 }
319 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
320 wantarray ? @res : $res[0] 444 wantarray ? @res : $res[0]
321 } else { 445 } else {
322 # we are in another coroutine, how wonderful, everything just works 446 # we are in another coroutine, how wonderful, everything just works
323 447
324 $job->() 448 $job->()
343 $EXT_CORO{$coro+0} = $coro; 467 $EXT_CORO{$coro+0} = $coro;
344 468
345 $coro 469 $coro
346} 470}
347 471
348sub write_runtime { 472=item fork_call { }, $args
349 my $guard = cf::lock_acquire "write_runtime";
350 473
351 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.
352 478
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 479=cut
354 or return;
355 480
356 my $value = $cf::RUNTIME + 90 + 10; 481sub fork_call(&@) {
357 # 10 is the runtime save interval, for a monotonic clock 482 my ($cb, @args) = @_;
358 # 60 allows for the watchdog to kill the server.
359 483
360 (aio_write $fh, 0, (length $value), $value, 0) <= 0 484 # we seemingly have to make a local copy of the whole thing,
361 and return; 485 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (likely this will be rather laborious)
362 487
363 # always fsync - this file is important 488 my @res = Coro::Util::fork_eval {
364 aio_fsync $fh 489 reset_signals;
365 and return; 490 &$cb
491 }, @args;
366 492
367 close $fh 493 wantarray ? @res : $res[-1]
368 or return; 494}
369 495
370 aio_rename "$runtime~", $runtime 496=item $value = cf::db_get $family => $key
371 and return;
372 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 };
373 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"
374} 610}
375 611
376=item cf::datalog type => key => value, ... 612=item cf::datalog type => key => value, ...
377 613
378Log 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.
396attach callbacks/event handlers (a collection of which is called an "attachment") 632attach callbacks/event handlers (a collection of which is called an "attachment")
397to it. All such attachable objects support the following methods. 633to it. All such attachable objects support the following methods.
398 634
399In 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>
400C<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
401crossfire+). 637Crossfire TRT).
402 638
403=over 4 639=over 4
404 640
405=item $attachable->attach ($attachment, key => $value...) 641=item $attachable->attach ($attachment, key => $value...)
406 642
569 $registry = $CB_TYPE[$object_type] ||= []; 805 $registry = $CB_TYPE[$object_type] ||= [];
570 806
571 } elsif ($type eq "subtype") { 807 } elsif ($type eq "subtype") {
572 defined $object_type or Carp::croak "subtype specified without type"; 808 defined $object_type or Carp::croak "subtype specified without type";
573 my $object_subtype = shift @arg; 809 my $object_subtype = shift @arg;
574 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 810 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
575 811
576 } elsif ($type eq "package") { 812 } elsif ($type eq "package") {
577 my $pkg = shift @arg; 813 my $pkg = shift @arg;
578 814
579 while (my ($name, $id) = each %cb_id) { 815 while (my ($name, $id) = each %cb_id) {
608 _attach $registry, $klass, @attach; 844 _attach $registry, $klass, @attach;
609 } 845 }
610 846
611 $obj->{$name} = \%arg; 847 $obj->{$name} = \%arg;
612 } else { 848 } else {
613 warn "object uses attachment '$name' that is not available, postponing.\n"; 849 warn "object uses attachment '$name' which is not available, postponing.\n";
614 } 850 }
615 851
616 $obj->{_attachment}{$name} = undef; 852 $obj->{_attachment}{$name} = undef;
617} 853}
618 854
620 if (ref $_[0]) { 856 if (ref $_[0]) {
621 _object_attach @_; 857 _object_attach @_;
622 } else { 858 } else {
623 _attach shift->_attach_registry, @_; 859 _attach shift->_attach_registry, @_;
624 } 860 }
861 _recalc_want;
625}; 862};
626 863
627# all those should be optimised 864# all those should be optimised
628sub cf::attachable::detach { 865sub cf::attachable::detach {
629 my ($obj, $name) = @_; 866 my ($obj, $name) = @_;
632 delete $obj->{_attachment}{$name}; 869 delete $obj->{_attachment}{$name};
633 reattach ($obj); 870 reattach ($obj);
634 } else { 871 } else {
635 Carp::croak "cannot, currently, detach class attachments"; 872 Carp::croak "cannot, currently, detach class attachments";
636 } 873 }
874 _recalc_want;
637}; 875};
638 876
639sub cf::attachable::attached { 877sub cf::attachable::attached {
640 my ($obj, $name) = @_; 878 my ($obj, $name) = @_;
641 879
656 "; 894 ";
657 die if $@; 895 die if $@;
658} 896}
659 897
660our $override; 898our $override;
661our @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?
662 900
663sub override { 901sub override {
664 $override = 1; 902 $override = 1;
665 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
666} 904}
667 905
668sub do_invoke { 906sub do_invoke {
669 my $event = shift; 907 my $event = shift;
670 my $callbacks = shift; 908 my $callbacks = shift;
671 909
672 @invoke_results = (); 910 @INVOKE_RESULTS = ();
673 911
674 local $override; 912 local $override;
675 913
676 for (@$callbacks) { 914 for (@$callbacks) {
677 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
694 932
695Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
696 934
697This 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
698removed 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
699results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
700 938
701=back 939=back
702 940
703=cut 941=cut
704 942
705############################################################################# 943#############################################################################
706# 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}
707 956
708sub reattach { 957sub reattach {
709 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
710 my ($obj) = @_; 959 my ($obj) = @_;
711 960
755 }, 1004 },
756); 1005);
757 1006
758sub object_freezer_save { 1007sub object_freezer_save {
759 my ($filename, $rdata, $objs) = @_; 1008 my ($filename, $rdata, $objs) = @_;
1009
1010 my $guard = cf::lock_acquire "io";
760 1011
761 sync_job { 1012 sync_job {
762 if (length $$rdata) { 1013 if (length $$rdata) {
763 warn sprintf "saving %s (%d,%d)\n", 1014 warn sprintf "saving %s (%d,%d)\n",
764 $filename, length $$rdata, scalar @$objs; 1015 $filename, length $$rdata, scalar @$objs;
788 } 1039 }
789 } else { 1040 } else {
790 aio_unlink $filename; 1041 aio_unlink $filename;
791 aio_unlink "$filename.pst"; 1042 aio_unlink "$filename.pst";
792 } 1043 }
793 } 1044 };
1045
1046 undef $guard;
794} 1047}
795 1048
796sub object_freezer_as_string { 1049sub object_freezer_as_string {
797 my ($rdata, $objs) = @_; 1050 my ($rdata, $objs) = @_;
798 1051
803 1056
804sub object_thawer_load { 1057sub object_thawer_load {
805 my ($filename) = @_; 1058 my ($filename) = @_;
806 1059
807 my ($data, $av); 1060 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
808 1063
809 (aio_load $filename, $data) >= 0 1064 (aio_load $filename, $data) >= 0
810 or return; 1065 or return;
811 1066
812 unless (aio_stat "$filename.pst") { 1067 unless (aio_stat "$filename.pst") {
813 (aio_load "$filename.pst", $av) >= 0 1068 (aio_load "$filename.pst", $av) >= 0
814 or return; 1069 or return;
1070
1071 undef $guard;
815 $av = eval { (Storable::thaw $av)->{objs} }; 1072 $av = eval { (Storable::thaw $av)->{objs} };
816 } 1073 }
817 1074
818 warn sprintf "loading %s (%d)\n", 1075 warn sprintf "loading %s (%d)\n",
819 $filename, length $data, scalar @{$av || []};#d# 1076 $filename, length $data, scalar @{$av || []};
1077
820 return ($data, $av); 1078 ($data, $av)
821} 1079}
1080
1081=head2 COMMAND CALLBACKS
1082
1083=over 4
1084
1085=cut
822 1086
823############################################################################# 1087#############################################################################
824# command handling &c 1088# command handling &c
825 1089
826=item cf::register_command $name => \&callback($ob,$args); 1090=item cf::register_command $name => \&callback($ob,$args);
839 push @{ $COMMAND{$name} }, [$caller, $cb]; 1103 push @{ $COMMAND{$name} }, [$caller, $cb];
840} 1104}
841 1105
842=item cf::register_extcmd $name => \&callback($pl,$packet); 1106=item cf::register_extcmd $name => \&callback($pl,$packet);
843 1107
844Register a callbackf ro execution when the client sends an extcmd packet. 1108Register a callback for execution when the client sends an (synchronous)
1109extcmd packet. Ext commands will be processed in the order they are
1110received by the server, like other user commands. The first argument is
1111the logged-in player. Ext commands can only be processed after a player
1112has logged in successfully.
845 1113
846If the callback returns something, it is sent back as if reply was being 1114If the callback returns something, it is sent back as if reply was being
847called. 1115called.
848 1116
1117=item cf::register_exticmd $name => \&callback($ns,$packet);
1118
1119Register a callback for execution when the client sends an (asynchronous)
1120exticmd packet. Exti commands are processed by the server as soon as they
1121are received, i.e. out of order w.r.t. other commands. The first argument
1122is a client socket. Exti commands can be received anytime, even before
1123log-in.
1124
1125If the callback returns something, it is sent back as if reply was being
1126called.
1127
849=cut 1128=cut
850 1129
851sub register_extcmd { 1130sub register_extcmd {
852 my ($name, $cb) = @_; 1131 my ($name, $cb) = @_;
853 1132
854 $EXTCMD{$name} = $cb; 1133 $EXTCMD{$name} = $cb;
1134}
1135
1136sub register_exticmd {
1137 my ($name, $cb) = @_;
1138
1139 $EXTICMD{$name} = $cb;
855} 1140}
856 1141
857cf::player->attach ( 1142cf::player->attach (
858 on_command => sub { 1143 on_command => sub {
859 my ($pl, $name, $params) = @_; 1144 my ($pl, $name, $params) = @_;
868 cf::override; 1153 cf::override;
869 }, 1154 },
870 on_extcmd => sub { 1155 on_extcmd => sub {
871 my ($pl, $buf) = @_; 1156 my ($pl, $buf) = @_;
872 1157
873 my $msg = eval { from_json $buf }; 1158 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
874 1159
875 if (ref $msg) { 1160 if (ref $msg) {
1161 my ($type, $reply, @payload) =
1162 "ARRAY" eq ref $msg
1163 ? @$msg
1164 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1165
1166 my @reply;
1167
876 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1168 if (my $cb = $EXTCMD{$type}) {
877 if (my %reply = $cb->($pl, $msg)) { 1169 @reply = $cb->($pl, @payload);
878 $pl->ext_reply ($msg->{msgid}, %reply);
879 }
880 } 1170 }
1171
1172 $pl->ext_reply ($reply, @reply)
1173 if $reply;
1174
881 } else { 1175 } else {
882 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1176 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
883 } 1177 }
884 1178
885 cf::override; 1179 cf::override;
886 }, 1180 },
887); 1181);
888 1182
889sub load_extension {
890 my ($path) = @_;
891
892 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
893 my $base = $1;
894 my $pkg = $1;
895 $pkg =~ s/[^[:word:]]/_/g;
896 $pkg = "ext::$pkg";
897
898 warn "... loading '$path' into '$pkg'\n";
899
900 open my $fh, "<:utf8", $path
901 or die "$path: $!";
902
903 my $source =
904 "package $pkg; use strict; use utf8;\n"
905 . "#line 1 \"$path\"\n{\n"
906 . (do { local $/; <$fh> })
907 . "\n};\n1";
908
909 unless (eval $source) {
910 my $msg = $@ ? "$path: $@\n"
911 : "extension disabled.\n";
912 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
913 warn $@;
914 warn "mandatory extension failed to load, exiting.\n";
915 exit 1;
916 }
917 die $@;
918 }
919
920 push @EXTS, $pkg;
921}
922
923sub load_extensions { 1183sub load_extensions {
1184 cf::sync_job {
1185 my %todo;
1186
924 for my $ext (<$LIBDIR/*.ext>) { 1187 for my $path (<$LIBDIR/*.ext>) {
925 next unless -r $ext; 1188 next unless -r $path;
926 eval { 1189
927 load_extension $ext; 1190 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1191 my $base = $1;
1192 my $pkg = $1;
1193 $pkg =~ s/[^[:word:]]/_/g;
1194 $pkg = "ext::$pkg";
1195
1196 open my $fh, "<:utf8", $path
1197 or die "$path: $!";
1198
1199 my $source = do { local $/; <$fh> };
1200
1201 my %ext = (
1202 path => $path,
1203 base => $base,
1204 pkg => $pkg,
1205 );
1206
1207 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1208 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1209
1210 $ext{source} =
1211 "package $pkg; use strict; use utf8;\n"
1212 . "#line 1 \"$path\"\n{\n"
1213 . $source
1214 . "\n};\n1";
1215
1216 $todo{$base} = \%ext;
1217 }
1218
1219 my %done;
1220 while (%todo) {
1221 my $progress;
1222
1223 while (my ($k, $v) = each %todo) {
1224 for (split /,\s*/, $v->{meta}{depends}) {
1225 goto skip
1226 unless exists $done{$_};
1227 }
1228
1229 warn "... loading '$k' into '$v->{pkg}'\n";
1230
1231 unless (eval $v->{source}) {
1232 my $msg = $@ ? "$v->{path}: $@\n"
1233 : "$v->{base}: extension inactive.\n";
1234
1235 if (exists $v->{meta}{mandatory}) {
1236 warn $msg;
1237 warn "mandatory extension failed to load, exiting.\n";
1238 exit 1;
1239 }
1240
1241 warn $msg;
1242 }
1243
1244 $done{$k} = delete $todo{$k};
1245 push @EXTS, $v->{pkg};
1246 $progress = 1;
928 1 1247 }
929 } or warn "$ext not loaded: $@"; 1248
1249 skip:
1250 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1251 unless $progress;
1252 }
930 } 1253 };
931} 1254}
932 1255
933############################################################################# 1256#############################################################################
934 1257
1258=back
1259
935=head2 CORE EXTENSIONS 1260=head2 CORE EXTENSIONS
936 1261
937Functions and methods that extend core crossfire objects. 1262Functions and methods that extend core crossfire objects.
938 1263
939=cut 1264=cut
951Returns the given player object, loading it if necessary (might block). 1276Returns the given player object, loading it if necessary (might block).
952 1277
953=cut 1278=cut
954 1279
955sub playerdir($) { 1280sub playerdir($) {
956 cf::localdir 1281 "$PLAYERDIR/"
957 . "/"
958 . cf::playerdir
959 . "/"
960 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1282 . (ref $_[0] ? $_[0]->ob->name : $_[0])
961} 1283}
962 1284
963sub path($) { 1285sub path($) {
964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1286 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
991 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1313 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
992 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1314 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
993 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1315 aio_unlink +(playerdir $login) . "/$login.pl.pst";
994 aio_unlink +(playerdir $login) . "/$login.pl"; 1316 aio_unlink +(playerdir $login) . "/$login.pl";
995 1317
996 my $pl = load_pl path $login 1318 my $f = new_from_file cf::object::thawer path $login
997 or return; 1319 or return;
1320
1321 $f->next;
1322 my $pl = cf::player::load_pl $f
1323 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs;
998 $cf::PLAYER{$login} = $pl 1326 $cf::PLAYER{$login} = $pl
999 } 1327 }
1000 } 1328 }
1001} 1329}
1002 1330
1012 1340
1013 aio_mkdir playerdir $pl, 0770; 1341 aio_mkdir playerdir $pl, 0770;
1014 $pl->{last_save} = $cf::RUNTIME; 1342 $pl->{last_save} = $cf::RUNTIME;
1015 1343
1016 $pl->save_pl ($path); 1344 $pl->save_pl ($path);
1017 Coro::cede; 1345 cf::cede_to_tick;
1018} 1346}
1019 1347
1020sub new($) { 1348sub new($) {
1021 my ($login) = @_; 1349 my ($login) = @_;
1022 1350
1026 $self->{deny_save} = 1; 1354 $self->{deny_save} = 1;
1027 1355
1028 $cf::PLAYER{$login} = $self; 1356 $cf::PLAYER{$login} = $self;
1029 1357
1030 $self 1358 $self
1359}
1360
1361=item $player->send_msg ($channel, $msg, $color, [extra...])
1362
1363=cut
1364
1365sub send_msg {
1366 my $ns = shift->ns
1367 or return;
1368 $ns->send_msg (@_);
1031} 1369}
1032 1370
1033=item $pl->quit_character 1371=item $pl->quit_character
1034 1372
1035Nukes the player without looking back. If logged in, the connection will 1373Nukes the player without looking back. If logged in, the connection will
1084while and may block, so not sync_job-capable, ever. 1422while and may block, so not sync_job-capable, ever.
1085 1423
1086=cut 1424=cut
1087 1425
1088sub list_logins { 1426sub list_logins {
1089 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1427 my $dirs = aio_readdir $PLAYERDIR
1090 or return []; 1428 or return [];
1091 1429
1092 my @logins; 1430 my @logins;
1093 1431
1094 for my $login (@$dirs) { 1432 for my $login (@$dirs) {
1433 my $path = path $login;
1434
1435 # a .pst is a dead give-away for a valid player
1436 unless (-e "$path.pst") {
1095 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1437 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1096 aio_read $fh, 0, 512, my $buf, 0 or next; 1438 aio_read $fh, 0, 512, my $buf, 0 or next;
1097 $buf !~ /^password -------------$/m or next; # official not-valid tag 1439 $buf !~ /^password -------------$/m or next; # official not-valid tag
1440 }
1098 1441
1099 utf8::decode $login; 1442 utf8::decode $login;
1100 push @logins, $login; 1443 push @logins, $login;
1101 } 1444 }
1102 1445
1129 } 1472 }
1130 1473
1131 \@paths 1474 \@paths
1132} 1475}
1133 1476
1477=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1478
1479Expand crossfire pod fragments into protocol xml.
1480
1481=cut
1482
1483sub expand_cfpod {
1484 ((my $self), (local $_)) = @_;
1485
1486 # escape & and <
1487 s/&/&amp;/g;
1488 s/(?<![BIUGHT])</&lt;/g;
1489
1490 # this is buggy, it needs to properly take care of nested <'s
1491
1492 1 while
1493 # replace B<>, I<>, U<> etc.
1494 s/B<([^\>]*)>/<b>$1<\/b>/
1495 || s/I<([^\>]*)>/<i>$1<\/i>/
1496 || s/U<([^\>]*)>/<u>$1<\/u>/
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1
1501 }ge
1502 # replace H<hint text>
1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1510
1511 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g;
1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1520 $_
1521}
1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527
1134=item $player->ext_reply ($msgid, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1135 1529
1136Sends an ext reply to the player. 1530Sends an ext reply to the player.
1137 1531
1138=cut 1532=cut
1139 1533
1140sub ext_reply($$%) { 1534sub ext_reply($$@) {
1141 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1142 1536
1143 $msg{msgid} = $id; 1537 $self->ns->ext_reply ($id, @msg)
1144
1145 $self->send ("ext " . cf::to_json \%msg);
1146} 1538}
1147 1539
1148=item $player->ext_event ($type, %msg) 1540=item $player->ext_msg ($type, @msg)
1149 1541
1150Sends an ext event to the client. 1542Sends an ext event to the client.
1151 1543
1152=cut 1544=cut
1153 1545
1154sub ext_event($$%) { 1546sub ext_msg($$@) {
1155 my ($self, $type, %msg) = @_; 1547 my ($self, $type, @msg) = @_;
1156 1548
1157 $self->ns->ext_event ($type, %msg); 1549 $self->ns->ext_msg ($type, @msg);
1158} 1550}
1159 1551
1160=head3 cf::region 1552=head3 cf::region
1161 1553
1162=over 4 1554=over 4
1165 1557
1166package cf::region; 1558package cf::region;
1167 1559
1168=item cf::region::find_by_path $path 1560=item cf::region::find_by_path $path
1169 1561
1170Tries to decuce the probable region for a map knowing only its path. 1562Tries to decuce the likely region for a map knowing only its path.
1171 1563
1172=cut 1564=cut
1173 1565
1174sub find_by_path($) { 1566sub find_by_path($) {
1175 my ($path) = @_; 1567 my ($path) = @_;
1176 1568
1177 my ($match, $specificity); 1569 my ($match, $specificity);
1178 1570
1179 for my $region (list) { 1571 for my $region (list) {
1180 if ($region->match && $path =~ $region->match) { 1572 if ($region->{match} && $path =~ $region->{match}) {
1181 ($match, $specificity) = ($region, $region->specificity) 1573 ($match, $specificity) = ($region, $region->specificity)
1182 if $region->specificity > $specificity; 1574 if $region->specificity > $specificity;
1183 } 1575 }
1184 } 1576 }
1185 1577
1249 my ($self, $merge) = @_; 1641 my ($self, $merge) = @_;
1250 1642
1251 # we have to keep some variables in memory intact 1643 # we have to keep some variables in memory intact
1252 local $self->{path}; 1644 local $self->{path};
1253 local $self->{load_path}; 1645 local $self->{load_path};
1254 local $self->{deny_save};
1255 local $self->{deny_reset};
1256 1646
1257 $self->SUPER::thawer_merge ($merge); 1647 $self->SUPER::thawer_merge ($merge);
1258} 1648}
1259 1649
1260sub normalise { 1650sub normalise {
1307 $self->init; # pass $1 etc. 1697 $self->init; # pass $1 etc.
1308 return $self; 1698 return $self;
1309 } 1699 }
1310 } 1700 }
1311 1701
1312 Carp::carp "unable to resolve path '$path' (base '$base')."; 1702 Carp::cluck "unable to resolve path '$path' (base '$base').";
1313 () 1703 ()
1314} 1704}
1315 1705
1316sub init { 1706sub init {
1317 my ($self) = @_; 1707 my ($self) = @_;
1332 1722
1333# the original (read-only) location 1723# the original (read-only) location
1334sub load_path { 1724sub load_path {
1335 my ($self) = @_; 1725 my ($self) = @_;
1336 1726
1337 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1727 "$MAPDIR/$self->{path}.map"
1338} 1728}
1339 1729
1340# the temporary/swap location 1730# the temporary/swap location
1341sub save_path { 1731sub save_path {
1342 my ($self) = @_; 1732 my ($self) = @_;
1343 1733
1344 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1734 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1345 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1735 "$TMPDIR/$path.map"
1346} 1736}
1347 1737
1348# the unique path, undef == no special unique path 1738# the unique path, undef == no special unique path
1349sub uniq_path { 1739sub uniq_path {
1350 my ($self) = @_; 1740 my ($self) = @_;
1351 1741
1352 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1742 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1353 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1743 "$UNIQUEDIR/$path"
1354} 1744}
1355 1745
1356# and all this just because we cannot iterate over 1746# and all this just because we cannot iterate over
1357# all maps in C++... 1747# all maps in C++...
1358sub change_all_map_light { 1748sub change_all_map_light {
1360 1750
1361 $_->change_map_light ($change) 1751 $_->change_map_light ($change)
1362 for grep $_->outdoor, values %cf::MAP; 1752 for grep $_->outdoor, values %cf::MAP;
1363} 1753}
1364 1754
1755sub decay_objects {
1756 my ($self) = @_;
1757
1758 return if $self->{deny_reset};
1759
1760 $self->do_decay_objects;
1761}
1762
1365sub unlink_save { 1763sub unlink_save {
1366 my ($self) = @_; 1764 my ($self) = @_;
1367 1765
1368 utf8::encode (my $save = $self->save_path); 1766 utf8::encode (my $save = $self->save_path);
1369 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1767 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1372 1770
1373sub load_header_from($) { 1771sub load_header_from($) {
1374 my ($self, $path) = @_; 1772 my ($self, $path) = @_;
1375 1773
1376 utf8::encode $path; 1774 utf8::encode $path;
1377 #aio_open $path, O_RDONLY, 0 1775 my $f = new_from_file cf::object::thawer $path
1378 # or return;
1379
1380 $self->_load_header ($path)
1381 or return; 1776 or return;
1777
1778 $self->_load_header ($f)
1779 or return;
1780
1781 local $MAP_LOADING{$self->{path}} = $self;
1782 $f->resolve_delayed_derefs;
1382 1783
1383 $self->{load_path} = $path; 1784 $self->{load_path} = $path;
1384 1785
1385 1 1786 1
1386} 1787}
1425 $self->load_header_orig 1826 $self->load_header_orig
1426 or return; 1827 or return;
1427 $self->prepare_orig; 1828 $self->prepare_orig;
1428 } 1829 }
1429 1830
1831 $self->{deny_reset} = 1
1832 if $self->no_reset;
1833
1430 $self->default_region (cf::region::find_by_path $self->{path}) 1834 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region; 1835 unless $self->default_region;
1432 1836
1433 1 1837 1
1434} 1838}
1449 $map->{last_save} = $cf::RUNTIME; 1853 $map->{last_save} = $cf::RUNTIME;
1450 1854
1451 $map->load_header 1855 $map->load_header
1452 or return; 1856 or return;
1453 1857
1454 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1858 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1455 # doing this can freeze the server in a sync job, obviously 1859 # doing this can freeze the server in a sync job, obviously
1456 #$cf::WAIT_FOR_TICK->wait; 1860 #$cf::WAIT_FOR_TICK->wait;
1457 $map->reset; 1861 $map->reset;
1458 undef $guard; 1862 undef $guard;
1459 return find $path; 1863 return find $path;
1470 my ($self) = @_; 1874 my ($self) = @_;
1471 1875
1472 local $self->{deny_reset} = 1; # loading can take a long time 1876 local $self->{deny_reset} = 1; # loading can take a long time
1473 1877
1474 my $path = $self->{path}; 1878 my $path = $self->{path};
1879
1880 {
1475 my $guard = cf::lock_acquire "map_load:$path"; 1881 my $guard = cf::lock_acquire "map_data:$path";
1476 1882
1883 return unless $self->valid;
1477 return if $self->in_memory != cf::MAP_SWAPPED; 1884 return if $self->in_memory != cf::MAP_SWAPPED;
1478 1885
1479 $self->in_memory (cf::MAP_LOADING); 1886 $self->in_memory (cf::MAP_LOADING);
1480 1887
1481 $self->alloc; 1888 $self->alloc;
1482 1889
1483 $self->pre_load; 1890 $self->pre_load;
1484 Coro::cede; 1891 cf::cede_to_tick;
1485 1892
1486 $self->_load_objects ($self->{load_path}, 1) 1893 my $f = new_from_file cf::object::thawer $self->{load_path};
1894 $f->skip_block;
1895 $self->_load_objects ($f)
1487 or return; 1896 or return;
1488 1897
1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1490 if delete $self->{load_original}; 1899 if delete $self->{load_original};
1491 1900
1492 if (my $uniq = $self->uniq_path) { 1901 if (my $uniq = $self->uniq_path) {
1493 utf8::encode $uniq; 1902 utf8::encode $uniq;
1494 if (aio_open $uniq, O_RDONLY, 0) { 1903 unless (aio_stat $uniq) {
1904 if (my $f = new_from_file cf::object::thawer $uniq) {
1495 $self->clear_unique_items; 1905 $self->clear_unique_items;
1496 $self->_load_objects ($uniq, 0); 1906 $self->_load_objects ($f);
1907 $f->resolve_delayed_derefs;
1908 }
1497 } 1909 }
1498 } 1910 }
1499 1911
1500 Coro::cede; 1912 $f->resolve_delayed_derefs;
1913
1914 cf::cede_to_tick;
1501 # now do the right thing for maps 1915 # now do the right thing for maps
1502 $self->link_multipart_objects; 1916 $self->link_multipart_objects;
1503 Coro::cede;
1504
1505 unless ($self->{deny_activate}) {
1506 $self->decay_objects;
1507 $self->fix_auto_apply;
1508 $self->update_buttons;
1509 Coro::cede;
1510 $self->set_darkness_map;
1511 $self->difficulty ($self->estimate_difficulty) 1917 $self->difficulty ($self->estimate_difficulty)
1512 unless $self->difficulty; 1918 unless $self->difficulty;
1513 Coro::cede; 1919 cf::cede_to_tick;
1920
1921 unless ($self->{deny_activate}) {
1922 $self->decay_objects;
1923 $self->fix_auto_apply;
1924 $self->update_buttons;
1925 cf::cede_to_tick;
1926 $self->set_darkness_map;
1927 cf::cede_to_tick;
1514 $self->activate; 1928 $self->activate;
1515 Coro::cede; 1929 }
1930
1931 $self->{last_save} = $cf::RUNTIME;
1932 $self->last_access ($cf::RUNTIME);
1933
1934 $self->in_memory (cf::MAP_IN_MEMORY);
1516 } 1935 }
1517 1936
1518 $self->post_load; 1937 $self->post_load;
1519 Coro::cede;
1520
1521 $self->in_memory (cf::MAP_IN_MEMORY);
1522} 1938}
1523 1939
1524sub customise_for { 1940sub customise_for {
1525 my ($self, $ob) = @_; 1941 my ($self, $ob) = @_;
1526 1942
1527 return find "~" . $ob->name . "/" . $self->{path} 1943 return find "~" . $ob->name . "/" . $self->{path}
1528 if $self->per_player; 1944 if $self->per_player;
1529 1945
1946# return find "?party/" . $ob->name . "/" . $self->{path}
1947# if $self->per_party;
1948
1530 $self 1949 $self
1531} 1950}
1532 1951
1533# find and load all maps in the 3x3 area around a map 1952# find and load all maps in the 3x3 area around a map
1534sub load_diag { 1953sub load_neighbours {
1535 my ($map) = @_; 1954 my ($map) = @_;
1536 1955
1537 my @diag; # diagonal neighbours 1956 my @neigh; # diagonal neighbours
1538 1957
1539 for (0 .. 3) { 1958 for (0 .. 3) {
1540 my $neigh = $map->tile_path ($_) 1959 my $neigh = $map->tile_path ($_)
1541 or next; 1960 or next;
1542 $neigh = find $neigh, $map 1961 $neigh = find $neigh, $map
1543 or next; 1962 or next;
1544 $neigh->load; 1963 $neigh->load;
1545 1964
1965 push @neigh,
1546 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1966 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1547 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1967 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1548 } 1968 }
1549 1969
1550 for (@diag) { 1970 for (grep defined $_->[0], @neigh) {
1971 my ($path, $origin) = @$_;
1551 my $neigh = find @$_ 1972 my $neigh = find $path, $origin
1552 or next; 1973 or next;
1553 $neigh->load; 1974 $neigh->load;
1554 } 1975 }
1555} 1976}
1556 1977
1561} 1982}
1562 1983
1563sub do_load_sync { 1984sub do_load_sync {
1564 my ($map) = @_; 1985 my ($map) = @_;
1565 1986
1987 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1988 if $Coro::current == $Coro::main;
1989
1566 cf::sync_job { $map->load }; 1990 cf::sync_job { $map->load };
1567} 1991}
1568 1992
1569our %MAP_PREFETCH; 1993our %MAP_PREFETCH;
1570our $MAP_PREFETCHER = undef; 1994our $MAP_PREFETCHER = undef;
1571 1995
1572sub find_async { 1996sub find_async {
1573 my ($path, $origin) = @_; 1997 my ($path, $origin, $load) = @_;
1574 1998
1575 $path = normalise $path, $origin && $origin->{path}; 1999 $path = normalise $path, $origin && $origin->{path};
1576 2000
1577 if (my $map = $cf::MAP{$path}) { 2001 if (my $map = $cf::MAP{$path}) {
1578 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2002 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1579 } 2003 }
1580 2004
1581 undef $MAP_PREFETCH{$path}; 2005 $MAP_PREFETCH{$path} |= $load;
2006
1582 $MAP_PREFETCHER ||= cf::async { 2007 $MAP_PREFETCHER ||= cf::async {
1583 while (%MAP_PREFETCH) { 2008 while (%MAP_PREFETCH) {
1584 for my $path (keys %MAP_PREFETCH) { 2009 while (my ($k, $v) = each %MAP_PREFETCH) {
1585 my $map = find $path 2010 if (my $map = find $k) {
1586 or next;
1587 $map->load; 2011 $map->load if $v;
2012 }
1588 2013
1589 delete $MAP_PREFETCH{$path}; 2014 delete $MAP_PREFETCH{$k};
1590 } 2015 }
1591 } 2016 }
1592 undef $MAP_PREFETCHER; 2017 undef $MAP_PREFETCHER;
1593 }; 2018 };
1594 $MAP_PREFETCHER->prio (6); 2019 $MAP_PREFETCHER->prio (6);
1597} 2022}
1598 2023
1599sub save { 2024sub save {
1600 my ($self) = @_; 2025 my ($self) = @_;
1601 2026
1602 my $lock = cf::lock_acquire "map_data:" . $self->path; 2027 my $lock = cf::lock_acquire "map_data:$self->{path}";
1603 2028
1604 $self->{last_save} = $cf::RUNTIME; 2029 $self->{last_save} = $cf::RUNTIME;
1605 2030
1606 return unless $self->dirty; 2031 return unless $self->dirty;
1607 2032
1630 my ($self) = @_; 2055 my ($self) = @_;
1631 2056
1632 # save first because save cedes 2057 # save first because save cedes
1633 $self->save; 2058 $self->save;
1634 2059
1635 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1636 2061
1637 return if $self->players; 2062 return if $self->players;
1638 return if $self->in_memory != cf::MAP_IN_MEMORY; 2063 return if $self->in_memory != cf::MAP_IN_MEMORY;
1639 return if $self->{deny_save}; 2064 return if $self->{deny_save};
1640 2065
1644 2069
1645sub reset_at { 2070sub reset_at {
1646 my ($self) = @_; 2071 my ($self) = @_;
1647 2072
1648 # TODO: safety, remove and allow resettable per-player maps 2073 # TODO: safety, remove and allow resettable per-player maps
1649 return 1e99 if $self->isa ("ext::map_per_player");#d#
1650 return 1e99 if $self->{deny_reset}; 2074 return 1e99 if $self->{deny_reset};
1651 2075
1652 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2076 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1653 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2077 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1654 2078
1665 my ($self) = @_; 2089 my ($self) = @_;
1666 2090
1667 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2091 my $lock = cf::lock_acquire "map_data:$self->{path}";
1668 2092
1669 return if $self->players; 2093 return if $self->players;
1670 return if $self->isa ("ext::map_per_player");#d#
1671 2094
1672 warn "resetting map ", $self->path;#d# 2095 warn "resetting map ", $self->path;
1673 2096
1674 $self->in_memory (cf::MAP_SWAPPED); 2097 $self->in_memory (cf::MAP_SWAPPED);
1675 2098
1676 # need to save uniques path 2099 # need to save uniques path
1677 unless ($self->{deny_save}) { 2100 unless ($self->{deny_save}) {
1694my $nuke_counter = "aaaa"; 2117my $nuke_counter = "aaaa";
1695 2118
1696sub nuke { 2119sub nuke {
1697 my ($self) = @_; 2120 my ($self) = @_;
1698 2121
2122 {
2123 my $lock = cf::lock_acquire "map_data:$self->{path}";
2124
1699 delete $cf::MAP{$self->path}; 2125 delete $cf::MAP{$self->path};
1700 2126
1701 $self->unlink_save; 2127 $self->unlink_save;
1702 2128
1703 bless $self, "cf::map"; 2129 bless $self, "cf::map";
1704 delete $self->{deny_reset}; 2130 delete $self->{deny_reset};
1705 $self->{deny_save} = 1; 2131 $self->{deny_save} = 1;
1706 $self->reset_timeout (1); 2132 $self->reset_timeout (1);
1707 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2133 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1708 2134
1709 $cf::MAP{$self->path} = $self; 2135 $cf::MAP{$self->path} = $self;
2136 }
1710 2137
1711 $self->reset; # polite request, might not happen 2138 $self->reset; # polite request, might not happen
2139}
2140
2141=item $maps = cf::map::tmp_maps
2142
2143Returns an arrayref with all map paths of currently instantiated and saved
2144maps. May block.
2145
2146=cut
2147
2148sub tmp_maps() {
2149 [
2150 map {
2151 utf8::decode $_;
2152 /\.map$/
2153 ? normalise $_
2154 : ()
2155 } @{ aio_readdir $TMPDIR or [] }
2156 ]
2157}
2158
2159=item $maps = cf::map::random_maps
2160
2161Returns an arrayref with all map paths of currently instantiated and saved
2162random maps. May block.
2163
2164=cut
2165
2166sub random_maps() {
2167 [
2168 map {
2169 utf8::decode $_;
2170 /\.map$/
2171 ? normalise "?random/$_"
2172 : ()
2173 } @{ aio_readdir $RANDOMDIR or [] }
2174 ]
1712} 2175}
1713 2176
1714=item cf::map::unique_maps 2177=item cf::map::unique_maps
1715 2178
1716Returns an arrayref of paths of all shared maps that have 2179Returns an arrayref of paths of all shared maps that have
1717instantiated unique items. May block. 2180instantiated unique items. May block.
1718 2181
1719=cut 2182=cut
1720 2183
1721sub unique_maps() { 2184sub unique_maps() {
1722 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2185 [
1723 or return; 2186 map {
1724
1725 my @paths;
1726
1727 for (@$files) {
1728 utf8::decode $_; 2187 utf8::decode $_;
1729 next if /\.pst$/; 2188 /\.map$/
1730 next unless /^$PATH_SEP/o; 2189 ? normalise $_
1731 2190 : ()
1732 push @paths, cf::map::normalise $_; 2191 } @{ aio_readdir $UNIQUEDIR or [] }
1733 } 2192 ]
1734
1735 \@paths
1736} 2193}
1737 2194
1738package cf; 2195package cf;
1739 2196
1740=back 2197=back
1758 map { $_, inv_recursive_ $_->inv } @_ 2215 map { $_, inv_recursive_ $_->inv } @_
1759} 2216}
1760 2217
1761sub inv_recursive { 2218sub inv_recursive {
1762 inv_recursive_ inv $_[0] 2219 inv_recursive_ inv $_[0]
2220}
2221
2222=item $ref = $ob->ref
2223
2224creates and returns a persistent reference to an objetc that can be stored as a string.
2225
2226=item $ob = cf::object::deref ($refstring)
2227
2228returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2229even if the object actually exists. May block.
2230
2231=cut
2232
2233sub deref {
2234 my ($ref) = @_;
2235
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return;
2243 $pl->ob->uuid eq $uuid
2244 or return;
2245
2246 $pl->ob
2247 } else {
2248 warn "$ref: cannot resolve object reference\n";
2249 undef
2250 }
1763} 2251}
1764 2252
1765package cf; 2253package cf;
1766 2254
1767=back 2255=back
1786 2274
1787 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2275 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1788 2276
1789 if ($self->{record_replies}) { 2277 if ($self->{record_replies}) {
1790 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2278 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2279
1791 } else { 2280 } else {
2281 my $pl = $self->contr;
2282
2283 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2284 my $dialog = $pl->{npc_dialog};
2285 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2286
2287 } else {
1792 $msg = $npc->name . " says: $msg" if $npc; 2288 $msg = $npc->name . " says: $msg" if $npc;
1793 $self->message ($msg, $flags); 2289 $self->message ($msg, $flags);
2290 }
1794 } 2291 }
2292}
2293
2294=item $object->send_msg ($channel, $msg, $color, [extra...])
2295
2296=cut
2297
2298sub cf::object::send_msg {
2299 my $pl = shift->contr
2300 or return;
2301 $pl->send_msg (@_);
1795} 2302}
1796 2303
1797=item $player_object->may ("access") 2304=item $player_object->may ("access")
1798 2305
1799Returns wether the given player is authorized to access resource "access" 2306Returns wether the given player is authorized to access resource "access"
1846 $self->deactivate_recursive; 2353 $self->deactivate_recursive;
1847 2354
1848 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2355 return if UNIVERSAL::isa $self->map, "ext::map_link";
1849 2356
1850 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2357 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1851 if $self->map; 2358 if $self->map && $self->map->{path} ne "{link}";
1852 2359
1853 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2360 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1854} 2361}
1855 2362
1856sub cf::object::player::leave_link { 2363sub cf::object::player::leave_link {
1857 my ($self, $map, $x, $y) = @_; 2364 my ($self, $map, $x, $y) = @_;
2365
2366 return unless $self->contr->active;
1858 2367
1859 my $link_pos = delete $self->{_link_pos}; 2368 my $link_pos = delete $self->{_link_pos};
1860 2369
1861 unless ($map) { 2370 unless ($map) {
1862 # restore original map position 2371 # restore original map position
1876 # use -1 or undef as default coordinates, not 0, 0 2385 # use -1 or undef as default coordinates, not 0, 0
1877 ($x, $y) = ($map->enter_x, $map->enter_y) 2386 ($x, $y) = ($map->enter_x, $map->enter_y)
1878 if $x <=0 && $y <= 0; 2387 if $x <=0 && $y <= 0;
1879 2388
1880 $map->load; 2389 $map->load;
1881 $map->load_diag; 2390 $map->load_neighbours;
1882 2391
1883 return unless $self->contr->active; 2392 return unless $self->contr->active;
1884 $self->activate_recursive; 2393 $self->activate_recursive;
1885 2394
1886 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2395 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1887 $self->enter_map ($map, $x, $y); 2396 $self->enter_map ($map, $x, $y);
1888} 2397}
1889 2398
1890cf::player->attach ( 2399=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1891 on_logout => sub {
1892 my ($pl) = @_;
1893 2400
1894 # abort map switching before logout 2401Moves the player to the given map-path and coordinates by first freezing
1895 if ($pl->ob->{_link_pos}) { 2402her, loading and preparing them map, calling the provided $check callback
1896 cf::sync_job { 2403that has to return the map if sucecssful, and then unfreezes the player on
1897 $pl->ob->leave_link 2404the new (success) or old (failed) map position. In either case, $done will
1898 }; 2405be called at the end of this process.
1899 }
1900 },
1901 on_login => sub {
1902 my ($pl) = @_;
1903 2406
1904 # try to abort aborted map switching on player login :)
1905 # should happen only on crashes
1906 if ($pl->ob->{_link_pos}) {
1907 $pl->ob->enter_link;
1908 (async {
1909 $pl->ob->reply (undef,
1910 "There was an internal problem at your last logout, "
1911 . "the server will try to bring you to your intended destination in a second.",
1912 cf::NDI_RED);
1913 # we need this sleep as the login has a concurrent enter_exit running
1914 # and this sleep increases chances of the player not ending up in scorn
1915 Coro::Timer::sleep 1;
1916 $pl->ob->leave_link;
1917 })->prio (2);
1918 }
1919 },
1920);
1921
1922=item $player_object->goto ($path, $x, $y)
1923
1924=cut 2407=cut
2408
2409our $GOTOGEN;
1925 2410
1926sub cf::object::player::goto { 2411sub cf::object::player::goto {
1927 my ($self, $path, $x, $y) = @_; 2412 my ($self, $path, $x, $y, $check, $done) = @_;
2413
2414 # do generation counting so two concurrent goto's will be executed in-order
2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1928 2416
1929 $self->enter_link; 2417 $self->enter_link;
1930 2418
1931 (async { 2419 (async {
1932 my $map = eval { 2420 my $map = eval {
1933 my $map = cf::map::find $path; 2421 my $map = cf::map::find $path;
2422
2423 if ($map) {
1934 $map = $map->customise_for ($self) if $map; 2424 $map = $map->customise_for ($self);
2425 $map = $check->($map) if $check && $map;
2426 } else {
2427 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2428 }
2429
1935 $map 2430 $map
2431 };
2432
2433 if ($@) {
2434 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2435 LOG llevError | logBacktrace, Carp::longmess $@;
1936 } or 2436 }
1937 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1938 2437
2438 if ($gen == $self->{_goto_generation}) {
2439 delete $self->{_goto_generation};
1939 $self->leave_link ($map, $x, $y); 2440 $self->leave_link ($map, $x, $y);
2441 }
2442
2443 $done->() if $done;
1940 })->prio (1); 2444 })->prio (1);
1941} 2445}
1942 2446
1943=item $player_object->enter_exit ($exit_object) 2447=item $player_object->enter_exit ($exit_object)
1944 2448
1983 2487
1984 $rmp->{random_seed} ||= $exit->random_seed; 2488 $rmp->{random_seed} ||= $exit->random_seed;
1985 2489
1986 my $data = cf::to_json $rmp; 2490 my $data = cf::to_json $rmp;
1987 my $md5 = Digest::MD5::md5_hex $data; 2491 my $md5 = Digest::MD5::md5_hex $data;
1988 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2492 my $meta = "$RANDOMDIR/$md5.meta";
1989 2493
1990 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2494 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1991 aio_write $fh, 0, (length $data), $data, 0; 2495 aio_write $fh, 0, (length $data), $data, 0;
1992 undef $fh; 2496 undef $fh;
1993 aio_rename "$meta~", $meta; 2497 aio_rename "$meta~", $meta;
2012 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2516 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2013 my $hp = $exit->stats->hp; 2517 my $hp = $exit->stats->hp;
2014 my $sp = $exit->stats->sp; 2518 my $sp = $exit->stats->sp;
2015 2519
2016 $self->enter_link; 2520 $self->enter_link;
2521
2522 # if exit is damned, update players death & WoR home-position
2523 $self->contr->savebed ($slaying, $hp, $sp)
2524 if $exit->flag (FLAG_DAMNED);
2017 2525
2018 (async { 2526 (async {
2019 $self->deactivate_recursive; # just to be sure 2527 $self->deactivate_recursive; # just to be sure
2020 unless (eval { 2528 unless (eval {
2021 $self->goto ($slaying, $hp, $sp); 2529 $self->goto ($slaying, $hp, $sp);
2049 2557
2050 utf8::encode $text; 2558 utf8::encode $text;
2051 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2559 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2052} 2560}
2053 2561
2562=item $client->send_msg ($channel, $msg, $color, [extra...])
2563
2564Send a drawinfo or msg packet to the client, formatting the msg for the
2565client if neccessary. C<$type> should be a string identifying the type of
2566the message, with C<log> being the default. If C<$color> is negative, suppress
2567the message unless the client supports the msg packet.
2568
2569=cut
2570
2571our %CHANNEL = (
2572 "c/identify" => {
2573 id => "identify",
2574 title => "Identify",
2575 reply => undef,
2576 tooltip => "Items recently identified",
2577 },
2578 "c/examine" => {
2579 id => "examine",
2580 title => "Examine",
2581 reply => undef,
2582 tooltip => "Signs and other items you examined",
2583 },
2584);
2585
2586sub cf::client::send_msg {
2587 my ($self, $channel, $msg, $color, @extra) = @_;
2588
2589 $msg = $self->pl->expand_cfpod ($msg);
2590
2591 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592
2593 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2595
2596 if (ref $channel) {
2597 # send meta info to client, if not yet sent
2598 unless (exists $self->{channel}{$channel->{id}}) {
2599 $self->{channel}{$channel->{id}} = $channel;
2600 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg;
2602 }
2603
2604 $channel = $channel->{id};
2605 }
2606
2607 return unless @extra || length $msg;
2608
2609 if ($self->can_msg) {
2610 # default colour, mask it out
2611 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2612 if $color & cf::NDI_DEF;
2613
2614 $self->send_packet ("msg " . $self->{json_coder}->encode (
2615 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2616 } else {
2617 if ($color >= 0) {
2618 # replace some tags by gcfclient-compatible ones
2619 for ($msg) {
2620 1 while
2621 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2622 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2623 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2624 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2625 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2626 }
2627
2628 $color &= cf::NDI_COLOR_MASK;
2629
2630 utf8::encode $msg;
2631
2632 if (0 && $msg =~ /\[/) {
2633 # COMMAND/INFO
2634 $self->send_packet ("drawextinfo $color 10 8 $msg")
2635 } else {
2636 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2637 $self->send_packet ("drawinfo $color $msg")
2638 }
2639 }
2640 }
2641}
2642
2054=item $client->ext_event ($type, %msg) 2643=item $client->ext_msg ($type, @msg)
2055 2644
2056Sends an exti event to the client. 2645Sends an ext event to the client.
2057 2646
2058=cut 2647=cut
2059 2648
2060sub cf::client::ext_event($$%) { 2649sub cf::client::ext_msg($$@) {
2061 my ($self, $type, %msg) = @_; 2650 my ($self, $type, @msg) = @_;
2062 2651
2652 if ($self->extcmd == 2) {
2653 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2654 } elsif ($self->extcmd == 1) { # TODO: remove
2063 $msg{msgtype} = "event_$type"; 2655 push @msg, msgtype => "event_$type";
2064 $self->send_packet ("ext " . cf::to_json \%msg); 2656 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2657 }
2658}
2659
2660=item $client->ext_reply ($msgid, @msg)
2661
2662Sends an ext reply to the client.
2663
2664=cut
2665
2666sub cf::client::ext_reply($$@) {
2667 my ($self, $id, @msg) = @_;
2668
2669 if ($self->extcmd == 2) {
2670 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2671 } elsif ($self->extcmd == 1) {
2672 #TODO: version 1, remove
2673 unshift @msg, msgtype => "reply", msgid => $id;
2674 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2675 }
2065} 2676}
2066 2677
2067=item $success = $client->query ($flags, "text", \&cb) 2678=item $success = $client->query ($flags, "text", \&cb)
2068 2679
2069Queues a query to the client, calling the given callback with 2680Queues a query to the client, calling the given callback with
2070the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2681the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2071C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2682C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2072 2683
2073Queries can fail, so check the return code. Or don't, as queries will become 2684Queries can fail, so check the return code. Or don't, as queries will
2074reliable at some point in the future. 2685become reliable at some point in the future.
2075 2686
2076=cut 2687=cut
2077 2688
2078sub cf::client::query { 2689sub cf::client::query {
2079 my ($self, $flags, $text, $cb) = @_; 2690 my ($self, $flags, $text, $cb) = @_;
2087 utf8::encode $text; 2698 utf8::encode $text;
2088 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2699 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2089 2700
2090 $self->send_packet ($self->{query_queue}[0][0]) 2701 $self->send_packet ($self->{query_queue}[0][0])
2091 if @{ $self->{query_queue} } == 1; 2702 if @{ $self->{query_queue} } == 1;
2703
2704 1
2092} 2705}
2093 2706
2094cf::client->attach ( 2707cf::client->attach (
2708 on_connect => sub {
2709 my ($ns) = @_;
2710
2711 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2712 },
2095 on_reply => sub { 2713 on_reply => sub {
2096 my ($ns, $msg) = @_; 2714 my ($ns, $msg) = @_;
2097 2715
2098 # this weird shuffling is so that direct followup queries 2716 # this weird shuffling is so that direct followup queries
2099 # get handled first 2717 # get handled first
2111 } else { 2729 } else {
2112 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2730 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2113 } 2731 }
2114 } 2732 }
2115 }, 2733 },
2734 on_exticmd => sub {
2735 my ($ns, $buf) = @_;
2736
2737 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2738
2739 if (ref $msg) {
2740 my ($type, $reply, @payload) =
2741 "ARRAY" eq ref $msg
2742 ? @$msg
2743 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2744
2745 my @reply;
2746
2747 if (my $cb = $EXTICMD{$type}) {
2748 @reply = $cb->($ns, @payload);
2749 }
2750
2751 $ns->ext_reply ($reply, @reply)
2752 if $reply;
2753
2754 } else {
2755 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2756 }
2757
2758 cf::override;
2759 },
2116); 2760);
2117 2761
2118=item $client->async (\&cb) 2762=item $client->async (\&cb)
2119 2763
2120Create a new coroutine, running the specified callback. The coroutine will 2764Create a new coroutine, running the specified callback. The coroutine will
2161our $safe = new Safe "safe"; 2805our $safe = new Safe "safe";
2162our $safe_hole = new Safe::Hole; 2806our $safe_hole = new Safe::Hole;
2163 2807
2164$SIG{FPE} = 'IGNORE'; 2808$SIG{FPE} = 'IGNORE';
2165 2809
2166$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2810$safe->permit_only (Opcode::opset qw(
2811 :base_core :base_mem :base_orig :base_math
2812 grepstart grepwhile mapstart mapwhile
2813 sort time
2814));
2167 2815
2168# here we export the classes and methods available to script code 2816# here we export the classes and methods available to script code
2169 2817
2170=pod 2818=pod
2171 2819
2172The following functions and methods are available within a safe environment: 2820The following functions and methods are available within a safe environment:
2173 2821
2174 cf::object contr pay_amount pay_player map 2822 cf::object
2823 contr pay_amount pay_player map x y force_find force_add
2824 insert remove name archname title slaying race decrease_ob_nr
2825
2175 cf::object::player player 2826 cf::object::player
2176 cf::player peaceful 2827 player
2177 cf::map trigger 2828
2829 cf::player
2830 peaceful
2831
2832 cf::map
2833 trigger
2178 2834
2179=cut 2835=cut
2180 2836
2181for ( 2837for (
2182 ["cf::object" => qw(contr pay_amount pay_player map)], 2838 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2839 insert remove inv name archname title slaying race
2840 decrease_ob_nr)],
2183 ["cf::object::player" => qw(player)], 2841 ["cf::object::player" => qw(player)],
2184 ["cf::player" => qw(peaceful)], 2842 ["cf::player" => qw(peaceful)],
2185 ["cf::map" => qw(trigger)], 2843 ["cf::map" => qw(trigger)],
2186) { 2844) {
2187 no strict 'refs'; 2845 no strict 'refs';
2258=back 2916=back
2259 2917
2260=cut 2918=cut
2261 2919
2262############################################################################# 2920#############################################################################
2263
2264=head2 EXTENSION DATABASE SUPPORT
2265
2266Crossfire maintains a very simple database for extension use. It can
2267currently store anything that can be serialised using Storable, which
2268excludes objects.
2269
2270The parameter C<$family> should best start with the name of the extension
2271using it, it should be unique.
2272
2273=over 4
2274
2275=item $value = cf::db_get $family => $key
2276
2277Returns a single value from the database.
2278
2279=item cf::db_put $family => $key => $value
2280
2281Stores the given C<$value> in the family.
2282
2283=cut
2284
2285our $DB;
2286
2287sub db_init {
2288 unless ($DB) {
2289 $DB = BDB::db_create $DB_ENV;
2290
2291 cf::sync_job {
2292 eval {
2293 $DB->set_flags (BDB::CHKSUM);
2294
2295 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!;
2298 };
2299 cf::cleanup "db_open(db): $@" if $@;
2300 };
2301
2302 my $path = cf::localdir . "/database.pst";
2303 if (stat $path) {
2304 cf::sync_job {
2305 my $pst = Storable::retrieve $path;
2306
2307 cf::db_put (board => data => $pst->{board});
2308 cf::db_put (guildrules => data => $pst->{guildrules});
2309 cf::db_put (rent => balance => $pst->{rent}{balance});
2310 BDB::db_env_txn_checkpoint $DB_ENV;
2311
2312 unlink $path;
2313 };
2314 }
2315 }
2316}
2317
2318sub db_get($$) {
2319 my $key = "$_[0]/$_[1]";
2320
2321 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data;
2323
2324 $! ? ()
2325 : Compress::LZF::sthaw $data
2326 }
2327}
2328
2329sub db_put($$$) {
2330 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2332}
2333
2334#############################################################################
2335# the server's init and main functions 2921# the server's init and main functions
2336 2922
2337sub load_facedata($) { 2923sub load_facedata($) {
2338 my ($path) = @_; 2924 my ($path) = @_;
2925
2926 # HACK to clear player env face cache, we need some signal framework
2927 # for this (global event?)
2928 %ext::player_env::MUSIC_FACE_CACHE = ();
2929
2930 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2339 2931
2340 warn "loading facedata from $path\n"; 2932 warn "loading facedata from $path\n";
2341 2933
2342 my $facedata; 2934 my $facedata;
2343 0 < aio_load $path, $facedata 2935 0 < aio_load $path, $facedata
2346 $facedata = Coro::Storable::thaw $facedata; 2938 $facedata = Coro::Storable::thaw $facedata;
2347 2939
2348 $facedata->{version} == 2 2940 $facedata->{version} == 2
2349 or cf::cleanup "$path: version mismatch, cannot proceed."; 2941 or cf::cleanup "$path: version mismatch, cannot proceed.";
2350 2942
2943 # patch in the exptable
2944 $facedata->{resource}{"res/exp_table"} = {
2945 type => FT_RSRC,
2946 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2947 };
2948 cf::cede_to_tick;
2949
2351 { 2950 {
2352 my $faces = $facedata->{faceinfo}; 2951 my $faces = $facedata->{faceinfo};
2353 2952
2354 while (my ($face, $info) = each %$faces) { 2953 while (my ($face, $info) = each %$faces) {
2355 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2954 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2356 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2955 cf::face::set_visibility $idx, $info->{visibility};
2956 cf::face::set_magicmap $idx, $info->{magicmap};
2357 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2358 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2359 Coro::cede; 2959
2960 cf::cede_to_tick;
2360 } 2961 }
2361 2962
2362 while (my ($face, $info) = each %$faces) { 2963 while (my ($face, $info) = each %$faces) {
2363 next unless $info->{smooth}; 2964 next unless $info->{smooth};
2364 my $idx = cf::face::find $face 2965 my $idx = cf::face::find $face
2365 or next; 2966 or next;
2366 if (my $smooth = cf::face::find $info->{smooth}) { 2967 if (my $smooth = cf::face::find $info->{smooth}) {
2968 cf::face::set_smooth $idx, $smooth;
2367 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2969 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2368 } else { 2970 } else {
2369 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2971 warn "smooth face '$info->{smooth}' not found for face '$face'";
2370 } 2972 }
2371 Coro::cede; 2973
2974 cf::cede_to_tick;
2372 } 2975 }
2373 } 2976 }
2374 2977
2375 { 2978 {
2376 my $anims = $facedata->{animinfo}; 2979 my $anims = $facedata->{animinfo};
2377 2980
2378 while (my ($anim, $info) = each %$anims) { 2981 while (my ($anim, $info) = each %$anims) {
2379 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2982 cf::anim::set $anim, $info->{frames}, $info->{facings};
2380 Coro::cede; 2983 cf::cede_to_tick;
2381 } 2984 }
2382 2985
2383 cf::anim::invalidate_all; # d'oh 2986 cf::anim::invalidate_all; # d'oh
2384 } 2987 }
2385 2988
2989 {
2990 # TODO: for gcfclient pleasure, we should give resources
2991 # that gcfclient doesn't grok a >10000 face index.
2992 my $res = $facedata->{resource};
2993
2994 my $soundconf = delete $res->{"res/sound.conf"};
2995
2996 while (my ($name, $info) = each %$res) {
2997 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998 my $data;
2999
3000 if ($info->{type} & 1) {
3001 # prepend meta info
3002
3003 my $meta = $enc->encode ({
3004 name => $name,
3005 %{ $info->{meta} || {} },
3006 });
3007
3008 $data = pack "(w/a*)*", $meta, $info->{data};
3009 } else {
3010 $data = $info->{data};
3011 }
3012
3013 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3014 cf::face::set_type $idx, $info->{type};
3015
3016 cf::cede_to_tick;
3017 }
3018
3019 if ($soundconf) {
3020 $soundconf = $enc->decode (delete $soundconf->{data});
3021
3022 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3023 my $sound = $soundconf->{compat}[$_]
3024 or next;
3025
3026 my $face = cf::face::find "sound/$sound->[1]";
3027 cf::sound::set $sound->[0] => $face;
3028 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3029 }
3030
3031 while (my ($k, $v) = each %{$soundconf->{event}}) {
3032 my $face = cf::face::find "sound/$v";
3033 cf::sound::set $k => $face;
3034 }
3035 }
3036 }
3037
2386 1 3038 1
2387} 3039}
2388 3040
3041register_exticmd fx_want => sub {
3042 my ($ns, $want) = @_;
3043
3044 while (my ($k, $v) = each %$want) {
3045 $ns->fx_want ($k, $v);
3046 }
3047};
3048
3049sub reload_regions {
3050 # HACK to clear player env face cache, we need some signal framework
3051 # for this (global event?)
3052 %ext::player_env::MUSIC_FACE_CACHE = ();
3053
3054 load_resource_file "$MAPDIR/regions"
3055 or die "unable to load regions file\n";
3056
3057 for (cf::region::list) {
3058 $_->{match} = qr/$_->{match}/
3059 if exists $_->{match};
3060 }
3061}
3062
2389sub reload_facedata { 3063sub reload_facedata {
2390 load_facedata sprintf "%s/facedata", cf::datadir 3064 load_facedata "$DATADIR/facedata"
2391 or die "unable to load facedata\n"; 3065 or die "unable to load facedata\n";
2392} 3066}
2393 3067
2394sub reload_regions {
2395 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2396 or die "unable to load regions file\n";
2397}
2398
2399sub reload_archetypes { 3068sub reload_archetypes {
2400 load_resource_file sprintf "%s/archetypes", cf::datadir 3069 load_resource_file "$DATADIR/archetypes"
2401 or die "unable to load archetypes\n"; 3070 or die "unable to load archetypes\n";
3071 #d# NEED to laod twice to resolve forward references
3072 # this really needs to be done in an extra post-pass
3073 # (which needs to be synchronous, so solve it differently)
3074 load_resource_file "$DATADIR/archetypes"
3075 or die "unable to load archetypes\n";
2402} 3076}
2403 3077
2404sub reload_treasures { 3078sub reload_treasures {
2405 load_resource_file sprintf "%s/treasures", cf::datadir 3079 load_resource_file "$DATADIR/treasures"
2406 or die "unable to load treasurelists\n"; 3080 or die "unable to load treasurelists\n";
2407} 3081}
2408 3082
2409sub reload_resources { 3083sub reload_resources {
2410 warn "reloading resource files...\n"; 3084 warn "reloading resource files...\n";
2411 3085
2412 reload_regions; 3086 reload_regions;
2413 reload_facedata; 3087 reload_facedata;
3088 #reload_archetypes;#d#
2414 reload_archetypes; 3089 reload_archetypes;
2415 reload_treasures; 3090 reload_treasures;
2416 3091
2417 warn "finished reloading resource files\n"; 3092 warn "finished reloading resource files\n";
2418} 3093}
2419 3094
2420sub init { 3095sub init {
2421 reload_resources; 3096 reload_resources;
2422} 3097}
2423 3098
2424sub cfg_load { 3099sub reload_config {
2425 open my $fh, "<:utf8", cf::confdir . "/config" 3100 open my $fh, "<:utf8", "$CONFDIR/config"
2426 or return; 3101 or return;
2427 3102
2428 local $/; 3103 local $/;
2429 *CFG = YAML::Syck::Load <$fh>; 3104 *CFG = YAML::Syck::Load <$fh>;
2430 3105
2449 (async { 3124 (async {
2450 Event::one_event; 3125 Event::one_event;
2451 })->prio (Coro::PRIO_MAX); 3126 })->prio (Coro::PRIO_MAX);
2452 }; 3127 };
2453 3128
2454 cfg_load; 3129 reload_config;
2455 db_init; 3130 db_init;
2456 load_extensions; 3131 load_extensions;
2457 3132
2458 $TICK_WATCHER->start; 3133 $TICK_WATCHER->start;
2459 Event::loop; 3134 Event::loop;
2475 }, 3150 },
2476 ); 3151 );
2477 } 3152 }
2478} 3153}
2479 3154
3155sub write_runtime {
3156 my $runtime = "$LOCALDIR/runtime";
3157
3158 # first touch the runtime file to show we are still running:
3159 # the fsync below can take a very very long time.
3160
3161 IO::AIO::aio_utime $runtime, undef, undef;
3162
3163 my $guard = cf::lock_acquire "write_runtime";
3164
3165 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3166 or return;
3167
3168 my $value = $cf::RUNTIME + 90 + 10;
3169 # 10 is the runtime save interval, for a monotonic clock
3170 # 60 allows for the watchdog to kill the server.
3171
3172 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3173 and return;
3174
3175 # always fsync - this file is important
3176 aio_fsync $fh
3177 and return;
3178
3179 # touch it again to show we are up-to-date
3180 aio_utime $fh, undef, undef;
3181
3182 close $fh
3183 or return;
3184
3185 aio_rename "$runtime~", $runtime
3186 and return;
3187
3188 warn "runtime file written.\n";
3189
3190 1
3191}
3192
2480sub emergency_save() { 3193sub emergency_save() {
2481 my $freeze_guard = cf::freeze_mainloop; 3194 my $freeze_guard = cf::freeze_mainloop;
2482 3195
2483 warn "enter emergency perl save\n"; 3196 warn "enter emergency perl save\n";
2484 3197
2559 %EXT_CORO = (); 3272 %EXT_CORO = ();
2560 3273
2561 warn "removing commands"; 3274 warn "removing commands";
2562 %COMMAND = (); 3275 %COMMAND = ();
2563 3276
2564 warn "removing ext commands"; 3277 warn "removing ext/exti commands";
2565 %EXTCMD = (); 3278 %EXTCMD = ();
3279 %EXTICMD = ();
2566 3280
2567 warn "unloading/nuking all extensions"; 3281 warn "unloading/nuking all extensions";
2568 for my $pkg (@EXTS) { 3282 for my $pkg (@EXTS) {
2569 warn "... unloading $pkg"; 3283 warn "... unloading $pkg";
2570 3284
2600 Symbol::delete_package "safe::$_" 3314 Symbol::delete_package "safe::$_"
2601 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3315 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2602 3316
2603 warn "unloading cf.pm \"a bit\""; 3317 warn "unloading cf.pm \"a bit\"";
2604 delete $INC{"cf.pm"}; 3318 delete $INC{"cf.pm"};
3319 delete $INC{"cf/pod.pm"};
2605 3320
2606 # don't, removes xs symbols, too, 3321 # don't, removes xs symbols, too,
2607 # and global variables created in xs 3322 # and global variables created in xs
2608 #Symbol::delete_package __PACKAGE__; 3323 #Symbol::delete_package __PACKAGE__;
2609 3324
2612 warn "reloading cf.pm"; 3327 warn "reloading cf.pm";
2613 require cf; 3328 require cf;
2614 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3329 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2615 3330
2616 warn "loading config and database again"; 3331 warn "loading config and database again";
2617 cf::cfg_load; 3332 cf::reload_config;
2618 3333
2619 warn "loading extensions"; 3334 warn "loading extensions";
2620 cf::load_extensions; 3335 cf::load_extensions;
2621 3336
2622 warn "reattaching attachments to objects/players"; 3337 warn "reattaching attachments to objects/players";
2687 my $signal = new Coro::Signal; 3402 my $signal = new Coro::Signal;
2688 push @WAIT_FOR_TICK_BEGIN, $signal; 3403 push @WAIT_FOR_TICK_BEGIN, $signal;
2689 $signal->wait; 3404 $signal->wait;
2690} 3405}
2691 3406
3407 my $min = 1e6;#d#
3408 my $avg = 10;
2692$TICK_WATCHER = Event->timer ( 3409$TICK_WATCHER = Event->timer (
2693 reentrant => 0, 3410 reentrant => 0,
2694 parked => 1, 3411 parked => 1,
2695 prio => 0, 3412 prio => 0,
2696 at => $NEXT_TICK || $TICK, 3413 at => $NEXT_TICK || $TICK,
2700 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3417 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2701 unless ++$bug_warning > 10; 3418 unless ++$bug_warning > 10;
2702 return; 3419 return;
2703 } 3420 }
2704 3421
2705 $NOW = Event::time; 3422 $NOW = $tick_start = Event::time;
2706 3423
2707 cf::server_tick; # one server iteration 3424 cf::server_tick; # one server iteration
3425
3426 0 && sync_job {#d#
3427 for(1..10) {
3428 my $t = Event::time;
3429 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3430 or die;
3431
3432 $map->width (50);
3433 $map->height (50);
3434 $map->alloc;
3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3436 my $t = Event::time - $t;
3437
3438 #next unless $t < 0.0013;#d#
3439 if ($t < $min) {
3440 $min = $t;
3441 }
3442 $avg = $avg * 0.99 + $t * 0.01;
3443 }
3444 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3445 exit 0;
3446 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3447 };
2708 3448
2709 $RUNTIME += $TICK; 3449 $RUNTIME += $TICK;
2710 $NEXT_TICK += $TICK; 3450 $NEXT_TICK += $TICK;
2711 3451
2712 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3452 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2718 } 3458 }
2719 3459
2720# my $AFTER = Event::time; 3460# my $AFTER = Event::time;
2721# warn $AFTER - $NOW;#d# 3461# warn $AFTER - $NOW;#d#
2722 3462
3463 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3464 $sig->send;
3465 }
3466 while (my $sig = shift @WAIT_FOR_TICK) {
3467 $sig->send;
3468 }
3469
3470 $NOW = Event::time;
3471
2723 # if we are delayed by four ticks or more, skip them all 3472 # if we are delayed by four ticks or more, skip them all
2724 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3473 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2725 3474
2726 $TICK_WATCHER->at ($NEXT_TICK); 3475 $TICK_WATCHER->at ($NEXT_TICK);
2727 $TICK_WATCHER->start; 3476 $TICK_WATCHER->start;
2728 3477
2729 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3478 $LOAD = ($NOW - $tick_start) / $TICK;
2730 $sig->send; 3479 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2731 }
2732 while (my $sig = shift @WAIT_FOR_TICK) {
2733 $sig->send;
2734 }
2735 3480
2736 _post_tick; 3481 _post_tick;
3482
3483
2737 }, 3484 },
2738); 3485);
2739 3486
2740{ 3487{
2741 BDB::max_poll_time $TICK * 0.1; 3488 BDB::max_poll_time $TICK * 0.1;
2769 3516
2770 cf::sync_job { 3517 cf::sync_job {
2771 eval { 3518 eval {
2772 BDB::db_env_open 3519 BDB::db_env_open
2773 $DB_ENV, 3520 $DB_ENV,
2774 $BDB_ENV_DIR, 3521 $BDBDIR,
2775 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3522 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2776 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3523 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2777 0666; 3524 0666;
2778 3525
2779 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3526 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2780 3527
2781 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3528 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2782 $DB_ENV->set_lk_detect; 3529 $DB_ENV->set_lk_detect;
2783 }; 3530 };
2784 3531
2800 prio => 6, 3547 prio => 6,
2801 cb => \&IO::AIO::poll_cb, 3548 cb => \&IO::AIO::poll_cb,
2802 ); 3549 );
2803} 3550}
2804 3551
3552my $_log_backtrace;
3553
3554sub _log_backtrace {
3555 my ($msg, @addr) = @_;
3556
3557 $msg =~ s/\n//;
3558
3559 # limit the # of concurrent backtraces
3560 if ($_log_backtrace < 2) {
3561 ++$_log_backtrace;
3562 async {
3563 my @bt = fork_call {
3564 @addr = map { sprintf "%x", $_ } @addr;
3565 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3566 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3567 or die "addr2line: $!";
3568
3569 my @funcs;
3570 my @res = <$fh>;
3571 chomp for @res;
3572 while (@res) {
3573 my ($func, $line) = splice @res, 0, 2, ();
3574 push @funcs, "[$func] $line";
3575 }
3576
3577 @funcs
3578 };
3579
3580 LOG llevInfo, "[ABT] $msg\n";
3581 LOG llevInfo, "[ABT] $_\n" for @bt;
3582 --$_log_backtrace;
3583 };
3584 } else {
3585 LOG llevInfo, "[ABT] $msg\n";
3586 LOG llevInfo, "[ABT] [suppressed]\n";
3587 }
3588}
3589
3590# load additional modules
3591use cf::pod;
3592
2805END { cf::emergency_save } 3593END { cf::emergency_save }
2806 3594
28071 35951
2808 3596

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines