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.277 by root, Sun Jun 10 04:24:50 2007 UTC vs.
Revision 1.444 by root, Mon Sep 8 11:27:25 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.61 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
49use Coro::Util ();
24 50
51use JSON::XS 2.01 ();
25use BDB (); 52use BDB ();
26use Data::Dumper; 53use Data::Dumper;
27use Digest::MD5; 54use Digest::MD5;
28use Fcntl; 55use Fcntl;
29use YAML::Syck (); 56use YAML ();
30use IO::AIO 2.32 (); 57use IO::AIO ();
31use Time::HiRes; 58use Time::HiRes;
32use Compress::LZF; 59use Compress::LZF;
60use Digest::MD5 ();
61
62AnyEvent::detect;
33 63
34# configure various modules to our taste 64# configure various modules to our taste
35# 65#
36$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 69
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 71
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 73
49our %COMMAND = (); 74our %COMMAND = ();
50our %COMMAND_TIME = (); 75our %COMMAND_TIME = ();
51 76
52our @EXTS = (); # list of extension package names 77our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 78our %EXTCMD = ();
79our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 80our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 81our %EXT_MAP = (); # pluggable maps
56 82
57our $RELOAD; # number of reloads so far 83our $RELOAD; # number of reloads so far
58our @EVENT; 84our @EVENT;
… …
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
71 98
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 101our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
79 103
104our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 106our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 107our $DB_ENV;
82 108
83our %CFG; 109our %CFG;
84 110
85our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 112our $RUNTIME;
113our $NOW;
87 114
88our %PLAYER; # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 116our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
91 118
92# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 121
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
98 126
99binmode STDOUT; 127binmode STDOUT;
100binmode STDERR; 128binmode STDERR;
101 129
102# read virtual server time, if available 130# read virtual server time, if available
… …
155 183
156The raw value load value from the last tick. 184The raw value load value from the last tick.
157 185
158=item %cf::CFG 186=item %cf::CFG
159 187
160Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 189from wherever your confdir points to.
162 190
163=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
164 192
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 193These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 194returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 195per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 196
197=item @cf::INVOKE_RESULTS
198
199This array contains the results of the last C<invoke ()> call. When
200C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
201that call.
202
169=back 203=back
170 204
171=cut 205=cut
172 206
173BEGIN { 207BEGIN {
… …
177 $msg .= "\n" 211 $msg .= "\n"
178 unless $msg =~ /\n$/; 212 unless $msg =~ /\n$/;
179 213
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 215
182 utf8::encode $msg;
183 LOG llevError, $msg; 216 LOG llevError, $msg;
184 }; 217 };
185} 218}
219
220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
186 234
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
197for my $pkg (qw( 245for my $pkg (qw(
198 cf::global cf::attachable 246 cf::global cf::attachable
199 cf::object cf::object::player 247 cf::object cf::object::player
200 cf::client cf::player 248 cf::client cf::player
201 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
202 cf::map cf::party cf::region 251 cf::party cf::region
203)) { 252)) {
204 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 254}
207 255
208$Event::DIED = sub { 256$EV::DIED = sub {
209 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
210}; 258};
259
260#############################################################################
211 261
212=head2 UTILITY FUNCTIONS 262=head2 UTILITY FUNCTIONS
213 263
214=over 4 264=over 4
215 265
… …
234 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 284 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
235 $d 285 $d
236 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
237} 287}
238 288
239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
240
241=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
242 290
243Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
244 292
245=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
246 294
247Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
296
297=cut
298
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300
301sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) }
248 303
249=item cf::lock_wait $string 304=item cf::lock_wait $string
250 305
251Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
252 307
… …
255Wait until the given lock is available and then acquires it and returns 310Wait until the given lock is available and then acquires it and returns
256a Coro::guard object. If the guard object gets destroyed (goes out of scope, 311a Coro::guard object. If the guard object gets destroyed (goes out of scope,
257for example when the coroutine gets canceled), the lock is automatically 312for example when the coroutine gets canceled), the lock is automatically
258returned. 313returned.
259 314
315Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro.
317
260Lock names should begin with a unique identifier (for example, cf::map::find 318Lock names should begin with a unique identifier (for example, cf::map::find
261uses map_find and cf::map::load uses map_load). 319uses map_find and cf::map::load uses map_load).
262 320
263=item $locked = cf::lock_active $string 321=item $locked = cf::lock_active $string
264 322
265Return true if the lock is currently active, i.e. somebody has locked it. 323Return true if the lock is currently active, i.e. somebody has locked it.
266 324
267=cut 325=cut
268 326
269our %LOCK; 327our %LOCK;
328our %LOCKER;#d#
270 329
271sub lock_wait($) { 330sub lock_wait($) {
272 my ($key) = @_; 331 my ($key) = @_;
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
273 337
274 # wait for lock, if any 338 # wait for lock, if any
275 while ($LOCK{$key}) { 339 while ($LOCK{$key}) {
276 push @{ $LOCK{$key} }, $Coro::current; 340 push @{ $LOCK{$key} }, $Coro::current;
277 Coro::schedule; 341 Coro::schedule;
… …
283 347
284 # wait, to be sure we are not locked 348 # wait, to be sure we are not locked
285 lock_wait $key; 349 lock_wait $key;
286 350
287 $LOCK{$key} = []; 351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
288 353
289 Coro::guard { 354 Coro::guard {
355 delete $LOCKER{$key};#d#
290 # wake up all waiters, to be on the safe side 356 # wake up all waiters, to be on the safe side
291 $_->ready for @{ delete $LOCK{$key} }; 357 $_->ready for @{ delete $LOCK{$key} };
292 } 358 }
293} 359}
294 360
… …
297 363
298 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
299} 365}
300 366
301sub freeze_mainloop { 367sub freeze_mainloop {
302 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
303 369
304 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
305 $TICK_WATCHER->start; 371}
372
373=item cf::periodic $interval, $cb
374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
386}
387
388=item cf::get_slot $time[, $priority[, $name]]
389
390Allocate $time seconds of blocking CPU time at priority C<$priority>:
391This call blocks and returns only when you have at least C<$time> seconds
392of cpu time till the next tick. The slot is only valid till the next cede.
393
394The optional C<$name> can be used to identify the job to run. It might be
395used for statistical purposes and should identify the same time-class.
396
397Useful for short background jobs.
398
399=cut
400
401our @SLOT_QUEUE;
402our $SLOT_QUEUE;
403
404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
408 my $signal = new Coro::Signal;
409
410 while () {
411 next_job:
412 my $avail = cf::till_tick;
413 if ($avail > 0.01) {
414 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) {
416 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send;
418 Coro::cede;
419 goto next_job;
420 }
421 }
422 }
423
424 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait;
428 } else {
429 Coro::schedule;
430 }
306 }; 431 }
307 $TICK_WATCHER->stop; 432};
308 $guard 433
434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
437 my ($time, $pri, $name) = @_;
438
439 $time = $TICK * .6 if $time > $TICK * .6;
440 my $sig = new Coro::Signal;
441
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready;
445 $sig->wait;
309} 446}
310 447
311=item cf::async { BLOCK } 448=item cf::async { BLOCK }
312 449
313Currently the same as Coro::async_pool, meaning you cannot use 450Currently the same as Coro::async_pool, meaning you cannot use
… …
318 455
319BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
320 457
321=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
322 459
323The design of crossfire+ requires that the main coro ($Coro::main) is 460The design of Deliantra requires that the main coroutine ($Coro::main)
324always able to handle events or runnable, as crossfire+ is only partly 461is always able to handle events or runnable, as Deliantra is only
325reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
463acceptable.
326 464
327If it must be done, put the blocking parts into C<sync_job>. This will run 465If it must be done, put the blocking parts into C<sync_job>. This will run
328the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
329server will be frozen during this time, so the block should either finish 467server will be frozen during this time, so the block should either finish
330fast or be very important. 468fast or be very important.
… …
333 471
334sub sync_job(&) { 472sub sync_job(&) {
335 my ($job) = @_; 473 my ($job) = @_;
336 474
337 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
338 my $time = Event::time; 476 my $time = EV::time;
339 477
340 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
341 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
342 480
343 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
344 # (but this is cancel-safe) 482
345 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
346 484
347 my $busy = 1; 485 my $busy = 1;
348 my @res; 486 my @res;
349 487
350 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
351 @res = eval { $job->() }; 490 @res = eval { $job->() };
352 warn $@ if $@; 491 warn $@ if $@;
353 undef $busy; 492 undef $busy;
354 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
355 494
356 while ($busy) { 495 while ($busy) {
357 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
358 } 500 }
501 }
359 502
360 $time = Event::time - $time; 503 my $time = EV::time - $time;
361 504
362 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364
365 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
366 506
367 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
368 } else { 508 } else {
369 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
370 510
… …
390 $EXT_CORO{$coro+0} = $coro; 530 $EXT_CORO{$coro+0} = $coro;
391 531
392 $coro 532 $coro
393} 533}
394 534
395sub write_runtime { 535=item fork_call { }, $args
396 my $runtime = "$LOCALDIR/runtime";
397 536
398 # first touch the runtime file to show we are still running: 537Executes the given code block with the given arguments in a seperate
399 # the fsync below can take a very very long time. 538process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling.
400 541
401 IO::AIO::aio_utime $runtime, undef, undef; 542=cut
402 543
403 my $guard = cf::lock_acquire "write_runtime"; 544sub fork_call(&@) {
545 my ($cb, @args) = @_;
404 546
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 547 # we seemingly have to make a local copy of the whole thing,
406 or return; 548 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious)
407 550
408 my $value = $cf::RUNTIME + 90 + 10; 551 my @res = Coro::Util::fork_eval {
409 # 10 is the runtime save interval, for a monotonic clock 552 reset_signals;
410 # 60 allows for the watchdog to kill the server. 553 &$cb
554 }, @args;
411 555
412 (aio_write $fh, 0, (length $value), $value, 0) <= 0 556 wantarray ? @res : $res[-1]
413 and return; 557}
414 558
415 # always fsync - this file is important 559=item $coin = coin_from_name $name
416 aio_fsync $fh
417 and return;
418 560
419 # touch it again to show we are up-to-date 561=cut
420 aio_utime $fh, undef, undef;
421 562
422 close $fh 563our %coin_alias = (
423 or return; 564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
424 579
425 aio_rename "$runtime~", $runtime 580sub coin_from_name($) {
426 and return; 581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
584}
427 585
428 warn "runtime file written.\n"; 586=item $value = cf::db_get $family => $key
429 587
588Returns a single value from the environment database.
589
590=item cf::db_put $family => $key => $value
591
592Stores the given C<$value> in the family. It can currently store binary
593data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
594
595=item $db = cf::db_table "name"
596
597Create and/or open a new database table. The string must not be "db" and must be unique
598within each server.
599
600=cut
601
602sub db_table($) {
603 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV;
605
606 eval {
607 $db->set_flags (BDB::CHKSUM);
608
609 utf8::encode $name;
610 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
611 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
612 cf::cleanup "db_open(db): $!" if $!;
613 };
614 cf::cleanup "db_open(db): $@" if $@;
615
616 $db
617}
618
619our $DB;
620
621sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db";
624 };
625}
626
627sub db_get($$) {
628 my $key = "$_[0]/$_[1]";
629
630 cf::sync_job {
631 BDB::db_get $DB, undef, $key, my $data;
632
633 $! ? ()
634 : $data
430 1 635 }
636}
637
638sub db_put($$$) {
639 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
641}
642
643=item cf::cache $id => [$paths...], $processversion => $process
644
645Generic caching function that returns the value of the resource $id,
646caching and regenerating as required.
647
648This function can block.
649
650=cut
651
652sub cache {
653 my ($id, $src, $processversion, $process) = @_;
654
655 my $meta =
656 join "\x00",
657 $processversion,
658 map {
659 aio_stat $_
660 and Carp::croak "$_: $!";
661
662 ($_, (stat _)[7,9])
663 } @$src;
664
665 my $dbmeta = db_get cache => "$id/meta";
666 if ($dbmeta ne $meta) {
667 # changed, we may need to process
668
669 my @data;
670 my $md5;
671
672 for (0 .. $#$src) {
673 0 <= aio_load $src->[$_], $data[$_]
674 or Carp::croak "$src->[$_]: $!";
675 }
676
677 # if processing is expensive, check
678 # checksum first
679 if (1) {
680 $md5 =
681 join "\x00",
682 $processversion,
683 map {
684 cf::cede_to_tick;
685 ($src->[$_], Digest::MD5::md5_hex $data[$_])
686 } 0.. $#$src;
687
688
689 my $dbmd5 = db_get cache => "$id/md5";
690 if ($dbmd5 eq $md5) {
691 db_put cache => "$id/meta", $meta;
692
693 return db_get cache => "$id/data";
694 }
695 }
696
697 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time;
700
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
702
703 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta;
706
707 return $data;
708 }
709
710 db_get cache => "$id/data"
431} 711}
432 712
433=item cf::datalog type => key => value, ... 713=item cf::datalog type => key => value, ...
434 714
435Log a datalog packet of the given type with the given key-value pairs. 715Log a datalog packet of the given type with the given key-value pairs.
… …
453attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
455 735
456In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
457C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
458crossfire+). 738Deliantra).
459 739
460=over 4 740=over 4
461 741
462=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
463 743
… …
665 _attach $registry, $klass, @attach; 945 _attach $registry, $klass, @attach;
666 } 946 }
667 947
668 $obj->{$name} = \%arg; 948 $obj->{$name} = \%arg;
669 } else { 949 } else {
670 warn "object uses attachment '$name' that is not available, postponing.\n"; 950 warn "object uses attachment '$name' which is not available, postponing.\n";
671 } 951 }
672 952
673 $obj->{_attachment}{$name} = undef; 953 $obj->{_attachment}{$name} = undef;
674} 954}
675 955
… …
715 "; 995 ";
716 die if $@; 996 die if $@;
717} 997}
718 998
719our $override; 999our $override;
720our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1000our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721 1001
722sub override { 1002sub override {
723 $override = 1; 1003 $override = 1;
724 @invoke_results = (); 1004 @INVOKE_RESULTS = (@_);
725} 1005}
726 1006
727sub do_invoke { 1007sub do_invoke {
728 my $event = shift; 1008 my $event = shift;
729 my $callbacks = shift; 1009 my $callbacks = shift;
730 1010
731 @invoke_results = (); 1011 @INVOKE_RESULTS = ();
732 1012
733 local $override; 1013 local $override;
734 1014
735 for (@$callbacks) { 1015 for (@$callbacks) {
736 eval { &{$_->[1]} }; 1016 eval { &{$_->[1]} };
… …
745 } 1025 }
746 1026
747 0 1027 0
748} 1028}
749 1029
750=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
751 1031
752=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
753 1033
754Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
755 1035
756This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1036This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
757removed in future versions), and there is no public API to access override 1037removed in future versions), and there is no public API to access override
758results (if you must, access C<@cf::invoke_results> directly). 1038results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 1039
760=back 1040=back
761 1041
762=cut 1042=cut
763 1043
764############################################################################# 1044#############################################################################
765# object support 1045# object support
1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
1080sub _can_merge {
1081 my ($ob1, $ob2) = @_;
1082
1083 ++$SLOW_MERGES;#d#
1084
1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
1087}
766 1088
767sub reattach { 1089sub reattach {
768 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 1091 my ($obj) = @_;
770 1092
1093 # no longer needed after getting rid of delete_package?
771 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
772 1095
773 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
774 1097
775 @$registry = (); 1098 @$registry = ();
776 1099
… …
791cf::attachable->attach ( 1114cf::attachable->attach (
792 prio => -1000000, 1115 prio => -1000000,
793 on_instantiate => sub { 1116 on_instantiate => sub {
794 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
795 1118
796 $data = from_json $data; 1119 $data = decode_json $data;
797 1120
798 for (@$data) { 1121 for (@$data) {
799 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
800 1123
801 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
… …
817sub object_freezer_save { 1140sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
819 1142
820 sync_job { 1143 sync_job {
821 if (length $$rdata) { 1144 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename);
822 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
824 1148
825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
826 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
827 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
828 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
829 close $fh; 1153 aio_close $fh;
830 1154
831 if (@$objs) { 1155 if (@$objs) {
832 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
833 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
834 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
835 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
836 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
837 close $fh; 1161 aio_close $fh;
838 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
839 } 1163 }
840 } else { 1164 } else {
841 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
842 } 1166 }
… …
847 } 1171 }
848 } else { 1172 } else {
849 aio_unlink $filename; 1173 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1174 aio_unlink "$filename.pst";
851 } 1175 }
852 } 1176 };
853} 1177}
854 1178
855sub object_freezer_as_string { 1179sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1180 my ($rdata, $objs) = @_;
857 1181
… …
869 or return; 1193 or return;
870 1194
871 unless (aio_stat "$filename.pst") { 1195 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1196 (aio_load "$filename.pst", $av) >= 0
873 or return; 1197 or return;
1198
874 $av = eval { (Storable::thaw $av)->{objs} }; 1199 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs};
875 } 1201 }
876 1202
1203 utf8::decode (my $decname = $filename);
877 warn sprintf "loading %s (%d)\n", 1204 warn sprintf "loading %s (%d,%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1205 $decname, length $data, scalar @{$av || []};
1206
879 return ($data, $av); 1207 ($data, $av)
880} 1208}
1209
1210=head2 COMMAND CALLBACKS
1211
1212=over 4
1213
1214=cut
881 1215
882############################################################################# 1216#############################################################################
883# command handling &c 1217# command handling &c
884 1218
885=item cf::register_command $name => \&callback($ob,$args); 1219=item cf::register_command $name => \&callback($ob,$args);
… …
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1232 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1233}
900 1234
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1235=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1236
903Register a callbackf ro execution when the client sends an extcmd packet. 1237Register a callback for execution when the client sends an (synchronous)
1238extcmd packet. Ext commands will be processed in the order they are
1239received by the server, like other user commands. The first argument is
1240the logged-in player. Ext commands can only be processed after a player
1241has logged in successfully.
904 1242
905If the callback returns something, it is sent back as if reply was being 1243If the callback returns something, it is sent back as if reply was being
906called. 1244called.
907 1245
1246=item cf::register_exticmd $name => \&callback($ns,$packet);
1247
1248Register a callback for execution when the client sends an (asynchronous)
1249exticmd packet. Exti commands are processed by the server as soon as they
1250are received, i.e. out of order w.r.t. other commands. The first argument
1251is a client socket. Exti commands can be received anytime, even before
1252log-in.
1253
1254If the callback returns something, it is sent back as if reply was being
1255called.
1256
908=cut 1257=cut
909 1258
910sub register_extcmd { 1259sub register_extcmd {
911 my ($name, $cb) = @_; 1260 my ($name, $cb) = @_;
912 1261
913 $EXTCMD{$name} = $cb; 1262 $EXTCMD{$name} = $cb;
1263}
1264
1265sub register_exticmd {
1266 my ($name, $cb) = @_;
1267
1268 $EXTICMD{$name} = $cb;
914} 1269}
915 1270
916cf::player->attach ( 1271cf::player->attach (
917 on_command => sub { 1272 on_command => sub {
918 my ($pl, $name, $params) = @_; 1273 my ($pl, $name, $params) = @_;
… …
927 cf::override; 1282 cf::override;
928 }, 1283 },
929 on_extcmd => sub { 1284 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1285 my ($pl, $buf) = @_;
931 1286
932 my $msg = eval { from_json $buf }; 1287 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1288
934 if (ref $msg) { 1289 if (ref $msg) {
1290 my ($type, $reply, @payload) =
1291 "ARRAY" eq ref $msg
1292 ? @$msg
1293 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1294
1295 my @reply;
1296
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1297 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1298 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1299 }
1300
1301 $pl->ext_reply ($reply, @reply)
1302 if $reply;
1303
940 } else { 1304 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1305 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1306 }
943 1307
944 cf::override; 1308 cf::override;
945 }, 1309 },
946); 1310);
947 1311
948sub load_extension {
949 my ($path) = @_;
950
951 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
952 my $base = $1;
953 my $pkg = $1;
954 $pkg =~ s/[^[:word:]]/_/g;
955 $pkg = "ext::$pkg";
956
957 warn "... loading '$path' into '$pkg'\n";
958
959 open my $fh, "<:utf8", $path
960 or die "$path: $!";
961
962 my $source =
963 "package $pkg; use strict; use utf8;\n"
964 . "#line 1 \"$path\"\n{\n"
965 . (do { local $/; <$fh> })
966 . "\n};\n1";
967
968 unless (eval $source) {
969 my $msg = $@ ? "$path: $@\n"
970 : "extension disabled.\n";
971 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
972 warn $@;
973 warn "mandatory extension failed to load, exiting.\n";
974 exit 1;
975 }
976 die $@;
977 }
978
979 push @EXTS, $pkg;
980}
981
982sub load_extensions { 1312sub load_extensions {
1313 cf::sync_job {
1314 my %todo;
1315
983 for my $ext (<$LIBDIR/*.ext>) { 1316 for my $path (<$LIBDIR/*.ext>) {
984 next unless -r $ext; 1317 next unless -r $path;
985 eval { 1318
986 load_extension $ext; 1319 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1320 my $base = $1;
1321 my $pkg = $1;
1322 $pkg =~ s/[^[:word:]]/_/g;
1323 $pkg = "ext::$pkg";
1324
1325 open my $fh, "<:utf8", $path
1326 or die "$path: $!";
1327
1328 my $source = do { local $/; <$fh> };
1329
1330 my %ext = (
1331 path => $path,
1332 base => $base,
1333 pkg => $pkg,
1334 );
1335
1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1338
1339 $ext{source} =
1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1341 . "#line 1 \"$path\"\n{\n"
1342 . $source
1343 . "\n};\n1";
1344
1345 $todo{$base} = \%ext;
1346 }
1347
1348 my %done;
1349 while (%todo) {
1350 my $progress;
1351
1352 while (my ($k, $v) = each %todo) {
1353 for (split /,\s*/, $v->{meta}{depends}) {
1354 goto skip
1355 unless exists $done{$_};
1356 }
1357
1358 warn "... loading '$k' into '$v->{pkg}'\n";
1359
1360 unless (eval $v->{source}) {
1361 my $msg = $@ ? "$v->{path}: $@\n"
1362 : "$v->{base}: extension inactive.\n";
1363
1364 if (exists $v->{meta}{mandatory}) {
1365 warn $msg;
1366 cf::cleanup "mandatory extension failed to load, exiting.";
1367 }
1368
1369 warn $msg;
1370 }
1371
1372 $done{$k} = delete $todo{$k};
1373 push @EXTS, $v->{pkg};
1374 $progress = 1;
987 1 1375 }
988 } or warn "$ext not loaded: $@"; 1376
1377 skip:
1378 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1379 unless $progress;
1380 }
989 } 1381 };
990} 1382}
991 1383
992############################################################################# 1384#############################################################################
993 1385
1386=back
1387
994=head2 CORE EXTENSIONS 1388=head2 CORE EXTENSIONS
995 1389
996Functions and methods that extend core crossfire objects. 1390Functions and methods that extend core crossfire objects.
997 1391
998=cut 1392=cut
… …
1002use Coro::AIO; 1396use Coro::AIO;
1003 1397
1004=head3 cf::player 1398=head3 cf::player
1005 1399
1006=over 4 1400=over 4
1401
1402=item cf::player::num_playing
1403
1404Returns the official number of playing players, as per the Crossfire metaserver rules.
1405
1406=cut
1407
1408sub num_playing {
1409 scalar grep
1410 $_->ob->map
1411 && !$_->hidden
1412 && !$_->ob->flag (cf::FLAG_WIZ),
1413 cf::player::list
1414}
1007 1415
1008=item cf::player::find $login 1416=item cf::player::find $login
1009 1417
1010Returns the given player object, loading it if necessary (might block). 1418Returns the given player object, loading it if necessary (might block).
1011 1419
… …
1047 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1455 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1048 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1456 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1049 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1457 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1050 aio_unlink +(playerdir $login) . "/$login.pl"; 1458 aio_unlink +(playerdir $login) . "/$login.pl";
1051 1459
1052 my $pl = load_pl path $login 1460 my $f = new_from_file cf::object::thawer path $login
1053 or return; 1461 or return;
1462
1463 my $pl = cf::player::load_pl $f
1464 or return;
1465
1466 local $cf::PLAYER_LOADING{$login} = $pl;
1467 $f->resolve_delayed_derefs;
1054 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1055 } 1469 }
1056 } 1470 }
1057} 1471}
1058 1472
… …
1067 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1068 1482
1069 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1070 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1071 1485
1486 cf::get_slot 0.01;
1487
1072 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1073 Coro::cede; 1489 cf::cede_to_tick;
1074} 1490}
1075 1491
1076sub new($) { 1492sub new($) {
1077 my ($login) = @_; 1493 my ($login) = @_;
1078 1494
… …
1084 $cf::PLAYER{$login} = $self; 1500 $cf::PLAYER{$login} = $self;
1085 1501
1086 $self 1502 $self
1087} 1503}
1088 1504
1505=item $player->send_msg ($channel, $msg, $color, [extra...])
1506
1507=cut
1508
1509sub send_msg {
1510 my $ns = shift->ns
1511 or return;
1512 $ns->send_msg (@_);
1513}
1514
1089=item $pl->quit_character 1515=item $pl->quit_character
1090 1516
1091Nukes the player without looking back. If logged in, the connection will 1517Nukes the player without looking back. If logged in, the connection will
1092be destroyed. May block for a long time. 1518be destroyed. May block for a long time.
1093 1519
… …
1097 my ($pl) = @_; 1523 my ($pl) = @_;
1098 1524
1099 my $name = $pl->ob->name; 1525 my $name = $pl->ob->name;
1100 1526
1101 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1102 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1103 1529
1104 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1105 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1106 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1107 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1108 1536
1109 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1110 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1146 or return []; 1574 or return [];
1147 1575
1148 my @logins; 1576 my @logins;
1149 1577
1150 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1579 my $path = path $login;
1580
1581 # a .pst is a dead give-away for a valid player
1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1151 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1152 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1153 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1587 }
1154 1588
1155 utf8::decode $login; 1589 utf8::decode $login;
1156 push @logins, $login; 1590 push @logins, $login;
1157 } 1591 }
1158 1592
… …
1185 } 1619 }
1186 1620
1187 \@paths 1621 \@paths
1188} 1622}
1189 1623
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1625
1626Expand crossfire pod fragments into protocol xml.
1627
1190=item $player->ext_reply ($msgid, %msg) 1628=item $player->ext_reply ($msgid, @msg)
1191 1629
1192Sends an ext reply to the player. 1630Sends an ext reply to the player.
1193 1631
1194=cut 1632=cut
1195 1633
1196sub ext_reply($$%) { 1634sub ext_reply($$@) {
1197 my ($self, $id, %msg) = @_; 1635 my ($self, $id, @msg) = @_;
1198 1636
1199 $msg{msgid} = $id; 1637 $self->ns->ext_reply ($id, @msg)
1200
1201 $self->send ("ext " . cf::to_json \%msg);
1202} 1638}
1203 1639
1204=item $player->ext_event ($type, %msg) 1640=item $player->ext_msg ($type, @msg)
1205 1641
1206Sends an ext event to the client. 1642Sends an ext event to the client.
1207 1643
1208=cut 1644=cut
1209 1645
1210sub ext_event($$%) { 1646sub ext_msg($$@) {
1211 my ($self, $type, %msg) = @_; 1647 my ($self, $type, @msg) = @_;
1212 1648
1213 $self->ns->ext_event ($type, %msg); 1649 $self->ns->ext_msg ($type, @msg);
1214} 1650}
1215 1651
1216=head3 cf::region 1652=head3 cf::region
1217 1653
1218=over 4 1654=over 4
… …
1221 1657
1222package cf::region; 1658package cf::region;
1223 1659
1224=item cf::region::find_by_path $path 1660=item cf::region::find_by_path $path
1225 1661
1226Tries to decuce the probable region for a map knowing only its path. 1662Tries to decuce the likely region for a map knowing only its path.
1227 1663
1228=cut 1664=cut
1229 1665
1230sub find_by_path($) { 1666sub find_by_path($) {
1231 my ($path) = @_; 1667 my ($path) = @_;
1232 1668
1233 my ($match, $specificity); 1669 my ($match, $specificity);
1234 1670
1235 for my $region (list) { 1671 for my $region (list) {
1236 if ($region->match && $path =~ $region->match) { 1672 if ($region->{match} && $path =~ $region->{match}) {
1237 ($match, $specificity) = ($region, $region->specificity) 1673 ($match, $specificity) = ($region, $region->specificity)
1238 if $region->specificity > $specificity; 1674 if $region->specificity > $specificity;
1239 } 1675 }
1240 } 1676 }
1241 1677
… …
1262our $MAX_RESET = 3600; 1698our $MAX_RESET = 3600;
1263our $DEFAULT_RESET = 3000; 1699our $DEFAULT_RESET = 3000;
1264 1700
1265sub generate_random_map { 1701sub generate_random_map {
1266 my ($self, $rmp) = @_; 1702 my ($self, $rmp) = @_;
1703
1704 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1705
1267 # mit "rum" bekleckern, nicht 1706 # mit "rum" bekleckern, nicht
1268 $self->_create_random_map ( 1707 $self->_create_random_map (
1269 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1708 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1270 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1709 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1271 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1710 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1361 $self->init; # pass $1 etc. 1800 $self->init; # pass $1 etc.
1362 return $self; 1801 return $self;
1363 } 1802 }
1364 } 1803 }
1365 1804
1366 Carp::carp "unable to resolve path '$path' (base '$base')."; 1805 Carp::cluck "unable to resolve path '$path' (base '$base').";
1367 () 1806 ()
1368} 1807}
1369 1808
1370sub init { 1809sub init {
1371 my ($self) = @_; 1810 my ($self) = @_;
… …
1393 1832
1394# the temporary/swap location 1833# the temporary/swap location
1395sub save_path { 1834sub save_path {
1396 my ($self) = @_; 1835 my ($self) = @_;
1397 1836
1398 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1837 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1399 "$TMPDIR/$path.map" 1838 "$TMPDIR/$path.map"
1400} 1839}
1401 1840
1402# the unique path, undef == no special unique path 1841# the unique path, undef == no special unique path
1403sub uniq_path { 1842sub uniq_path {
1404 my ($self) = @_; 1843 my ($self) = @_;
1405 1844
1406 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1845 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1407 "$UNIQUEDIR/$path" 1846 "$UNIQUEDIR/$path"
1408} 1847}
1409 1848
1410# and all this just because we cannot iterate over 1849# and all this just because we cannot iterate over
1411# all maps in C++... 1850# all maps in C++...
… …
1434 1873
1435sub load_header_from($) { 1874sub load_header_from($) {
1436 my ($self, $path) = @_; 1875 my ($self, $path) = @_;
1437 1876
1438 utf8::encode $path; 1877 utf8::encode $path;
1439 #aio_open $path, O_RDONLY, 0 1878 my $f = new_from_file cf::object::thawer $path
1440 # or return;
1441
1442 $self->_load_header ($path)
1443 or return; 1879 or return;
1880
1881 $self->_load_header ($f)
1882 or return;
1883
1884 local $MAP_LOADING{$self->{path}} = $self;
1885 $f->resolve_delayed_derefs;
1444 1886
1445 $self->{load_path} = $path; 1887 $self->{load_path} = $path;
1446 1888
1447 1 1889 1
1448} 1890}
… …
1502sub find { 1944sub find {
1503 my ($path, $origin) = @_; 1945 my ($path, $origin) = @_;
1504 1946
1505 $path = normalise $path, $origin && $origin->path; 1947 $path = normalise $path, $origin && $origin->path;
1506 1948
1949 cf::lock_wait "map_data:$path";#d#remove
1507 cf::lock_wait "map_find:$path"; 1950 cf::lock_wait "map_find:$path";
1508 1951
1509 $cf::MAP{$path} || do { 1952 $cf::MAP{$path} || do {
1953 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1510 my $guard = cf::lock_acquire "map_find:$path"; 1954 my $guard2 = cf::lock_acquire "map_find:$path";
1955
1511 my $map = new_from_path cf::map $path 1956 my $map = new_from_path cf::map $path
1512 or return; 1957 or return;
1513 1958
1514 $map->{last_save} = $cf::RUNTIME; 1959 $map->{last_save} = $cf::RUNTIME;
1515 1960
… …
1517 or return; 1962 or return;
1518 1963
1519 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1964 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1520 # doing this can freeze the server in a sync job, obviously 1965 # doing this can freeze the server in a sync job, obviously
1521 #$cf::WAIT_FOR_TICK->wait; 1966 #$cf::WAIT_FOR_TICK->wait;
1967 undef $guard2;
1968 undef $guard1;
1522 $map->reset; 1969 $map->reset;
1523 undef $guard;
1524 return find $path; 1970 return find $path;
1525 } 1971 }
1526 1972
1527 $cf::MAP{$path} = $map 1973 $cf::MAP{$path} = $map
1528 } 1974 }
… …
1537 local $self->{deny_reset} = 1; # loading can take a long time 1983 local $self->{deny_reset} = 1; # loading can take a long time
1538 1984
1539 my $path = $self->{path}; 1985 my $path = $self->{path};
1540 1986
1541 { 1987 {
1542 my $guard = cf::lock_acquire "map_load:$path"; 1988 my $guard = cf::lock_acquire "map_data:$path";
1543 1989
1990 return unless $self->valid;
1544 return if $self->in_memory != cf::MAP_SWAPPED; 1991 return unless $self->in_memory == cf::MAP_SWAPPED;
1545 1992
1546 $self->in_memory (cf::MAP_LOADING); 1993 $self->in_memory (cf::MAP_LOADING);
1547 1994
1548 $self->alloc; 1995 $self->alloc;
1549 1996
1550 $self->pre_load; 1997 $self->pre_load;
1551 Coro::cede; 1998 cf::cede_to_tick;
1552 1999
2000 my $f = new_from_file cf::object::thawer $self->{load_path};
2001 $f->skip_block;
1553 $self->_load_objects ($self->{load_path}, 1) 2002 $self->_load_objects ($f)
1554 or return; 2003 or return;
1555 2004
1556 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2005 $self->post_load_original
1557 if delete $self->{load_original}; 2006 if delete $self->{load_original};
1558 2007
1559 if (my $uniq = $self->uniq_path) { 2008 if (my $uniq = $self->uniq_path) {
1560 utf8::encode $uniq; 2009 utf8::encode $uniq;
1561 if (aio_open $uniq, O_RDONLY, 0) { 2010 unless (aio_stat $uniq) {
2011 if (my $f = new_from_file cf::object::thawer $uniq) {
1562 $self->clear_unique_items; 2012 $self->clear_unique_items;
1563 $self->_load_objects ($uniq, 0); 2013 $self->_load_objects ($f);
2014 $f->resolve_delayed_derefs;
2015 }
1564 } 2016 }
1565 } 2017 }
1566 2018
1567 Coro::cede; 2019 $f->resolve_delayed_derefs;
2020
2021 cf::cede_to_tick;
1568 # now do the right thing for maps 2022 # now do the right thing for maps
1569 $self->link_multipart_objects; 2023 $self->link_multipart_objects;
1570 $self->difficulty ($self->estimate_difficulty) 2024 $self->difficulty ($self->estimate_difficulty)
1571 unless $self->difficulty; 2025 unless $self->difficulty;
1572 Coro::cede; 2026 cf::cede_to_tick;
1573 2027
1574 unless ($self->{deny_activate}) { 2028 unless ($self->{deny_activate}) {
1575 $self->decay_objects; 2029 $self->decay_objects;
1576 $self->fix_auto_apply; 2030 $self->fix_auto_apply;
1577 $self->update_buttons; 2031 $self->update_buttons;
1578 Coro::cede; 2032 cf::cede_to_tick;
1579 $self->set_darkness_map; 2033 $self->set_darkness_map;
1580 Coro::cede; 2034 cf::cede_to_tick;
1581 $self->activate; 2035 $self->activate;
1582 } 2036 }
1583 2037
2038 $self->{last_save} = $cf::RUNTIME;
2039 $self->last_access ($cf::RUNTIME);
2040
1584 $self->in_memory (cf::MAP_IN_MEMORY); 2041 $self->in_memory (cf::MAP_ACTIVE);
1585 } 2042 }
1586 2043
1587 $self->post_load; 2044 $self->post_load;
1588} 2045}
1589 2046
… …
1598 2055
1599 $self 2056 $self
1600} 2057}
1601 2058
1602# find and load all maps in the 3x3 area around a map 2059# find and load all maps in the 3x3 area around a map
1603sub load_diag { 2060sub load_neighbours {
1604 my ($map) = @_; 2061 my ($map) = @_;
1605 2062
1606 my @diag; # diagonal neighbours 2063 my @neigh; # diagonal neighbours
1607 2064
1608 for (0 .. 3) { 2065 for (0 .. 3) {
1609 my $neigh = $map->tile_path ($_) 2066 my $neigh = $map->tile_path ($_)
1610 or next; 2067 or next;
1611 $neigh = find $neigh, $map 2068 $neigh = find $neigh, $map
1612 or next; 2069 or next;
1613 $neigh->load; 2070 $neigh->load;
1614 2071
2072 push @neigh,
1615 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2073 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1616 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2074 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1617 } 2075 }
1618 2076
1619 for (@diag) { 2077 for (grep defined $_->[0], @neigh) {
2078 my ($path, $origin) = @$_;
1620 my $neigh = find @$_ 2079 my $neigh = find $path, $origin
1621 or next; 2080 or next;
1622 $neigh->load; 2081 $neigh->load;
1623 } 2082 }
1624} 2083}
1625 2084
… …
1630} 2089}
1631 2090
1632sub do_load_sync { 2091sub do_load_sync {
1633 my ($map) = @_; 2092 my ($map) = @_;
1634 2093
2094 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2095 if $Coro::current == $Coro::main;
2096
1635 cf::sync_job { $map->load }; 2097 cf::sync_job { $map->load };
1636} 2098}
1637 2099
1638our %MAP_PREFETCH; 2100our %MAP_PREFETCH;
1639our $MAP_PREFETCHER = undef; 2101our $MAP_PREFETCHER = undef;
1640 2102
1641sub find_async { 2103sub find_async {
1642 my ($path, $origin) = @_; 2104 my ($path, $origin, $load) = @_;
1643 2105
1644 $path = normalise $path, $origin && $origin->{path}; 2106 $path = normalise $path, $origin && $origin->{path};
1645 2107
1646 if (my $map = $cf::MAP{$path}) { 2108 if (my $map = $cf::MAP{$path}) {
1647 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2109 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1648 } 2110 }
1649 2111
1650 undef $MAP_PREFETCH{$path}; 2112 $MAP_PREFETCH{$path} |= $load;
2113
1651 $MAP_PREFETCHER ||= cf::async { 2114 $MAP_PREFETCHER ||= cf::async {
2115 $Coro::current->{desc} = "map prefetcher";
2116
1652 while (%MAP_PREFETCH) { 2117 while (%MAP_PREFETCH) {
1653 for my $path (keys %MAP_PREFETCH) { 2118 while (my ($k, $v) = each %MAP_PREFETCH) {
1654 my $map = find $path 2119 if (my $map = find $k) {
1655 or next;
1656 $map->load; 2120 $map->load if $v;
2121 }
1657 2122
1658 delete $MAP_PREFETCH{$path}; 2123 delete $MAP_PREFETCH{$k};
1659 } 2124 }
1660 } 2125 }
1661 undef $MAP_PREFETCHER; 2126 undef $MAP_PREFETCHER;
1662 }; 2127 };
1663 $MAP_PREFETCHER->prio (6); 2128 $MAP_PREFETCHER->prio (6);
… …
1666} 2131}
1667 2132
1668sub save { 2133sub save {
1669 my ($self) = @_; 2134 my ($self) = @_;
1670 2135
1671 my $lock = cf::lock_acquire "map_data:" . $self->path; 2136 my $lock = cf::lock_acquire "map_data:$self->{path}";
1672 2137
1673 $self->{last_save} = $cf::RUNTIME; 2138 $self->{last_save} = $cf::RUNTIME;
1674 2139
1675 return unless $self->dirty; 2140 return unless $self->dirty;
1676 2141
… …
1682 return if $self->{deny_save}; 2147 return if $self->{deny_save};
1683 2148
1684 local $self->{last_access} = $self->last_access;#d# 2149 local $self->{last_access} = $self->last_access;#d#
1685 2150
1686 cf::async { 2151 cf::async {
2152 $Coro::current->{desc} = "map player save";
1687 $_->contr->save for $self->players; 2153 $_->contr->save for $self->players;
1688 }; 2154 };
2155
2156 cf::get_slot 0.02;
1689 2157
1690 if ($uniq) { 2158 if ($uniq) {
1691 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2159 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1692 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2160 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1693 } else { 2161 } else {
… …
1699 my ($self) = @_; 2167 my ($self) = @_;
1700 2168
1701 # save first because save cedes 2169 # save first because save cedes
1702 $self->save; 2170 $self->save;
1703 2171
1704 my $lock = cf::lock_acquire "map_data:" . $self->path; 2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
1705 2173
1706 return if $self->players; 2174 return if $self->players;
1707 return if $self->in_memory != cf::MAP_IN_MEMORY; 2175 return if $self->in_memory != cf::MAP_ACTIVE;
1708 return if $self->{deny_save}; 2176 return if $self->{deny_save};
1709 2177
2178 $self->in_memory (cf::MAP_SWAPPED);
2179
2180 $self->deactivate;
2181 $_->clear_links_to ($self) for values %cf::MAP;
1710 $self->clear; 2182 $self->clear;
1711 $self->in_memory (cf::MAP_SWAPPED);
1712} 2183}
1713 2184
1714sub reset_at { 2185sub reset_at {
1715 my ($self) = @_; 2186 my ($self) = @_;
1716 2187
… …
1748 if $uniq; 2219 if $uniq;
1749 } 2220 }
1750 2221
1751 delete $cf::MAP{$self->path}; 2222 delete $cf::MAP{$self->path};
1752 2223
2224 $self->deactivate;
2225 $_->clear_links_to ($self) for values %cf::MAP;
1753 $self->clear; 2226 $self->clear;
1754
1755 $_->clear_links_to ($self) for values %cf::MAP;
1756 2227
1757 $self->unlink_save; 2228 $self->unlink_save;
1758 $self->destroy; 2229 $self->destroy;
1759} 2230}
1760 2231
1761my $nuke_counter = "aaaa"; 2232my $nuke_counter = "aaaa";
1762 2233
1763sub nuke { 2234sub nuke {
1764 my ($self) = @_; 2235 my ($self) = @_;
1765 2236
2237 {
2238 my $lock = cf::lock_acquire "map_data:$self->{path}";
2239
1766 delete $cf::MAP{$self->path}; 2240 delete $cf::MAP{$self->path};
1767 2241
1768 $self->unlink_save; 2242 $self->unlink_save;
1769 2243
1770 bless $self, "cf::map"; 2244 bless $self, "cf::map";
1771 delete $self->{deny_reset}; 2245 delete $self->{deny_reset};
1772 $self->{deny_save} = 1; 2246 $self->{deny_save} = 1;
1773 $self->reset_timeout (1); 2247 $self->reset_timeout (1);
1774 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2248 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1775 2249
1776 $cf::MAP{$self->path} = $self; 2250 $cf::MAP{$self->path} = $self;
2251 }
1777 2252
1778 $self->reset; # polite request, might not happen 2253 $self->reset; # polite request, might not happen
1779} 2254}
1780 2255
1781=item $maps = cf::map::tmp_maps 2256=item $maps = cf::map::tmp_maps
… …
1823 2298
1824sub unique_maps() { 2299sub unique_maps() {
1825 [ 2300 [
1826 map { 2301 map {
1827 utf8::decode $_; 2302 utf8::decode $_;
1828 /\.map$/ 2303 s/\.map$//; # TODO future compatibility hack
2304 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2305 ? ()
1829 ? normalise $_ 2306 : normalise $_
1830 : ()
1831 } @{ aio_readdir $UNIQUEDIR or [] } 2307 } @{ aio_readdir $UNIQUEDIR or [] }
1832 ] 2308 ]
1833} 2309}
1834 2310
1835package cf;
1836
1837=back 2311=back
1838 2312
1839=head3 cf::object 2313=head3 cf::object
1840 2314
1841=cut 2315=cut
… …
1844 2318
1845=over 4 2319=over 4
1846 2320
1847=item $ob->inv_recursive 2321=item $ob->inv_recursive
1848 2322
1849Returns the inventory of the object _and_ their inventories, recursively. 2323Returns the inventory of the object I<and> their inventories, recursively,
2324but I<not> the object itself.
1850 2325
1851=cut 2326=cut
1852 2327
1853sub inv_recursive_; 2328sub inv_recursive_;
1854sub inv_recursive_ { 2329sub inv_recursive_ {
… …
1857 2332
1858sub inv_recursive { 2333sub inv_recursive {
1859 inv_recursive_ inv $_[0] 2334 inv_recursive_ inv $_[0]
1860} 2335}
1861 2336
2337=item $ref = $ob->ref
2338
2339Creates and returns a persistent reference to an object that can be stored as a string.
2340
2341=item $ob = cf::object::deref ($refstring)
2342
2343returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2344even if the object actually exists. May block.
2345
2346=cut
2347
2348sub deref {
2349 my ($ref) = @_;
2350
2351 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2352 my ($uuid, $name) = ($1, $2);
2353 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2354 or return;
2355 $pl->ob->uuid eq $uuid
2356 or return;
2357
2358 $pl->ob
2359 } else {
2360 warn "$ref: cannot resolve object reference\n";
2361 undef
2362 }
2363}
2364
1862package cf; 2365package cf;
1863 2366
1864=back 2367=back
1865 2368
1866=head3 cf::object::player 2369=head3 cf::object::player
… …
1872Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2375Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
1873can be C<undef>. Does the right thing when the player is currently in a 2376can be C<undef>. Does the right thing when the player is currently in a
1874dialogue with the given NPC character. 2377dialogue with the given NPC character.
1875 2378
1876=cut 2379=cut
2380
2381our $SAY_CHANNEL = {
2382 id => "say",
2383 title => "Map",
2384 reply => "say ",
2385 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2386};
2387
2388our $CHAT_CHANNEL = {
2389 id => "chat",
2390 title => "Chat",
2391 reply => "chat ",
2392 tooltip => "Player chat and shouts, global to the server.",
2393};
1877 2394
1878# rough implementation of a future "reply" method that works 2395# rough implementation of a future "reply" method that works
1879# with dialog boxes. 2396# with dialog boxes.
1880#TODO: the first argument must go, split into a $npc->reply_to ( method 2397#TODO: the first argument must go, split into a $npc->reply_to ( method
1881sub cf::object::player::reply($$$;$) { 2398sub cf::object::player::reply($$$;$) {
… …
1883 2400
1884 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2401 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1885 2402
1886 if ($self->{record_replies}) { 2403 if ($self->{record_replies}) {
1887 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2404 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2405
1888 } else { 2406 } else {
2407 my $pl = $self->contr;
2408
2409 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2410 my $dialog = $pl->{npc_dialog};
2411 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2412
2413 } else {
1889 $msg = $npc->name . " says: $msg" if $npc; 2414 $msg = $npc->name . " says: $msg" if $npc;
1890 $self->message ($msg, $flags); 2415 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2416 }
1891 } 2417 }
2418}
2419
2420=item $object->send_msg ($channel, $msg, $color, [extra...])
2421
2422=cut
2423
2424sub cf::object::send_msg {
2425 my $pl = shift->contr
2426 or return;
2427 $pl->send_msg (@_);
1892} 2428}
1893 2429
1894=item $player_object->may ("access") 2430=item $player_object->may ("access")
1895 2431
1896Returns wether the given player is authorized to access resource "access" 2432Returns wether the given player is authorized to access resource "access"
… …
1975 # use -1 or undef as default coordinates, not 0, 0 2511 # use -1 or undef as default coordinates, not 0, 0
1976 ($x, $y) = ($map->enter_x, $map->enter_y) 2512 ($x, $y) = ($map->enter_x, $map->enter_y)
1977 if $x <=0 && $y <= 0; 2513 if $x <=0 && $y <= 0;
1978 2514
1979 $map->load; 2515 $map->load;
1980 $map->load_diag; 2516 $map->load_neighbours;
1981 2517
1982 return unless $self->contr->active; 2518 return unless $self->contr->active;
1983 $self->activate_recursive; 2519 $self->activate_recursive;
1984 2520
1985 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2521 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1986 $self->enter_map ($map, $x, $y); 2522 $self->enter_map ($map, $x, $y);
1987} 2523}
1988 2524
1989=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2525=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1990 2526
1991Moves the player to the given map-path and coordinates by first freezing 2527Moves the player to the given map-path and coordinates by first freezing
1992her, loading and preparing them map, calling the provided $check callback 2528her, loading and preparing them map, calling the provided $check callback
1993that has to return the map if sucecssful, and then unfreezes the player on 2529that has to return the map if sucecssful, and then unfreezes the player on
1994the new (success) or old (failed) map position. 2530the new (success) or old (failed) map position. In either case, $done will
2531be called at the end of this process.
2532
2533Note that $check will be called with a potentially non-loaded map, so if
2534it needs a loaded map it has to call C<< ->load >>.
1995 2535
1996=cut 2536=cut
1997 2537
1998our $GOTOGEN; 2538our $GOTOGEN;
1999 2539
2000sub cf::object::player::goto { 2540sub cf::object::player::goto {
2001 my ($self, $path, $x, $y, $check) = @_; 2541 my ($self, $path, $x, $y, $check, $done) = @_;
2002 2542
2003 # do generation counting so two concurrent goto's will be executed in-order 2543 # do generation counting so two concurrent goto's will be executed in-order
2004 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2544 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2005 2545
2006 $self->enter_link; 2546 $self->enter_link;
2007 2547
2008 (async { 2548 (async {
2549 $Coro::current->{desc} = "player::goto $path $x $y";
2550
2551 # *tag paths override both path and x|y
2552 if ($path =~ /^\*(.*)$/) {
2553 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2554 my $ob = $obs[rand @obs];
2555
2556 # see if we actually can go there
2557 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2558 $ob = $obs[rand @obs];
2559 } else {
2560 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2561 }
2562 # else put us there anyways for now #d#
2563
2564 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2565 } else {
2566 ($path, $x, $y) = (undef, undef, undef);
2567 }
2568 }
2569
2009 my $map = eval { 2570 my $map = eval {
2010 my $map = cf::map::find $path; 2571 my $map = defined $path ? cf::map::find $path : undef;
2011 2572
2012 if ($map) { 2573 if ($map) {
2013 $map = $map->customise_for ($self); 2574 $map = $map->customise_for ($self);
2014 $map = $check->($map) if $check && $map; 2575 $map = $check->($map) if $check && $map;
2015 } else { 2576 } else {
2016 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2577 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2017 } 2578 }
2018 2579
2019 $map 2580 $map
2020 }; 2581 };
2021 2582
… …
2026 2587
2027 if ($gen == $self->{_goto_generation}) { 2588 if ($gen == $self->{_goto_generation}) {
2028 delete $self->{_goto_generation}; 2589 delete $self->{_goto_generation};
2029 $self->leave_link ($map, $x, $y); 2590 $self->leave_link ($map, $x, $y);
2030 } 2591 }
2592
2593 $done->() if $done;
2031 })->prio (1); 2594 })->prio (1);
2032} 2595}
2033 2596
2034=item $player_object->enter_exit ($exit_object) 2597=item $player_object->enter_exit ($exit_object)
2035 2598
… …
2055} 2618}
2056 2619
2057sub prepare_random_map { 2620sub prepare_random_map {
2058 my ($exit) = @_; 2621 my ($exit) = @_;
2059 2622
2060 my $guard = cf::lock_acquire "exit_prepare:$exit";
2061
2062 # all this does is basically replace the /! path by 2623 # all this does is basically replace the /! path by
2063 # a new random map path (?random/...) with a seed 2624 # a new random map path (?random/...) with a seed
2064 # that depends on the exit object 2625 # that depends on the exit object
2065 2626
2066 my $rmp = parse_random_map_params $exit->msg; 2627 my $rmp = parse_random_map_params $exit->msg;
… …
2068 if ($exit->map) { 2629 if ($exit->map) {
2069 $rmp->{region} = $exit->region->name; 2630 $rmp->{region} = $exit->region->name;
2070 $rmp->{origin_map} = $exit->map->path; 2631 $rmp->{origin_map} = $exit->map->path;
2071 $rmp->{origin_x} = $exit->x; 2632 $rmp->{origin_x} = $exit->x;
2072 $rmp->{origin_y} = $exit->y; 2633 $rmp->{origin_y} = $exit->y;
2634
2635 $exit->map->touch;
2073 } 2636 }
2074 2637
2075 $rmp->{random_seed} ||= $exit->random_seed; 2638 $rmp->{random_seed} ||= $exit->random_seed;
2076 2639
2077 my $data = cf::to_json $rmp; 2640 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2078 my $md5 = Digest::MD5::md5_hex $data; 2641 my $md5 = Digest::MD5::md5_hex $data;
2079 my $meta = "$RANDOMDIR/$md5.meta"; 2642 my $meta = "$RANDOMDIR/$md5.meta";
2080 2643
2081 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2644 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2082 aio_write $fh, 0, (length $data), $data, 0; 2645 aio_write $fh, 0, (length $data), $data, 0;
2083 undef $fh; 2646 undef $fh;
2084 aio_rename "$meta~", $meta; 2647 aio_rename "$meta~", $meta;
2085 2648
2649 my $slaying = "?random/$md5";
2650
2651 if ($exit->valid) {
2086 $exit->slaying ("?random/$md5"); 2652 $exit->slaying ("?random/$md5");
2087 $exit->msg (undef); 2653 $exit->msg (undef);
2654 }
2088 } 2655 }
2089} 2656}
2090 2657
2091sub cf::object::player::enter_exit { 2658sub cf::object::player::enter_exit {
2092 my ($self, $exit) = @_; 2659 my ($self, $exit) = @_;
2093 2660
2094 return unless $self->type == cf::PLAYER; 2661 return unless $self->type == cf::PLAYER;
2095 2662
2096 if ($exit->slaying eq "/!") {
2097 #TODO: this should de-fi-ni-te-ly not be a sync-job
2098 # the problem is that $exit might not survive long enough
2099 # so it needs to be done right now, right here
2100 cf::sync_job { prepare_random_map $exit };
2101 }
2102
2103 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2104 my $hp = $exit->stats->hp;
2105 my $sp = $exit->stats->sp;
2106
2107 $self->enter_link; 2663 $self->enter_link;
2108 2664
2109 (async { 2665 (async {
2110 $self->deactivate_recursive; # just to be sure 2666 $Coro::current->{desc} = "enter_exit";
2667
2111 unless (eval { 2668 unless (eval {
2669 $self->deactivate_recursive; # just to be sure
2670
2671 # random map handling
2672 {
2673 my $guard = cf::lock_acquire "exit_prepare:$exit";
2674
2675 prepare_random_map $exit
2676 if $exit->slaying eq "/!";
2677 }
2678
2679 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2680 my $x = $exit->stats->hp;
2681 my $y = $exit->stats->sp;
2682
2112 $self->goto ($slaying, $hp, $sp); 2683 $self->goto ($map, $x, $y);
2113 2684
2685 # if exit is damned, update players death & WoR home-position
2686 $self->contr->savebed ($map, $x, $y)
2687 if $exit->flag (cf::FLAG_DAMNED);
2688
2114 1; 2689 1
2115 }) { 2690 }) {
2116 $self->message ("Something went wrong deep within the crossfire server. " 2691 $self->message ("Something went wrong deep within the crossfire server. "
2117 . "I'll try to bring you back to the map you were before. " 2692 . "I'll try to bring you back to the map you were before. "
2118 . "Please report this to the dungeon master!", 2693 . "Please report this to the dungeon master!",
2119 cf::NDI_UNIQUE | cf::NDI_RED); 2694 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2140 2715
2141 utf8::encode $text; 2716 utf8::encode $text;
2142 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2717 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2143} 2718}
2144 2719
2720=item $client->send_msg ($channel, $msg, $color, [extra...])
2721
2722Send a drawinfo or msg packet to the client, formatting the msg for the
2723client if neccessary. C<$type> should be a string identifying the type of
2724the message, with C<log> being the default. If C<$color> is negative, suppress
2725the message unless the client supports the msg packet.
2726
2727=cut
2728
2729# non-persistent channels (usually the info channel)
2730our %CHANNEL = (
2731 "c/identify" => {
2732 id => "infobox",
2733 title => "Identify",
2734 reply => undef,
2735 tooltip => "Items recently identified",
2736 },
2737 "c/examine" => {
2738 id => "infobox",
2739 title => "Examine",
2740 reply => undef,
2741 tooltip => "Signs and other items you examined",
2742 },
2743 "c/book" => {
2744 id => "infobox",
2745 title => "Book",
2746 reply => undef,
2747 tooltip => "The contents of a note or book",
2748 },
2749 "c/lookat" => {
2750 id => "infobox",
2751 title => "Look",
2752 reply => undef,
2753 tooltip => "What you saw there",
2754 },
2755 "c/who" => {
2756 id => "infobox",
2757 title => "Players",
2758 reply => undef,
2759 tooltip => "Shows players who are currently online",
2760 },
2761 "c/body" => {
2762 id => "infobox",
2763 title => "Body Parts",
2764 reply => undef,
2765 tooltip => "Shows which body parts you posess and are available",
2766 },
2767 "c/uptime" => {
2768 id => "infobox",
2769 title => "Uptime",
2770 reply => undef,
2771 tooltip => "How long the server has been running since last restart",
2772 },
2773 "c/mapinfo" => {
2774 id => "infobox",
2775 title => "Map Info",
2776 reply => undef,
2777 tooltip => "Information related to the maps",
2778 },
2779 "c/party" => {
2780 id => "party",
2781 title => "Party",
2782 reply => "gsay ",
2783 tooltip => "Messages and chat related to your party",
2784 },
2785);
2786
2787sub cf::client::send_msg {
2788 my ($self, $channel, $msg, $color, @extra) = @_;
2789
2790 $msg = $self->pl->expand_cfpod ($msg);
2791
2792 $color &= cf::NDI_CLIENT_MASK; # just in case...
2793
2794 # check predefined channels, for the benefit of C
2795 if ($CHANNEL{$channel}) {
2796 $channel = $CHANNEL{$channel};
2797
2798 $self->ext_msg (channel_info => $channel)
2799 if $self->can_msg;
2800
2801 $channel = $channel->{id};
2802
2803 } elsif (ref $channel) {
2804 # send meta info to client, if not yet sent
2805 unless (exists $self->{channel}{$channel->{id}}) {
2806 $self->{channel}{$channel->{id}} = $channel;
2807 $self->ext_msg (channel_info => $channel)
2808 if $self->can_msg;
2809 }
2810
2811 $channel = $channel->{id};
2812 }
2813
2814 return unless @extra || length $msg;
2815
2816 if ($self->can_msg) {
2817 # default colour, mask it out
2818 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2819 if $color & cf::NDI_DEF;
2820
2821 my $pkt = "msg "
2822 . $self->{json_coder}->encode (
2823 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2824 );
2825
2826 # try lzf for large packets
2827 $pkt = "lzf " . Compress::LZF::compress $pkt
2828 if 1024 <= length $pkt and $self->{can_lzf};
2829
2830 # split very large packets
2831 if (8192 < length $pkt and $self->{can_lzf}) {
2832 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2833 $pkt = "frag";
2834 }
2835
2836 $self->send_packet ($pkt);
2837 } else {
2838 if ($color >= 0) {
2839 # replace some tags by gcfclient-compatible ones
2840 for ($msg) {
2841 1 while
2842 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2843 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2844 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2845 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2846 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2847 }
2848
2849 $color &= cf::NDI_COLOR_MASK;
2850
2851 utf8::encode $msg;
2852
2853 if (0 && $msg =~ /\[/) {
2854 # COMMAND/INFO
2855 $self->send_packet ("drawextinfo $color 10 8 $msg")
2856 } else {
2857 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2858 $self->send_packet ("drawinfo $color $msg")
2859 }
2860 }
2861 }
2862}
2863
2145=item $client->ext_event ($type, %msg) 2864=item $client->ext_msg ($type, @msg)
2146 2865
2147Sends an exti event to the client. 2866Sends an ext event to the client.
2148 2867
2149=cut 2868=cut
2150 2869
2151sub cf::client::ext_event($$%) { 2870sub cf::client::ext_msg($$@) {
2152 my ($self, $type, %msg) = @_; 2871 my ($self, $type, @msg) = @_;
2153 2872
2873 if ($self->extcmd == 2) {
2874 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2875 } elsif ($self->extcmd == 1) { # TODO: remove
2154 $msg{msgtype} = "event_$type"; 2876 push @msg, msgtype => "event_$type";
2155 $self->send_packet ("ext " . cf::to_json \%msg); 2877 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2878 }
2879}
2880
2881=item $client->ext_reply ($msgid, @msg)
2882
2883Sends an ext reply to the client.
2884
2885=cut
2886
2887sub cf::client::ext_reply($$@) {
2888 my ($self, $id, @msg) = @_;
2889
2890 if ($self->extcmd == 2) {
2891 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2892 } elsif ($self->extcmd == 1) {
2893 #TODO: version 1, remove
2894 unshift @msg, msgtype => "reply", msgid => $id;
2895 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2896 }
2156} 2897}
2157 2898
2158=item $success = $client->query ($flags, "text", \&cb) 2899=item $success = $client->query ($flags, "text", \&cb)
2159 2900
2160Queues a query to the client, calling the given callback with 2901Queues a query to the client, calling the given callback with
2161the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2902the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2162C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2903C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2163 2904
2164Queries can fail, so check the return code. Or don't, as queries will become 2905Queries can fail, so check the return code. Or don't, as queries will
2165reliable at some point in the future. 2906become reliable at some point in the future.
2166 2907
2167=cut 2908=cut
2168 2909
2169sub cf::client::query { 2910sub cf::client::query {
2170 my ($self, $flags, $text, $cb) = @_; 2911 my ($self, $flags, $text, $cb) = @_;
… …
2178 utf8::encode $text; 2919 utf8::encode $text;
2179 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2920 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2180 2921
2181 $self->send_packet ($self->{query_queue}[0][0]) 2922 $self->send_packet ($self->{query_queue}[0][0])
2182 if @{ $self->{query_queue} } == 1; 2923 if @{ $self->{query_queue} } == 1;
2924
2925 1
2183} 2926}
2184 2927
2185cf::client->attach ( 2928cf::client->attach (
2929 on_connect => sub {
2930 my ($ns) = @_;
2931
2932 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2933 },
2186 on_reply => sub { 2934 on_reply => sub {
2187 my ($ns, $msg) = @_; 2935 my ($ns, $msg) = @_;
2188 2936
2189 # this weird shuffling is so that direct followup queries 2937 # this weird shuffling is so that direct followup queries
2190 # get handled first 2938 # get handled first
… …
2202 } else { 2950 } else {
2203 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2951 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2204 } 2952 }
2205 } 2953 }
2206 }, 2954 },
2955 on_exticmd => sub {
2956 my ($ns, $buf) = @_;
2957
2958 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2959
2960 if (ref $msg) {
2961 my ($type, $reply, @payload) =
2962 "ARRAY" eq ref $msg
2963 ? @$msg
2964 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2965
2966 my @reply;
2967
2968 if (my $cb = $EXTICMD{$type}) {
2969 @reply = $cb->($ns, @payload);
2970 }
2971
2972 $ns->ext_reply ($reply, @reply)
2973 if $reply;
2974
2975 } else {
2976 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2977 }
2978
2979 cf::override;
2980 },
2207); 2981);
2208 2982
2209=item $client->async (\&cb) 2983=item $client->async (\&cb)
2210 2984
2211Create a new coroutine, running the specified callback. The coroutine will 2985Create a new coroutine, running the specified callback. The coroutine will
… …
2252our $safe = new Safe "safe"; 3026our $safe = new Safe "safe";
2253our $safe_hole = new Safe::Hole; 3027our $safe_hole = new Safe::Hole;
2254 3028
2255$SIG{FPE} = 'IGNORE'; 3029$SIG{FPE} = 'IGNORE';
2256 3030
2257$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3031$safe->permit_only (Opcode::opset qw(
3032 :base_core :base_mem :base_orig :base_math
3033 grepstart grepwhile mapstart mapwhile
3034 sort time
3035));
2258 3036
2259# here we export the classes and methods available to script code 3037# here we export the classes and methods available to script code
2260 3038
2261=pod 3039=pod
2262 3040
2263The following functions and methods are available within a safe environment: 3041The following functions and methods are available within a safe environment:
2264 3042
2265 cf::object contr pay_amount pay_player map 3043 cf::object
3044 contr pay_amount pay_player map x y force_find force_add destroy
3045 insert remove name archname title slaying race decrease split
3046
2266 cf::object::player player 3047 cf::object::player
2267 cf::player peaceful 3048 player
2268 cf::map trigger 3049
3050 cf::player
3051 peaceful
3052
3053 cf::map
3054 trigger
2269 3055
2270=cut 3056=cut
2271 3057
2272for ( 3058for (
2273 ["cf::object" => qw(contr pay_amount pay_player map)], 3059 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3060 insert remove inv nrof name archname title slaying race
3061 decrease split destroy change_exp)],
2274 ["cf::object::player" => qw(player)], 3062 ["cf::object::player" => qw(player)],
2275 ["cf::player" => qw(peaceful)], 3063 ["cf::player" => qw(peaceful)],
2276 ["cf::map" => qw(trigger)], 3064 ["cf::map" => qw(trigger)],
2277) { 3065) {
2278 no strict 'refs'; 3066 no strict 'refs';
… …
2349=back 3137=back
2350 3138
2351=cut 3139=cut
2352 3140
2353############################################################################# 3141#############################################################################
2354
2355=head2 EXTENSION DATABASE SUPPORT
2356
2357Crossfire maintains a very simple database for extension use. It can
2358currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2359convert to/from binary).
2360
2361The parameter C<$family> should best start with the name of the extension
2362using it, it should be unique.
2363
2364=over 4
2365
2366=item $value = cf::db_get $family => $key
2367
2368Returns a single value from the database.
2369
2370=item cf::db_put $family => $key => $value
2371
2372Stores the given C<$value> in the family.
2373
2374=cut
2375
2376our $DB;
2377
2378sub db_init {
2379 unless ($DB) {
2380 $DB = BDB::db_create $DB_ENV;
2381
2382 cf::sync_job {
2383 eval {
2384 $DB->set_flags (BDB::CHKSUM);
2385
2386 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2387 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2388 cf::cleanup "db_open(db): $!" if $!;
2389 };
2390 cf::cleanup "db_open(db): $@" if $@;
2391 };
2392 }
2393}
2394
2395sub db_get($$) {
2396 my $key = "$_[0]/$_[1]";
2397
2398 cf::sync_job {
2399 BDB::db_get $DB, undef, $key, my $data;
2400
2401 $! ? ()
2402 : $data
2403 }
2404}
2405
2406sub db_put($$$) {
2407 BDB::dbreq_pri 4;
2408 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2409}
2410
2411=item cf::cache $id => [$paths...], $processversion => $process
2412
2413Generic caching function that returns the value of the resource $id,
2414caching and regenerating as required.
2415
2416This function can block.
2417
2418=cut
2419
2420sub cache {
2421 my ($id, $src, $processversion, $process) = @_;
2422
2423 my $meta =
2424 join "\x00",
2425 $processversion,
2426 map {
2427 aio_stat $_
2428 and Carp::croak "$_: $!";
2429
2430 ($_, (stat _)[7,9])
2431 } @$src;
2432
2433 my $dbmeta = db_get cache => "$id/meta";
2434 if ($dbmeta ne $meta) {
2435 # changed, we may need to process
2436
2437 my @data;
2438 my $md5;
2439
2440 for (0 .. $#$src) {
2441 0 <= aio_load $src->[$_], $data[$_]
2442 or Carp::croak "$src->[$_]: $!";
2443 }
2444
2445 # if processing is expensive, check
2446 # checksum first
2447 if (1) {
2448 $md5 =
2449 join "\x00",
2450 $processversion,
2451 map {
2452 Coro::cede;
2453 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2454 } 0.. $#$src;
2455
2456
2457 my $dbmd5 = db_get cache => "$id/md5";
2458 if ($dbmd5 eq $md5) {
2459 db_put cache => "$id/meta", $meta;
2460
2461 return db_get cache => "$id/data";
2462 }
2463 }
2464
2465 my $t1 = Time::HiRes::time;
2466 my $data = $process->(\@data);
2467 my $t2 = Time::HiRes::time;
2468
2469 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2470
2471 db_put cache => "$id/data", $data;
2472 db_put cache => "$id/md5" , $md5;
2473 db_put cache => "$id/meta", $meta;
2474
2475 return $data;
2476 }
2477
2478 db_get cache => "$id/data"
2479}
2480
2481=item fork_call { }, $args
2482
2483Executes the given code block with the given arguments in a seperate
2484process, returning the results. Everything must be serialisable with
2485Coro::Storable. May, of course, block. Note that the executed sub may
2486never block itself or use any form of Event handling.
2487
2488=cut
2489
2490sub fork_call(&@) {
2491 my ($cb, @args) = @_;
2492
2493# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2494# or die "socketpair: $!";
2495 pipe my $fh1, my $fh2
2496 or die "pipe: $!";
2497
2498 if (my $pid = fork) {
2499 close $fh2;
2500
2501 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2502 $res = Coro::Storable::thaw $res;
2503
2504 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2505
2506 die $$res unless "ARRAY" eq ref $res;
2507
2508 return wantarray ? @$res : $res->[-1];
2509 } else {
2510 reset_signals;
2511 local $SIG{__WARN__};
2512 local $SIG{__DIE__};
2513 eval {
2514 close $fh1;
2515
2516 my @res = eval { $cb->(@args) };
2517 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2518 };
2519
2520 warn $@ if $@;
2521 _exit 0;
2522 }
2523}
2524
2525#############################################################################
2526# the server's init and main functions 3142# the server's init and main functions
2527 3143
2528sub load_facedata($) { 3144sub load_facedata($) {
2529 my ($path) = @_; 3145 my ($path) = @_;
3146
3147 # HACK to clear player env face cache, we need some signal framework
3148 # for this (global event?)
3149 %ext::player_env::MUSIC_FACE_CACHE = ();
3150
3151 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2530 3152
2531 warn "loading facedata from $path\n"; 3153 warn "loading facedata from $path\n";
2532 3154
2533 my $facedata; 3155 my $facedata;
2534 0 < aio_load $path, $facedata 3156 0 < aio_load $path, $facedata
… …
2537 $facedata = Coro::Storable::thaw $facedata; 3159 $facedata = Coro::Storable::thaw $facedata;
2538 3160
2539 $facedata->{version} == 2 3161 $facedata->{version} == 2
2540 or cf::cleanup "$path: version mismatch, cannot proceed."; 3162 or cf::cleanup "$path: version mismatch, cannot proceed.";
2541 3163
3164 # patch in the exptable
3165 $facedata->{resource}{"res/exp_table"} = {
3166 type => FT_RSRC,
3167 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3168 };
3169 cf::cede_to_tick;
3170
2542 { 3171 {
2543 my $faces = $facedata->{faceinfo}; 3172 my $faces = $facedata->{faceinfo};
2544 3173
2545 while (my ($face, $info) = each %$faces) { 3174 while (my ($face, $info) = each %$faces) {
2546 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3175 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3176
2547 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3177 cf::face::set_visibility $idx, $info->{visibility};
3178 cf::face::set_magicmap $idx, $info->{magicmap};
2548 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3179 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2549 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3180 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2550 Coro::cede; 3181
3182 cf::cede_to_tick;
2551 } 3183 }
2552 3184
2553 while (my ($face, $info) = each %$faces) { 3185 while (my ($face, $info) = each %$faces) {
2554 next unless $info->{smooth}; 3186 next unless $info->{smooth};
3187
2555 my $idx = cf::face::find $face 3188 my $idx = cf::face::find $face
2556 or next; 3189 or next;
3190
2557 if (my $smooth = cf::face::find $info->{smooth}) { 3191 if (my $smooth = cf::face::find $info->{smooth}) {
3192 cf::face::set_smooth $idx, $smooth;
2558 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3193 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2559 } else { 3194 } else {
2560 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3195 warn "smooth face '$info->{smooth}' not found for face '$face'";
2561 } 3196 }
2562 Coro::cede; 3197
3198 cf::cede_to_tick;
2563 } 3199 }
2564 } 3200 }
2565 3201
2566 { 3202 {
2567 my $anims = $facedata->{animinfo}; 3203 my $anims = $facedata->{animinfo};
2568 3204
2569 while (my ($anim, $info) = each %$anims) { 3205 while (my ($anim, $info) = each %$anims) {
2570 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3206 cf::anim::set $anim, $info->{frames}, $info->{facings};
2571 Coro::cede; 3207 cf::cede_to_tick;
2572 } 3208 }
2573 3209
2574 cf::anim::invalidate_all; # d'oh 3210 cf::anim::invalidate_all; # d'oh
2575 } 3211 }
2576 3212
3213 {
3214 # TODO: for gcfclient pleasure, we should give resources
3215 # that gcfclient doesn't grok a >10000 face index.
3216 my $res = $facedata->{resource};
3217
3218 while (my ($name, $info) = each %$res) {
3219 if (defined $info->{type}) {
3220 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3221 my $data;
3222
3223 if ($info->{type} & 1) {
3224 # prepend meta info
3225
3226 my $meta = $enc->encode ({
3227 name => $name,
3228 %{ $info->{meta} || {} },
3229 });
3230
3231 $data = pack "(w/a*)*", $meta, $info->{data};
3232 } else {
3233 $data = $info->{data};
3234 }
3235
3236 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3237 cf::face::set_type $idx, $info->{type};
3238 } else {
3239 $RESOURCE{$name} = $info;
3240 }
3241
3242 cf::cede_to_tick;
3243 }
3244 }
3245
3246 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3247
2577 1 3248 1
2578} 3249}
2579 3250
3251cf::global->attach (on_resource_update => sub {
3252 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3253 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3254
3255 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3256 my $sound = $soundconf->{compat}[$_]
3257 or next;
3258
3259 my $face = cf::face::find "sound/$sound->[1]";
3260 cf::sound::set $sound->[0] => $face;
3261 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3262 }
3263
3264 while (my ($k, $v) = each %{$soundconf->{event}}) {
3265 my $face = cf::face::find "sound/$v";
3266 cf::sound::set $k => $face;
3267 }
3268 }
3269});
3270
3271register_exticmd fx_want => sub {
3272 my ($ns, $want) = @_;
3273
3274 while (my ($k, $v) = each %$want) {
3275 $ns->fx_want ($k, $v);
3276 }
3277};
3278
3279sub load_resource_file($) {
3280 my $guard = lock_acquire "load_resource_file";
3281
3282 my $status = load_resource_file_ $_[0];
3283 get_slot 0.1, 100;
3284 cf::arch::commit_load;
3285
3286 $status
3287}
3288
2580sub reload_regions { 3289sub reload_regions {
3290 # HACK to clear player env face cache, we need some signal framework
3291 # for this (global event?)
3292 %ext::player_env::MUSIC_FACE_CACHE = ();
3293
2581 load_resource_file "$MAPDIR/regions" 3294 load_resource_file "$MAPDIR/regions"
2582 or die "unable to load regions file\n"; 3295 or die "unable to load regions file\n";
3296
3297 for (cf::region::list) {
3298 $_->{match} = qr/$_->{match}/
3299 if exists $_->{match};
3300 }
2583} 3301}
2584 3302
2585sub reload_facedata { 3303sub reload_facedata {
2586 load_facedata "$DATADIR/facedata" 3304 load_facedata "$DATADIR/facedata"
2587 or die "unable to load facedata\n"; 3305 or die "unable to load facedata\n";
… …
2598} 3316}
2599 3317
2600sub reload_resources { 3318sub reload_resources {
2601 warn "reloading resource files...\n"; 3319 warn "reloading resource files...\n";
2602 3320
3321 reload_facedata;
3322 reload_archetypes;
2603 reload_regions; 3323 reload_regions;
2604 reload_facedata;
2605 #reload_archetypes;#d#
2606 reload_archetypes;
2607 reload_treasures; 3324 reload_treasures;
2608 3325
2609 warn "finished reloading resource files\n"; 3326 warn "finished reloading resource files\n";
2610} 3327}
2611 3328
2612sub init { 3329sub init {
3330 my $guard = freeze_mainloop;
3331
3332 evthread_start IO::AIO::poll_fileno;
3333
2613 reload_resources; 3334 reload_resources;
2614} 3335}
2615 3336
2616sub cfg_load { 3337sub reload_config {
2617 open my $fh, "<:utf8", "$CONFDIR/config" 3338 open my $fh, "<:utf8", "$CONFDIR/config"
2618 or return; 3339 or return;
2619 3340
2620 local $/; 3341 local $/;
2621 *CFG = YAML::Syck::Load <$fh>; 3342 *CFG = YAML::Load <$fh>;
2622 3343
2623 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3344 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2624 3345
2625 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3346 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2626 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3347 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2637sub main { 3358sub main {
2638 # we must not ever block the main coroutine 3359 # we must not ever block the main coroutine
2639 local $Coro::idle = sub { 3360 local $Coro::idle = sub {
2640 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3361 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2641 (async { 3362 (async {
2642 Event::one_event; 3363 $Coro::current->{desc} = "IDLE BUG HANDLER";
3364 EV::loop EV::LOOP_ONESHOT;
2643 })->prio (Coro::PRIO_MAX); 3365 })->prio (Coro::PRIO_MAX);
2644 }; 3366 };
2645 3367
2646 cfg_load; 3368 {
3369 my $guard = freeze_mainloop;
3370 reload_config;
2647 db_init; 3371 db_init;
2648 load_extensions; 3372 load_extensions;
2649 3373
2650 $TICK_WATCHER->start; 3374 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3375 }
3376
2651 Event::loop; 3377 EV::loop;
2652} 3378}
2653 3379
2654############################################################################# 3380#############################################################################
2655# initialisation and cleanup 3381# initialisation and cleanup
2656 3382
2657# install some emergency cleanup handlers 3383# install some emergency cleanup handlers
2658BEGIN { 3384BEGIN {
3385 our %SIGWATCHER = ();
2659 for my $signal (qw(INT HUP TERM)) { 3386 for my $signal (qw(INT HUP TERM)) {
2660 Event->signal ( 3387 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2661 reentrant => 0,
2662 data => WF_AUTOCANCEL,
2663 signal => $signal,
2664 prio => 0,
2665 cb => sub {
2666 cf::cleanup "SIG$signal"; 3388 cf::cleanup "SIG$signal";
2667 },
2668 ); 3389 };
3390 }
3391}
3392
3393sub write_runtime_sync {
3394 my $runtime = "$LOCALDIR/runtime";
3395
3396 # first touch the runtime file to show we are still running:
3397 # the fsync below can take a very very long time.
3398
3399 IO::AIO::aio_utime $runtime, undef, undef;
3400
3401 my $guard = cf::lock_acquire "write_runtime";
3402
3403 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3404 or return;
3405
3406 my $value = $cf::RUNTIME + 90 + 10;
3407 # 10 is the runtime save interval, for a monotonic clock
3408 # 60 allows for the watchdog to kill the server.
3409
3410 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3411 and return;
3412
3413 # always fsync - this file is important
3414 aio_fsync $fh
3415 and return;
3416
3417 # touch it again to show we are up-to-date
3418 aio_utime $fh, undef, undef;
3419
3420 close $fh
3421 or return;
3422
3423 aio_rename "$runtime~", $runtime
3424 and return;
3425
3426 warn "runtime file written.\n";
3427
2669 } 3428 1
3429}
3430
3431our $uuid_lock;
3432our $uuid_skip;
3433
3434sub write_uuid_sync($) {
3435 $uuid_skip ||= $_[0];
3436
3437 return if $uuid_lock;
3438 local $uuid_lock = 1;
3439
3440 my $uuid = "$LOCALDIR/uuid";
3441
3442 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3443 or return;
3444
3445 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3446 $uuid_skip = 0;
3447
3448 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3449 and return;
3450
3451 # always fsync - this file is important
3452 aio_fsync $fh
3453 and return;
3454
3455 close $fh
3456 or return;
3457
3458 aio_rename "$uuid~", $uuid
3459 and return;
3460
3461 warn "uuid file written ($value).\n";
3462
3463 1
3464
3465}
3466
3467sub write_uuid($$) {
3468 my ($skip, $sync) = @_;
3469
3470 $sync ? write_uuid_sync $skip
3471 : async { write_uuid_sync $skip };
2670} 3472}
2671 3473
2672sub emergency_save() { 3474sub emergency_save() {
2673 my $freeze_guard = cf::freeze_mainloop; 3475 my $freeze_guard = cf::freeze_mainloop;
2674 3476
… …
2680 # and maps saved/destroyed asynchronously. 3482 # and maps saved/destroyed asynchronously.
2681 warn "begin emergency player save\n"; 3483 warn "begin emergency player save\n";
2682 for my $login (keys %cf::PLAYER) { 3484 for my $login (keys %cf::PLAYER) {
2683 my $pl = $cf::PLAYER{$login} or next; 3485 my $pl = $cf::PLAYER{$login} or next;
2684 $pl->valid or next; 3486 $pl->valid or next;
3487 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2685 $pl->save; 3488 $pl->save;
2686 } 3489 }
2687 warn "end emergency player save\n"; 3490 warn "end emergency player save\n";
2688 3491
2689 warn "begin emergency map save\n"; 3492 warn "begin emergency map save\n";
… …
2695 warn "end emergency map save\n"; 3498 warn "end emergency map save\n";
2696 3499
2697 warn "begin emergency database checkpoint\n"; 3500 warn "begin emergency database checkpoint\n";
2698 BDB::db_env_txn_checkpoint $DB_ENV; 3501 BDB::db_env_txn_checkpoint $DB_ENV;
2699 warn "end emergency database checkpoint\n"; 3502 warn "end emergency database checkpoint\n";
3503
3504 warn "begin write uuid\n";
3505 write_uuid_sync 1;
3506 warn "end write uuid\n";
2700 }; 3507 };
2701 3508
2702 warn "leave emergency perl save\n"; 3509 warn "leave emergency perl save\n";
2703} 3510}
2704 3511
… …
2706 my ($make_core) = @_; 3513 my ($make_core) = @_;
2707 3514
2708 warn Carp::longmess "post_cleanup backtrace" 3515 warn Carp::longmess "post_cleanup backtrace"
2709 if $make_core; 3516 if $make_core;
2710} 3517}
3518
3519# a safer delete_package, copied from Symbol
3520sub clear_package($) {
3521 my $pkg = shift;
3522
3523 # expand to full symbol table name if needed
3524 unless ($pkg =~ /^main::.*::$/) {
3525 $pkg = "main$pkg" if $pkg =~ /^::/;
3526 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3527 $pkg .= '::' unless $pkg =~ /::$/;
3528 }
3529
3530 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3531 my $stem_symtab = *{$stem}{HASH};
3532
3533 defined $stem_symtab and exists $stem_symtab->{$leaf}
3534 or return;
3535
3536 # clear all symbols
3537 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3538 for my $name (keys %$leaf_symtab) {
3539 _gv_clear *{"$pkg$name"};
3540# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3541 }
3542 warn "cleared package #$pkg\n";#d#
3543}
3544
3545our $RELOAD; # how many times to reload
2711 3546
2712sub do_reload_perl() { 3547sub do_reload_perl() {
2713 # can/must only be called in main 3548 # can/must only be called in main
2714 if ($Coro::current != $Coro::main) { 3549 if ($Coro::current != $Coro::main) {
2715 warn "can only reload from main coroutine"; 3550 warn "can only reload from main coroutine";
2716 return; 3551 return;
2717 } 3552 }
2718 3553
3554 return if $RELOAD++;
3555
3556 while ($RELOAD) {
2719 warn "reloading..."; 3557 warn "reloading...";
2720 3558
2721 warn "entering sync_job"; 3559 warn "entering sync_job";
2722 3560
2723 cf::sync_job { 3561 cf::sync_job {
2724 cf::write_runtime; # external watchdog should not bark 3562 cf::write_runtime_sync; # external watchdog should not bark
2725 cf::emergency_save; 3563 cf::emergency_save;
2726 cf::write_runtime; # external watchdog should not bark 3564 cf::write_runtime_sync; # external watchdog should not bark
2727 3565
2728 warn "syncing database to disk"; 3566 warn "syncing database to disk";
2729 BDB::db_env_txn_checkpoint $DB_ENV; 3567 BDB::db_env_txn_checkpoint $DB_ENV;
2730 3568
2731 # if anything goes wrong in here, we should simply crash as we already saved 3569 # if anything goes wrong in here, we should simply crash as we already saved
2732 3570
2733 warn "cancelling all WF_AUTOCANCEL watchers";
2734 for (Event::all_watchers) {
2735 $_->cancel if $_->data & WF_AUTOCANCEL;
2736 }
2737
2738 warn "flushing outstanding aio requests"; 3571 warn "flushing outstanding aio requests";
2739 for (;;) {
2740 BDB::flush;
2741 IO::AIO::flush;
2742 Coro::cede;
2743 last unless IO::AIO::nreqs || BDB::nreqs; 3572 while (IO::AIO::nreqs || BDB::nreqs) {
2744 warn "iterate..."; 3573 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2745 }
2746
2747 ++$RELOAD;
2748
2749 warn "cancelling all extension coros";
2750 $_->cancel for values %EXT_CORO;
2751 %EXT_CORO = ();
2752
2753 warn "removing commands";
2754 %COMMAND = ();
2755
2756 warn "removing ext commands";
2757 %EXTCMD = ();
2758
2759 warn "unloading/nuking all extensions";
2760 for my $pkg (@EXTS) {
2761 warn "... unloading $pkg";
2762
2763 if (my $cb = $pkg->can ("unload")) {
2764 eval {
2765 $cb->($pkg);
2766 1
2767 } or warn "$pkg unloaded, but with errors: $@";
2768 } 3574 }
2769 3575
2770 warn "... nuking $pkg"; 3576 warn "cancelling all extension coros";
2771 Symbol::delete_package $pkg; 3577 $_->cancel for values %EXT_CORO;
2772 } 3578 %EXT_CORO = ();
2773 3579
2774 warn "unloading all perl modules loaded from $LIBDIR"; 3580 warn "removing commands";
2775 while (my ($k, $v) = each %INC) { 3581 %COMMAND = ();
2776 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2777 3582
3583 warn "removing ext/exti commands";
3584 %EXTCMD = ();
3585 %EXTICMD = ();
3586
3587 warn "unloading/nuking all extensions";
3588 for my $pkg (@EXTS) {
2778 warn "... unloading $k"; 3589 warn "... unloading $pkg";
2779 delete $INC{$k};
2780 3590
2781 $k =~ s/\.pm$//;
2782 $k =~ s/\//::/g;
2783
2784 if (my $cb = $k->can ("unload_module")) { 3591 if (my $cb = $pkg->can ("unload")) {
3592 eval {
2785 $cb->(); 3593 $cb->($pkg);
3594 1
3595 } or warn "$pkg unloaded, but with errors: $@";
3596 }
3597
3598 warn "... clearing $pkg";
3599 clear_package $pkg;
2786 } 3600 }
2787 3601
2788 Symbol::delete_package $k; 3602 warn "unloading all perl modules loaded from $LIBDIR";
3603 while (my ($k, $v) = each %INC) {
3604 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3605
3606 warn "... unloading $k";
3607 delete $INC{$k};
3608
3609 $k =~ s/\.pm$//;
3610 $k =~ s/\//::/g;
3611
3612 if (my $cb = $k->can ("unload_module")) {
3613 $cb->();
3614 }
3615
3616 clear_package $k;
2789 } 3617 }
2790 3618
2791 warn "getting rid of safe::, as good as possible"; 3619 warn "getting rid of safe::, as good as possible";
2792 Symbol::delete_package "safe::$_" 3620 clear_package "safe::$_"
2793 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3621 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2794 3622
2795 warn "unloading cf.pm \"a bit\""; 3623 warn "unloading cf.pm \"a bit\"";
2796 delete $INC{"cf.pm"}; 3624 delete $INC{"cf.pm"};
2797 delete $INC{"cf/pod.pm"}; 3625 delete $INC{"cf/pod.pm"};
2798 3626
2799 # don't, removes xs symbols, too, 3627 # don't, removes xs symbols, too,
2800 # and global variables created in xs 3628 # and global variables created in xs
2801 #Symbol::delete_package __PACKAGE__; 3629 #clear_package __PACKAGE__;
2802 3630
2803 warn "unload completed, starting to reload now"; 3631 warn "unload completed, starting to reload now";
2804 3632
2805 warn "reloading cf.pm"; 3633 warn "reloading cf.pm";
2806 require cf; 3634 require cf;
2807 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3635 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2808 3636
2809 warn "loading config and database again"; 3637 warn "loading config and database again";
2810 cf::cfg_load; 3638 cf::reload_config;
2811 3639
2812 warn "loading extensions"; 3640 warn "loading extensions";
2813 cf::load_extensions; 3641 cf::load_extensions;
2814 3642
2815 warn "reattaching attachments to objects/players"; 3643 warn "reattaching attachments to objects/players";
2816 _global_reattach; # objects, sockets 3644 _global_reattach; # objects, sockets
2817 warn "reattaching attachments to maps"; 3645 warn "reattaching attachments to maps";
2818 reattach $_ for values %MAP; 3646 reattach $_ for values %MAP;
2819 warn "reattaching attachments to players"; 3647 warn "reattaching attachments to players";
2820 reattach $_ for values %PLAYER; 3648 reattach $_ for values %PLAYER;
2821 3649
2822 warn "leaving sync_job"; 3650 warn "leaving sync_job";
2823 3651
2824 1 3652 1
2825 } or do { 3653 } or do {
2826 warn $@; 3654 warn $@;
2827 warn "error while reloading, exiting."; 3655 cf::cleanup "error while reloading, exiting.";
2828 exit 1;
2829 }; 3656 };
2830 3657
2831 warn "reloaded"; 3658 warn "reloaded";
3659 --$RELOAD;
3660 }
2832}; 3661};
2833 3662
2834our $RELOAD_WATCHER; # used only during reload 3663our $RELOAD_WATCHER; # used only during reload
2835 3664
2836sub reload_perl() { 3665sub reload_perl() {
2837 # doing reload synchronously and two reloads happen back-to-back, 3666 # doing reload synchronously and two reloads happen back-to-back,
2838 # coro crashes during coro_state_free->destroy here. 3667 # coro crashes during coro_state_free->destroy here.
2839 3668
2840 $RELOAD_WATCHER ||= Event->timer ( 3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2841 reentrant => 0,
2842 after => 0,
2843 data => WF_AUTOCANCEL,
2844 cb => sub {
2845 do_reload_perl; 3670 do_reload_perl;
2846 undef $RELOAD_WATCHER; 3671 undef $RELOAD_WATCHER;
2847 },
2848 ); 3672 };
2849} 3673}
2850 3674
2851register_command "reload" => sub { 3675register_command "reload" => sub {
2852 my ($who, $arg) = @_; 3676 my ($who, $arg) = @_;
2853 3677
2854 if ($who->flag (FLAG_WIZ)) { 3678 if ($who->flag (FLAG_WIZ)) {
2855 $who->message ("reloading server."); 3679 $who->message ("reloading server.");
3680 async {
3681 $Coro::current->{desc} = "perl_reload";
2856 async { reload_perl }; 3682 reload_perl;
3683 };
2857 } 3684 }
2858}; 3685};
2859 3686
2860unshift @INC, $LIBDIR; 3687unshift @INC, $LIBDIR;
2861 3688
… …
2863 3690
2864our @WAIT_FOR_TICK; 3691our @WAIT_FOR_TICK;
2865our @WAIT_FOR_TICK_BEGIN; 3692our @WAIT_FOR_TICK_BEGIN;
2866 3693
2867sub wait_for_tick { 3694sub wait_for_tick {
2868 return unless $TICK_WATCHER->is_active;
2869 return if $Coro::current == $Coro::main; 3695 return if tick_inhibit || $Coro::current == $Coro::main;
2870 3696
2871 my $signal = new Coro::Signal; 3697 my $signal = new Coro::Signal;
2872 push @WAIT_FOR_TICK, $signal; 3698 push @WAIT_FOR_TICK, $signal;
2873 $signal->wait; 3699 $signal->wait;
2874} 3700}
2875 3701
2876sub wait_for_tick_begin { 3702sub wait_for_tick_begin {
2877 return unless $TICK_WATCHER->is_active;
2878 return if $Coro::current == $Coro::main; 3703 return if tick_inhibit || $Coro::current == $Coro::main;
2879 3704
2880 my $signal = new Coro::Signal; 3705 my $signal = new Coro::Signal;
2881 push @WAIT_FOR_TICK_BEGIN, $signal; 3706 push @WAIT_FOR_TICK_BEGIN, $signal;
2882 $signal->wait; 3707 $signal->wait;
2883} 3708}
2884 3709
2885 my $min = 1e6;#d# 3710sub tick {
2886 my $avg = 10;
2887$TICK_WATCHER = Event->timer (
2888 reentrant => 0,
2889 parked => 1,
2890 prio => 0,
2891 at => $NEXT_TICK || $TICK,
2892 data => WF_AUTOCANCEL,
2893 cb => sub {
2894 if ($Coro::current != $Coro::main) { 3711 if ($Coro::current != $Coro::main) {
2895 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3712 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2896 unless ++$bug_warning > 10; 3713 unless ++$bug_warning > 10;
2897 return; 3714 return;
2898 } 3715 }
2899 3716
2900 $NOW = $tick_start = Event::time;
2901
2902 cf::server_tick; # one server iteration 3717 cf::server_tick; # one server iteration
2903 3718
2904 0 && sync_job {#d# 3719 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2905 for(1..10) { 3720 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2906 my $t = Event::time; 3721 Coro::async_pool {
2907 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3722 $Coro::current->{desc} = "runtime saver";
2908 or die; 3723 write_runtime_sync
2909 3724 or warn "ERROR: unable to write runtime file: $!";
2910 $map->width (50);
2911 $map->height (50);
2912 $map->alloc;
2913 $map->_load_objects ("/tmp/x.map", 1);
2914 my $t = Event::time - $t;
2915
2916 #next unless $t < 0.0013;#d#
2917 if ($t < $min) {
2918 $min = $t;
2919 }
2920 $avg = $avg * 0.99 + $t * 0.01;
2921 }
2922 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2923 exit 0;
2924 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2925 }; 3725 };
3726 }
2926 3727
2927 $RUNTIME += $TICK;
2928 $NEXT_TICK += $TICK;
2929
2930 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2931 $NEXT_RUNTIME_WRITE = $NOW + 10;
2932 Coro::async_pool {
2933 write_runtime
2934 or warn "ERROR: unable to write runtime file: $!";
2935 };
2936 }
2937
2938# my $AFTER = Event::time;
2939# warn $AFTER - $NOW;#d#
2940
2941 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3728 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2942 $sig->send; 3729 $sig->send;
2943 } 3730 }
2944 while (my $sig = shift @WAIT_FOR_TICK) { 3731 while (my $sig = shift @WAIT_FOR_TICK) {
2945 $sig->send; 3732 $sig->send;
2946 } 3733 }
2947 3734
2948 $NOW = Event::time; 3735 $LOAD = ($NOW - $TICK_START) / $TICK;
2949
2950 # if we are delayed by four ticks or more, skip them all
2951 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2952
2953 $TICK_WATCHER->at ($NEXT_TICK);
2954 $TICK_WATCHER->start;
2955
2956 $LOAD = ($NOW - $tick_start) / $TICK;
2957 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3736 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2958 3737
2959 _post_tick; 3738 if (0) {
2960 3739 if ($NEXT_TICK) {
2961 3740 my $jitter = $TICK_START - $NEXT_TICK;
3741 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3742 warn "jitter $JITTER\n";#d#
3743 }
2962 }, 3744 }
2963); 3745}
2964 3746
2965{ 3747{
2966 BDB::max_poll_time $TICK * 0.1; 3748 # configure BDB
2967 $BDB_POLL_WATCHER = Event->io ( 3749
2968 reentrant => 0,
2969 fd => BDB::poll_fileno,
2970 poll => 'r',
2971 prio => 0,
2972 data => WF_AUTOCANCEL,
2973 cb => \&BDB::poll_cb,
2974 );
2975 BDB::min_parallel 8; 3750 BDB::min_parallel 8;
2976 3751 BDB::max_poll_reqs $TICK * 0.1;
2977 BDB::set_sync_prepare { 3752 $AnyEvent::BDB::WATCHER->priority (1);
2978 my $status;
2979 my $current = $Coro::current;
2980 (
2981 sub {
2982 $status = $!;
2983 $current->ready; undef $current;
2984 },
2985 sub {
2986 Coro::schedule while defined $current;
2987 $! = $status;
2988 },
2989 )
2990 };
2991 3753
2992 unless ($DB_ENV) { 3754 unless ($DB_ENV) {
2993 $DB_ENV = BDB::db_env_create; 3755 $DB_ENV = BDB::db_env_create;
3756 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3757 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3758 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3759 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3760 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2994 3761
2995 cf::sync_job { 3762 cf::sync_job {
2996 eval { 3763 eval {
2997 BDB::db_env_open 3764 BDB::db_env_open
2998 $DB_ENV, 3765 $DB_ENV,
… …
3000 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3767 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3001 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3768 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3002 0666; 3769 0666;
3003 3770
3004 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3771 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3005
3006 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3007 $DB_ENV->set_lk_detect;
3008 }; 3772 };
3009 3773
3010 cf::cleanup "db_env_open(db): $@" if $@; 3774 cf::cleanup "db_env_open(db): $@" if $@;
3011 }; 3775 };
3012 } 3776 }
3777
3778 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3779 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3780 };
3781 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3782 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3783 };
3784 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3785 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3786 };
3013} 3787}
3014 3788
3015{ 3789{
3790 # configure IO::AIO
3791
3016 IO::AIO::min_parallel 8; 3792 IO::AIO::min_parallel 8;
3017
3018 undef $Coro::AIO::WATCHER;
3019 IO::AIO::max_poll_time $TICK * 0.1; 3793 IO::AIO::max_poll_time $TICK * 0.1;
3020 $AIO_POLL_WATCHER = Event->io ( 3794 undef $AnyEvent::AIO::WATCHER;
3021 reentrant => 0,
3022 data => WF_AUTOCANCEL,
3023 fd => IO::AIO::poll_fileno,
3024 poll => 'r',
3025 prio => 6,
3026 cb => \&IO::AIO::poll_cb,
3027 );
3028} 3795}
3029 3796
3030my $_log_backtrace; 3797my $_log_backtrace;
3031 3798
3032sub _log_backtrace { 3799sub _log_backtrace {
… …
3036 3803
3037 # limit the # of concurrent backtraces 3804 # limit the # of concurrent backtraces
3038 if ($_log_backtrace < 2) { 3805 if ($_log_backtrace < 2) {
3039 ++$_log_backtrace; 3806 ++$_log_backtrace;
3040 async { 3807 async {
3808 $Coro::current->{desc} = "abt $msg";
3809
3041 my @bt = fork_call { 3810 my @bt = fork_call {
3042 @addr = map { sprintf "%x", $_ } @addr; 3811 @addr = map { sprintf "%x", $_ } @addr;
3043 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3812 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3044 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3813 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3045 or die "addr2line: $!"; 3814 or die "addr2line: $!";

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines