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.285 by root, Sun Jun 24 04:21:42 2007 UTC vs.
Revision 1.474 by root, Thu Jul 16 21:42:56 2009 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 qw(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
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
53use JSON::XS 2.01 ();
25use BDB (); 54use BDB ();
26use Data::Dumper; 55use Data::Dumper;
27use Digest::MD5; 56use Digest::MD5;
28use Fcntl; 57use Fcntl;
29use YAML::Syck (); 58use YAML ();
30use IO::AIO 2.32 (); 59use IO::AIO ();
31use Time::HiRes; 60use Time::HiRes;
32use Compress::LZF; 61use Compress::LZF;
62use Digest::MD5 ();
63
64AnyEvent::detect;
33 65
34# configure various modules to our taste 66# configure various modules to our taste
35# 67#
36$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 76
40$Event::Eval = 1; # no idea why this is required, but it is 77# strictly for debugging
41 78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
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
46 79
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 81
49our %COMMAND = (); 82our %COMMAND = ();
50our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
51 84
52our @EXTS = (); # list of extension package names 85our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 86our %EXTCMD = ();
87our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
56 90
57our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 92our @EVENT;
59 93
60our $CONFDIR = confdir; 94our $CONFDIR = confdir;
61our $DATADIR = datadir; 95our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 96our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 97our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 98our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 99our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 100our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 102our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 103our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 104our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime";
107
108our %RESOURCE;
71 109
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 110our $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 111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 112our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 113our $USE_FSYNC = 1; # use fsync to write maps - default on
79 114
115our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 117our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 118our $DB_ENV;
119
120our @EXTRA_MODULES = qw(pod mapscript);
82 121
83our %CFG; 122our %CFG;
84 123
85our $UPTIME; $UPTIME ||= time; 124our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 125our $RUNTIME;
126our $NOW;
87 127
88our %PLAYER; # all users 128our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 129our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 130our $LINK_MAP; # the special {link} map, which is always available
91 131
92# used to convert map paths into valid unix filenames by replacing / by ∕ 132# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 133our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 134
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 135our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 136our $LOADAVG; # same thing, but with alpha-smoothing
137our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 138our $TICK_START; # for load detecting purposes
139
140our @POST_INIT;
141
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :)
98 144
99binmode STDOUT; 145binmode STDOUT;
100binmode STDERR; 146binmode STDERR;
101 147
102# read virtual server time, if available 148# read virtual server time, if available
103unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 149unless ($RUNTIME || !-e $RUNTIMEFILE) {
104 open my $fh, "<", "$LOCALDIR/runtime" 150 open my $fh, "<", $RUNTIMEFILE
105 or die "unable to read runtime file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
106 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
107} 153}
154
155eval "sub TICK() { $TICK } 1" or die;
108 156
109mkdir $_ 157mkdir $_
110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
111 159
112our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
… …
155 203
156The raw value load value from the last tick. 204The raw value load value from the last tick.
157 205
158=item %cf::CFG 206=item %cf::CFG
159 207
160Configuration for the server, loaded from C</etc/crossfire/config>, or 208Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 209from wherever your confdir points to.
162 210
163=item cf::wait_for_tick, cf::wait_for_tick_begin 211=item cf::wait_for_tick, cf::wait_for_tick_begin
164 212
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 213These 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 214returns 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. 215per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 216
217=item @cf::INVOKE_RESULTS
218
219This array contains the results of the last C<invoke ()> call. When
220C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221that call.
222
169=back 223=back
170 224
171=cut 225=cut
172 226
173BEGIN { 227BEGIN {
… …
177 $msg .= "\n" 231 $msg .= "\n"
178 unless $msg =~ /\n$/; 232 unless $msg =~ /\n$/;
179 233
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 234 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 235
182 utf8::encode $msg;
183 LOG llevError, $msg; 236 LOG llevError, $msg;
184 }; 237 };
185} 238}
239
240$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "=="
242
243 if ($Coro::current == $Coro::main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d#
246 }#d#
247
248 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate
251};
252
253$SIG{__DIE__} = sub { }; #d#?
186 254
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
197for my $pkg (qw( 265for my $pkg (qw(
198 cf::global cf::attachable 266 cf::global cf::attachable
199 cf::object cf::object::player 267 cf::object cf::object::player
200 cf::client cf::player 268 cf::client cf::player
201 cf::arch cf::living 269 cf::arch cf::living
270 cf::map cf::mapspace
202 cf::map cf::party cf::region 271 cf::party cf::region
203)) { 272)) {
204 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 274}
207 275
208$Event::DIED = sub { 276$EV::DIED = sub {
209 warn "error in event callback: @_"; 277 warn "error in event callback: @_";
210}; 278};
211 279
212############################################################################# 280#############################################################################
213 281
… …
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 304 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 305 $d
238 } || "[unable to dump $_[0]: '$@']"; 306 } || "[unable to dump $_[0]: '$@']";
239} 307}
240 308
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 309=item $ref = cf::decode_json $json
244 310
245Converts a JSON string into the corresponding perl data structure. 311Converts a JSON string into the corresponding perl data structure.
246 312
247=item $json = cf::to_json $ref 313=item $json = cf::encode_json $ref
248 314
249Converts a perl data structure into its JSON representation. 315Converts a perl data structure into its JSON representation.
250 316
317=cut
318
319our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
320
321sub encode_json($) { $json_coder->encode ($_[0]) }
322sub decode_json($) { $json_coder->decode ($_[0]) }
323
324=item cf::post_init { BLOCK }
325
326Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327but I<before> the server starts ticking again.
328
329The cdoeblock will have a single boolean argument to indicate whether this
330is a reload or not.
331
332=cut
333
334sub post_init(&) {
335 push @POST_INIT, shift;
336}
337
251=item cf::lock_wait $string 338=item cf::lock_wait $string
252 339
253Wait until the given lock is available. See cf::lock_acquire. 340Wait until the given lock is available. See cf::lock_acquire.
254 341
255=item my $lock = cf::lock_acquire $string 342=item my $lock = cf::lock_acquire $string
256 343
257Wait until the given lock is available and then acquires it and returns 344Wait until the given lock is available and then acquires it and returns
258a Coro::guard object. If the guard object gets destroyed (goes out of scope, 345a L<Guard> object. If the guard object gets destroyed (goes out of scope,
259for example when the coroutine gets canceled), the lock is automatically 346for example when the coroutine gets canceled), the lock is automatically
260returned. 347returned.
261 348
349Locks are *not* recursive, locking from the same coro twice results in a
350deadlocked coro.
351
262Lock names should begin with a unique identifier (for example, cf::map::find 352Lock names should begin with a unique identifier (for example, cf::map::find
263uses map_find and cf::map::load uses map_load). 353uses map_find and cf::map::load uses map_load).
264 354
265=item $locked = cf::lock_active $string 355=item $locked = cf::lock_active $string
266 356
267Return true if the lock is currently active, i.e. somebody has locked it. 357Return true if the lock is currently active, i.e. somebody has locked it.
268 358
269=cut 359=cut
270 360
271our %LOCK; 361our $LOCKS = new Coro::SemaphoreSet;
272 362
273sub lock_wait($) { 363sub lock_wait($) {
274 my ($key) = @_; 364 $LOCKS->wait ($_[0]);
275
276 # wait for lock, if any
277 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule;
280 }
281} 365}
282 366
283sub lock_acquire($) { 367sub lock_acquire($) {
284 my ($key) = @_; 368 $LOCKS->guard ($_[0])
285
286 # wait, to be sure we are not locked
287 lock_wait $key;
288
289 $LOCK{$key} = [];
290
291 Coro::guard {
292 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} };
294 }
295} 369}
296 370
297sub lock_active($) { 371sub lock_active($) {
298 my ($key) = @_; 372 $LOCKS->count ($_[0]) < 1
299
300 ! ! $LOCK{$key}
301} 373}
302 374
303sub freeze_mainloop { 375sub freeze_mainloop {
304 return unless $TICK_WATCHER->is_active; 376 tick_inhibit_inc;
305 377
306 my $guard = Coro::guard { 378 &Guard::guard (\&tick_inhibit_dec);
307 $TICK_WATCHER->start; 379}
380
381=item cf::periodic $interval, $cb
382
383Like EV::periodic, but randomly selects a starting point so that the actions
384get spread over timer.
385
386=cut
387
388sub periodic($$) {
389 my ($interval, $cb) = @_;
390
391 my $start = rand List::Util::min 180, $interval;
392
393 EV::periodic $start, $interval, 0, $cb
394}
395
396=item cf::get_slot $time[, $priority[, $name]]
397
398Allocate $time seconds of blocking CPU time at priority C<$priority>:
399This call blocks and returns only when you have at least C<$time> seconds
400of cpu time till the next tick. The slot is only valid till the next cede.
401
402The optional C<$name> can be used to identify the job to run. It might be
403used for statistical purposes and should identify the same time-class.
404
405Useful for short background jobs.
406
407=cut
408
409our @SLOT_QUEUE;
410our $SLOT_QUEUE;
411
412$SLOT_QUEUE->cancel if $SLOT_QUEUE;
413$SLOT_QUEUE = Coro::async {
414 $Coro::current->desc ("timeslot manager");
415
416 my $signal = new Coro::Signal;
417
418 while () {
419 next_job:
420 my $avail = cf::till_tick;
421 if ($avail > 0.01) {
422 for (0 .. $#SLOT_QUEUE) {
423 if ($SLOT_QUEUE[$_][0] < $avail) {
424 my $job = splice @SLOT_QUEUE, $_, 1, ();
425 $job->[2]->send;
426 Coro::cede;
427 goto next_job;
428 }
429 }
430 }
431
432 if (@SLOT_QUEUE) {
433 # we do not use wait_for_tick() as it returns immediately when tick is inactive
434 push @cf::WAIT_FOR_TICK, $signal;
435 $signal->wait;
436 } else {
437 Coro::schedule;
438 }
308 }; 439 }
309 $TICK_WATCHER->stop; 440};
310 $guard 441
442sub get_slot($;$$) {
443 return if tick_inhibit || $Coro::current == $Coro::main;
444
445 my ($time, $pri, $name) = @_;
446
447 $time = $TICK * .6 if $time > $TICK * .6;
448 my $sig = new Coro::Signal;
449
450 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
451 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
452 $SLOT_QUEUE->ready;
453 $sig->wait;
311} 454}
312 455
313=item cf::async { BLOCK } 456=item cf::async { BLOCK }
314 457
315Currently the same as Coro::async_pool, meaning you cannot use 458Currently the same as Coro::async_pool, meaning you cannot use
… …
320 463
321BEGIN { *async = \&Coro::async_pool } 464BEGIN { *async = \&Coro::async_pool }
322 465
323=item cf::sync_job { BLOCK } 466=item cf::sync_job { BLOCK }
324 467
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 468The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 469is always able to handle events or runnable, as Deliantra is only
327partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 470partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable. 471acceptable.
329 472
330If it must be done, put the blocking parts into C<sync_job>. This will run 473If it must be done, put the blocking parts into C<sync_job>. This will run
331the given BLOCK in another coroutine while waiting for the result. The 474the given BLOCK in another coroutine while waiting for the result. The
… …
336 479
337sub sync_job(&) { 480sub sync_job(&) {
338 my ($job) = @_; 481 my ($job) = @_;
339 482
340 if ($Coro::current == $Coro::main) { 483 if ($Coro::current == $Coro::main) {
341 my $time = Event::time; 484 my $time = EV::time;
342 485
343 # this is the main coro, too bad, we have to block 486 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 487 # till the operation succeeds, freezing the server :/
345 488
346 # TODO: use suspend/resume instead 489 LOG llevError, Carp::longmess "sync job";#d#
347 # (but this is cancel-safe) 490
348 my $freeze_guard = freeze_mainloop; 491 my $freeze_guard = freeze_mainloop;
349 492
350 my $busy = 1; 493 my $busy = 1;
351 my @res; 494 my @res;
352 495
353 (async { 496 (async {
497 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 498 @res = eval { $job->() };
355 warn $@ if $@; 499 warn $@ if $@;
356 undef $busy; 500 undef $busy;
357 })->prio (Coro::PRIO_MAX); 501 })->prio (Coro::PRIO_MAX);
358 502
359 while ($busy) { 503 while ($busy) {
360 Coro::cede or Event::one_event; 504 if (Coro::nready) {
505 Coro::cede_notself;
506 } else {
507 EV::loop EV::LOOP_ONESHOT;
361 } 508 }
509 }
362 510
363 $time = Event::time - $time; 511 my $time = EV::time - $time;
364 512
365 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367
368 $tick_start += $time; # do not account sync jobs to server load 513 $TICK_START += $time; # do not account sync jobs to server load
369 514
370 wantarray ? @res : $res[0] 515 wantarray ? @res : $res[0]
371 } else { 516 } else {
372 # we are in another coroutine, how wonderful, everything just works 517 # we are in another coroutine, how wonderful, everything just works
373 518
… …
398=item fork_call { }, $args 543=item fork_call { }, $args
399 544
400Executes the given code block with the given arguments in a seperate 545Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 546process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 547Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 548never block itself or use any form of event handling.
404 549
405=cut 550=cut
406 551
407sub fork_call(&@) { 552sub fork_call(&@) {
408 my ($cb, @args) = @_; 553 my ($cb, @args) = @_;
409 554
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 555 # we seemingly have to make a local copy of the whole thing,
411# or die "socketpair: $!"; 556 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 557 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 558
415 if (my $pid = fork) { 559 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 560 reset_signals;
428 local $SIG{__WARN__}; 561 &$cb
429 local $SIG{__DIE__}; 562 }, @args;
430 eval {
431 close $fh1;
432 563
433 my @res = eval { $cb->(@args) }; 564 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 565}
435 };
436 566
437 warn $@ if $@; 567=item $coin = coin_from_name $name
438 _exit 0; 568
439 } 569=cut
570
571our %coin_alias = (
572 "silver" => "silvercoin",
573 "silvercoin" => "silvercoin",
574 "silvercoins" => "silvercoin",
575 "gold" => "goldcoin",
576 "goldcoin" => "goldcoin",
577 "goldcoins" => "goldcoin",
578 "platinum" => "platinacoin",
579 "platinumcoin" => "platinacoin",
580 "platinumcoins" => "platinacoin",
581 "platina" => "platinacoin",
582 "platinacoin" => "platinacoin",
583 "platinacoins" => "platinacoin",
584 "royalty" => "royalty",
585 "royalties" => "royalty",
586);
587
588sub coin_from_name($) {
589 $coin_alias{$_[0]}
590 ? cf::arch::find $coin_alias{$_[0]}
591 : undef
440} 592}
441 593
442=item $value = cf::db_get $family => $key 594=item $value = cf::db_get $family => $key
443 595
444Returns a single value from the environment database. 596Returns a single value from the environment database.
… …
446=item cf::db_put $family => $key => $value 598=item cf::db_put $family => $key => $value
447 599
448Stores the given C<$value> in the family. It can currently store binary 600Stores the given C<$value> in the family. It can currently store binary
449data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 601data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450 602
603=item $db = cf::db_table "name"
604
605Create and/or open a new database table. The string must not be "db" and must be unique
606within each server.
607
451=cut 608=cut
609
610sub db_table($) {
611 my ($name) = @_;
612 my $db = BDB::db_create $DB_ENV;
613
614 eval {
615 $db->set_flags (BDB::CHKSUM);
616
617 utf8::encode $name;
618 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
619 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
620 cf::cleanup "db_open(db): $!" if $!;
621 };
622 cf::cleanup "db_open(db): $@" if $@;
623
624 $db
625}
452 626
453our $DB; 627our $DB;
454 628
455sub db_init { 629sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 630 cf::sync_job {
460 eval { 631 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 632 };
470} 633}
471 634
472sub db_get($$) { 635sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 636 my $key = "$_[0]/$_[1]";
474 637
… …
524 if (1) { 687 if (1) {
525 $md5 = 688 $md5 =
526 join "\x00", 689 join "\x00",
527 $processversion, 690 $processversion,
528 map { 691 map {
529 Coro::cede; 692 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 693 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 694 } 0.. $#$src;
532 695
533 696
534 my $dbmd5 = db_get cache => "$id/md5"; 697 my $dbmd5 = db_get cache => "$id/md5";
… …
572 735
573############################################################################# 736#############################################################################
574 737
575=head2 ATTACHABLE OBJECTS 738=head2 ATTACHABLE OBJECTS
576 739
577Many objects in crossfire are so-called attachable objects. That means you can 740Many objects in deliantra are so-called attachable objects. That means you can
578attach callbacks/event handlers (a collection of which is called an "attachment") 741attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 742to it. All such attachable objects support the following methods.
580 743
581In the following description, CLASS can be any of C<global>, C<object> 744In the following description, CLASS can be any of C<global>, C<object>
582C<player>, C<client> or C<map> (i.e. the attachable objects in 745C<player>, C<client> or C<map> (i.e. the attachable objects in
583Crossfire TRT). 746Deliantra).
584 747
585=over 4 748=over 4
586 749
587=item $attachable->attach ($attachment, key => $value...) 750=item $attachable->attach ($attachment, key => $value...)
588 751
… …
632=item cf::CLASS::attachment $name, ... 795=item cf::CLASS::attachment $name, ...
633 796
634Register an attachment by C<$name> through which attachable objects of the 797Register an attachment by C<$name> through which attachable objects of the
635given CLASS can refer to this attachment. 798given CLASS can refer to this attachment.
636 799
637Some classes such as crossfire maps and objects can specify attachments 800Some classes such as deliantra maps and objects can specify attachments
638that are attached at load/instantiate time, thus the need for a name. 801that are attached at load/instantiate time, thus the need for a name.
639 802
640These calls expect any number of the following handler/hook descriptions: 803These calls expect any number of the following handler/hook descriptions:
641 804
642=over 4 805=over 4
… …
840 "; 1003 ";
841 die if $@; 1004 die if $@;
842} 1005}
843 1006
844our $override; 1007our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1008our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 1009
847sub override { 1010sub override {
848 $override = 1; 1011 $override = 1;
849 @invoke_results = (); 1012 @INVOKE_RESULTS = (@_);
850} 1013}
851 1014
852sub do_invoke { 1015sub do_invoke {
853 my $event = shift; 1016 my $event = shift;
854 my $callbacks = shift; 1017 my $callbacks = shift;
855 1018
856 @invoke_results = (); 1019 @INVOKE_RESULTS = ();
857 1020
858 local $override; 1021 local $override;
859 1022
860 for (@$callbacks) { 1023 for (@$callbacks) {
861 eval { &{$_->[1]} }; 1024 eval { &{$_->[1]} };
… …
870 } 1033 }
871 1034
872 0 1035 0
873} 1036}
874 1037
875=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1038=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
876 1039
877=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1040=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
878 1041
879Generate an object-specific event with the given arguments. 1042Generate an object-specific event with the given arguments.
880 1043
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1044This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 1045removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 1046results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 1047
885=back 1048=back
886 1049
887=cut 1050=cut
888 1051
889############################################################################# 1052#############################################################################
890# object support 1053# object support
1054
1055sub _object_equal($$);
1056sub _object_equal($$) {
1057 my ($a, $b) = @_;
1058
1059 return 0 unless (ref $a) eq (ref $b);
1060
1061 if ("HASH" eq ref $a) {
1062 my @ka = keys %$a;
1063 my @kb = keys %$b;
1064
1065 return 0 if @ka != @kb;
1066
1067 for (0 .. $#ka) {
1068 return 0 unless $ka[$_] eq $kb[$_];
1069 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1070 }
1071
1072 } elsif ("ARRAY" eq ref $a) {
1073
1074 return 0 if @$a != @$b;
1075
1076 for (0 .. $#$a) {
1077 return 0 unless _object_equal $a->[$_], $b->[$_];
1078 }
1079
1080 } elsif ($a ne $b) {
1081 return 0;
1082 }
1083
1084 1
1085}
1086
1087our $SLOW_MERGES;#d#
1088sub _can_merge {
1089 my ($ob1, $ob2) = @_;
1090
1091 ++$SLOW_MERGES;#d#
1092
1093 # we do the slow way here
1094 return _object_equal $ob1, $ob2
1095}
891 1096
892sub reattach { 1097sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1098 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1099 my ($obj) = @_;
895 1100
1101 # no longer needed after getting rid of delete_package?
896 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1102 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
897 1103
898 my $registry = $obj->registry; 1104 my $registry = $obj->registry;
899 1105
900 @$registry = (); 1106 @$registry = ();
901 1107
… …
916cf::attachable->attach ( 1122cf::attachable->attach (
917 prio => -1000000, 1123 prio => -1000000,
918 on_instantiate => sub { 1124 on_instantiate => sub {
919 my ($obj, $data) = @_; 1125 my ($obj, $data) = @_;
920 1126
921 $data = from_json $data; 1127 $data = decode_json $data;
922 1128
923 for (@$data) { 1129 for (@$data) {
924 my ($name, $args) = @$_; 1130 my ($name, $args) = @$_;
925 1131
926 $obj->attach ($name, %{$args || {} }); 1132 $obj->attach ($name, %{$args || {} });
… …
942sub object_freezer_save { 1148sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1149 my ($filename, $rdata, $objs) = @_;
944 1150
945 sync_job { 1151 sync_job {
946 if (length $$rdata) { 1152 if (length $$rdata) {
1153 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1154 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1155 $decname, length $$rdata, scalar @$objs;
949 1156
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1158 aio_chmod $fh, SAVE_MODE;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1160 if ($cf::USE_FSYNC) {
1161 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1162 aio_fsync $fh;
1163 }
954 close $fh; 1164 aio_close $fh;
955 1165
956 if (@$objs) { 1166 if (@$objs) {
957 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1167 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1168 aio_chmod $fh, SAVE_MODE;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1169 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1170 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1171 if ($cf::USE_FSYNC) {
1172 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1173 aio_fsync $fh;
1174 }
962 close $fh; 1175 aio_close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1176 aio_rename "$filename.pst~", "$filename.pst";
964 } 1177 }
965 } else { 1178 } else {
966 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
967 } 1180 }
968 1181
969 aio_rename "$filename~", $filename; 1182 aio_rename "$filename~", $filename;
1183
1184 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC;
970 } else { 1186 } else {
971 warn "FATAL: $filename~: $!\n"; 1187 warn "unable to save objects: $filename~: $!\n";
972 } 1188 }
973 } else { 1189 } else {
974 aio_unlink $filename; 1190 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1191 aio_unlink "$filename.pst";
976 } 1192 }
977 } 1193 };
978} 1194}
979 1195
980sub object_freezer_as_string { 1196sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1197 my ($rdata, $objs) = @_;
982 1198
… …
994 or return; 1210 or return;
995 1211
996 unless (aio_stat "$filename.pst") { 1212 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1213 (aio_load "$filename.pst", $av) >= 0
998 or return; 1214 or return;
1215
999 $av = eval { (Storable::thaw $av)->{objs} }; 1216 my $st = eval { Coro::Storable::thaw $av };
1217 $av = $st->{objs};
1000 } 1218 }
1001 1219
1220 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1221 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1222 $decname, length $data, scalar @{$av || []};
1223
1004 return ($data, $av); 1224 ($data, $av)
1005} 1225}
1006 1226
1007=head2 COMMAND CALLBACKS 1227=head2 COMMAND CALLBACKS
1008 1228
1009=over 4 1229=over 4
… …
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1249 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1250}
1031 1251
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1252=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1253
1034Register a callback fro execution when the client sends an extcmd packet. 1254Register a callback for execution when the client sends an (synchronous)
1255extcmd packet. Ext commands will be processed in the order they are
1256received by the server, like other user commands. The first argument is
1257the logged-in player. Ext commands can only be processed after a player
1258has logged in successfully.
1035 1259
1036If the callback returns something, it is sent back as if reply was being 1260If the callback returns something, it is sent back as if reply was being
1037called. 1261called.
1038 1262
1263=item cf::register_exticmd $name => \&callback($ns,$packet);
1264
1265Register a callback for execution when the client sends an (asynchronous)
1266exticmd packet. Exti commands are processed by the server as soon as they
1267are received, i.e. out of order w.r.t. other commands. The first argument
1268is a client socket. Exti commands can be received anytime, even before
1269log-in.
1270
1271If the callback returns something, it is sent back as if reply was being
1272called.
1273
1039=cut 1274=cut
1040 1275
1041sub register_extcmd { 1276sub register_extcmd {
1042 my ($name, $cb) = @_; 1277 my ($name, $cb) = @_;
1043 1278
1044 $EXTCMD{$name} = $cb; 1279 $EXTCMD{$name} = $cb;
1045} 1280}
1281
1282sub register_exticmd {
1283 my ($name, $cb) = @_;
1284
1285 $EXTICMD{$name} = $cb;
1286}
1287
1288use File::Glob ();
1046 1289
1047cf::player->attach ( 1290cf::player->attach (
1048 on_command => sub { 1291 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1292 my ($pl, $name, $params) = @_;
1050 1293
… …
1058 cf::override; 1301 cf::override;
1059 }, 1302 },
1060 on_extcmd => sub { 1303 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1304 my ($pl, $buf) = @_;
1062 1305
1063 my $msg = eval { from_json $buf }; 1306 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1307
1065 if (ref $msg) { 1308 if (ref $msg) {
1309 my ($type, $reply, @payload) =
1310 "ARRAY" eq ref $msg
1311 ? @$msg
1312 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1313
1314 my @reply;
1315
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1316 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1317 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1318 }
1319
1320 $pl->ext_reply ($reply, @reply)
1321 if $reply;
1322
1071 } else { 1323 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1324 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1325 }
1074 1326
1075 cf::override; 1327 cf::override;
1076 }, 1328 },
1077); 1329);
1330
1331# "readahead" all extensions
1332sub cache_extensions {
1333 my $grp = IO::AIO::aio_group;
1334
1335 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1336 for (grep /\.ext$/, @{$_[0]}) {
1337 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1338 }
1339 };
1340
1341 $grp
1342}
1078 1343
1079sub load_extensions { 1344sub load_extensions {
1080 cf::sync_job { 1345 cf::sync_job {
1081 my %todo; 1346 my %todo;
1082 1347
… …
1102 1367
1103 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1368 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1104 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1369 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1105 1370
1106 $ext{source} = 1371 $ext{source} =
1107 "package $pkg; use strict; use utf8;\n" 1372 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1108 . "#line 1 \"$path\"\n{\n" 1373 . "#line 1 \"$path\"\n{\n"
1109 . $source 1374 . $source
1110 . "\n};\n1"; 1375 . "\n};\n1";
1111 1376
1112 $todo{$base} = \%ext; 1377 $todo{$base} = \%ext;
… …
1128 my $msg = $@ ? "$v->{path}: $@\n" 1393 my $msg = $@ ? "$v->{path}: $@\n"
1129 : "$v->{base}: extension inactive.\n"; 1394 : "$v->{base}: extension inactive.\n";
1130 1395
1131 if (exists $v->{meta}{mandatory}) { 1396 if (exists $v->{meta}{mandatory}) {
1132 warn $msg; 1397 warn $msg;
1133 warn "mandatory extension failed to load, exiting.\n"; 1398 cf::cleanup "mandatory extension failed to load, exiting.";
1134 exit 1;
1135 } 1399 }
1136 1400
1137 warn $msg; 1401 warn $msg;
1138 } 1402 }
1139 1403
… …
1153 1417
1154=back 1418=back
1155 1419
1156=head2 CORE EXTENSIONS 1420=head2 CORE EXTENSIONS
1157 1421
1158Functions and methods that extend core crossfire objects. 1422Functions and methods that extend core deliantra objects.
1159 1423
1160=cut 1424=cut
1161 1425
1162package cf::player; 1426package cf::player;
1163 1427
1164use Coro::AIO; 1428use Coro::AIO;
1165 1429
1166=head3 cf::player 1430=head3 cf::player
1167 1431
1168=over 4 1432=over 4
1433
1434=item cf::player::num_playing
1435
1436Returns the official number of playing players, as per the Crossfire metaserver rules.
1437
1438=cut
1439
1440sub num_playing {
1441 scalar grep
1442 $_->ob->map
1443 && !$_->hidden
1444 && !$_->ob->flag (cf::FLAG_WIZ),
1445 cf::player::list
1446}
1169 1447
1170=item cf::player::find $login 1448=item cf::player::find $login
1171 1449
1172Returns the given player object, loading it if necessary (might block). 1450Returns the given player object, loading it if necessary (might block).
1173 1451
… …
1192 1470
1193sub exists($) { 1471sub exists($) {
1194 my ($login) = @_; 1472 my ($login) = @_;
1195 1473
1196 $cf::PLAYER{$login} 1474 $cf::PLAYER{$login}
1197 or cf::sync_job { !aio_stat path $login } 1475 or !aio_stat path $login
1198} 1476}
1199 1477
1200sub find($) { 1478sub find($) {
1201 return $cf::PLAYER{$_[0]} || do { 1479 return $cf::PLAYER{$_[0]} || do {
1202 my $login = $_[0]; 1480 my $login = $_[0];
… …
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1487 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1488 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1489 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1490 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1491
1214 my $pl = load_pl path $login 1492 my $f = new_from_file cf::object::thawer path $login
1215 or return; 1493 or return;
1494
1495 my $pl = cf::player::load_pl $f
1496 or return;
1497
1498 local $cf::PLAYER_LOADING{$login} = $pl;
1499 $f->resolve_delayed_derefs;
1216 $cf::PLAYER{$login} = $pl 1500 $cf::PLAYER{$login} = $pl
1217 } 1501 }
1218 } 1502 }
1219} 1503}
1220 1504
… …
1229 return if $pl->{deny_save}; 1513 return if $pl->{deny_save};
1230 1514
1231 aio_mkdir playerdir $pl, 0770; 1515 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1516 $pl->{last_save} = $cf::RUNTIME;
1233 1517
1518 cf::get_slot 0.01;
1519
1234 $pl->save_pl ($path); 1520 $pl->save_pl ($path);
1235 Coro::cede; 1521 cf::cede_to_tick;
1236} 1522}
1237 1523
1238sub new($) { 1524sub new($) {
1239 my ($login) = @_; 1525 my ($login) = @_;
1240 1526
… …
1246 $cf::PLAYER{$login} = $self; 1532 $cf::PLAYER{$login} = $self;
1247 1533
1248 $self 1534 $self
1249} 1535}
1250 1536
1537=item $player->send_msg ($channel, $msg, $color, [extra...])
1538
1539=cut
1540
1541sub send_msg {
1542 my $ns = shift->ns
1543 or return;
1544 $ns->send_msg (@_);
1545}
1546
1251=item $pl->quit_character 1547=item $pl->quit_character
1252 1548
1253Nukes the player without looking back. If logged in, the connection will 1549Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time. 1550be destroyed. May block for a long time.
1255 1551
… …
1259 my ($pl) = @_; 1555 my ($pl) = @_;
1260 1556
1261 my $name = $pl->ob->name; 1557 my $name = $pl->ob->name;
1262 1558
1263 $pl->{deny_save} = 1; 1559 $pl->{deny_save} = 1;
1264 $pl->password ("*"); # this should lock out the player until we nuked the dir 1560 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1265 1561
1266 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1267 $pl->deactivate; 1563 $pl->deactivate;
1564 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1565 $pl->ob->check_score;
1268 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1566 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1269 $pl->ns->destroy if $pl->ns; 1567 $pl->ns->destroy if $pl->ns;
1270 1568
1271 my $path = playerdir $pl; 1569 my $path = playerdir $pl;
1272 my $temp = "$path~$cf::RUNTIME~deleting~"; 1570 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1308 or return []; 1606 or return [];
1309 1607
1310 my @logins; 1608 my @logins;
1311 1609
1312 for my $login (@$dirs) { 1610 for my $login (@$dirs) {
1611 my $path = path $login;
1612
1613 # a .pst is a dead give-away for a valid player
1614 # if no pst file found, open and chekc for blocked users
1615 if (aio_stat "$path.pst") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1616 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1617 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1618 $buf !~ /^password -------------$/m or next; # official not-valid tag
1619 }
1316 1620
1317 utf8::decode $login; 1621 utf8::decode $login;
1318 push @logins, $login; 1622 push @logins, $login;
1319 } 1623 }
1320 1624
… …
1347 } 1651 }
1348 1652
1349 \@paths 1653 \@paths
1350} 1654}
1351 1655
1352=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1656=item $protocol_xml = $player->expand_cfpod ($cfpod)
1353 1657
1354Expand crossfire pod fragments into protocol xml. 1658Expand deliantra pod fragments into protocol xml.
1355 1659
1356=cut
1357
1358sub expand_cfpod {
1359 ((my $self), (local $_)) = @_;
1360
1361 # escape & and <
1362 s/&/&amp;/g;
1363 s/(?<![BIUGH])</&lt;/g;
1364
1365 # this is buggy, it needs to properly take care of nested <'s
1366
1367 1 while
1368 # replace B<>, I<>, U<> etc.
1369 s/B<([^\>]*)>/<b>$1<\/b>/
1370 || s/I<([^\>]*)>/<i>$1<\/i>/
1371 || s/U<([^\>]*)>/<u>$1<\/u>/
1372 # replace G<male|female> tags
1373 || s{G<([^>|]*)\|([^>]*)>}{
1374 $self->gender ? $2 : $1
1375 }ge
1376 # replace H<hint text>
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1378
1379 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g;
1381
1382 $_
1383}
1384
1385=item $player->ext_reply ($msgid, %msg) 1660=item $player->ext_reply ($msgid, @msg)
1386 1661
1387Sends an ext reply to the player. 1662Sends an ext reply to the player.
1388 1663
1389=cut 1664=cut
1390 1665
1391sub ext_reply($$%) { 1666sub ext_reply($$@) {
1392 my ($self, $id, %msg) = @_; 1667 my ($self, $id, @msg) = @_;
1393 1668
1394 $msg{msgid} = $id; 1669 $self->ns->ext_reply ($id, @msg)
1395
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1670}
1398 1671
1399=item $player->ext_event ($type, %msg) 1672=item $player->ext_msg ($type, @msg)
1400 1673
1401Sends an ext event to the client. 1674Sends an ext event to the client.
1402 1675
1403=cut 1676=cut
1404 1677
1405sub ext_event($$%) { 1678sub ext_msg($$@) {
1406 my ($self, $type, %msg) = @_; 1679 my ($self, $type, @msg) = @_;
1407 1680
1408 $self->ns->ext_event ($type, %msg); 1681 $self->ns->ext_msg ($type, @msg);
1409} 1682}
1410 1683
1411=head3 cf::region 1684=head3 cf::region
1412 1685
1413=over 4 1686=over 4
… …
1426 my ($path) = @_; 1699 my ($path) = @_;
1427 1700
1428 my ($match, $specificity); 1701 my ($match, $specificity);
1429 1702
1430 for my $region (list) { 1703 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1704 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1705 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1706 if $region->specificity > $specificity;
1434 } 1707 }
1435 } 1708 }
1436 1709
… …
1457our $MAX_RESET = 3600; 1730our $MAX_RESET = 3600;
1458our $DEFAULT_RESET = 3000; 1731our $DEFAULT_RESET = 3000;
1459 1732
1460sub generate_random_map { 1733sub generate_random_map {
1461 my ($self, $rmp) = @_; 1734 my ($self, $rmp) = @_;
1735
1736 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1737
1462 # mit "rum" bekleckern, nicht 1738 # mit "rum" bekleckern, nicht
1463 $self->_create_random_map ( 1739 $self->_create_random_map (
1464 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1465 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1466 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1556 $self->init; # pass $1 etc. 1832 $self->init; # pass $1 etc.
1557 return $self; 1833 return $self;
1558 } 1834 }
1559 } 1835 }
1560 1836
1561 Carp::carp "unable to resolve path '$path' (base '$base')."; 1837 Carp::cluck "unable to resolve path '$path' (base '$base').";
1562 () 1838 ()
1563} 1839}
1564 1840
1565sub init { 1841sub init {
1566 my ($self) = @_; 1842 my ($self) = @_;
… …
1588 1864
1589# the temporary/swap location 1865# the temporary/swap location
1590sub save_path { 1866sub save_path {
1591 my ($self) = @_; 1867 my ($self) = @_;
1592 1868
1593 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1869 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1594 "$TMPDIR/$path.map" 1870 "$TMPDIR/$path.map"
1595} 1871}
1596 1872
1597# the unique path, undef == no special unique path 1873# the unique path, undef == no special unique path
1598sub uniq_path { 1874sub uniq_path {
1599 my ($self) = @_; 1875 my ($self) = @_;
1600 1876
1601 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1877 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1602 "$UNIQUEDIR/$path" 1878 "$UNIQUEDIR/$path"
1603}
1604
1605# and all this just because we cannot iterate over
1606# all maps in C++...
1607sub change_all_map_light {
1608 my ($change) = @_;
1609
1610 $_->change_map_light ($change)
1611 for grep $_->outdoor, values %cf::MAP;
1612} 1879}
1613 1880
1614sub decay_objects { 1881sub decay_objects {
1615 my ($self) = @_; 1882 my ($self) = @_;
1616 1883
… …
1629 1896
1630sub load_header_from($) { 1897sub load_header_from($) {
1631 my ($self, $path) = @_; 1898 my ($self, $path) = @_;
1632 1899
1633 utf8::encode $path; 1900 utf8::encode $path;
1634 #aio_open $path, O_RDONLY, 0 1901 my $f = new_from_file cf::object::thawer $path
1635 # or return;
1636
1637 $self->_load_header ($path)
1638 or return; 1902 or return;
1903
1904 $self->_load_header ($f)
1905 or return;
1906
1907 local $MAP_LOADING{$self->{path}} = $self;
1908 $f->resolve_delayed_derefs;
1639 1909
1640 $self->{load_path} = $path; 1910 $self->{load_path} = $path;
1641 1911
1642 1 1912 1
1643} 1913}
… …
1697sub find { 1967sub find {
1698 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1699 1969
1700 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1701 1971
1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1702 cf::lock_wait "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
1703 1974
1704 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1705 my $guard = cf::lock_acquire "map_find:$path";
1706 my $map = new_from_path cf::map $path 1976 my $map = new_from_path cf::map $path
1707 or return; 1977 or return;
1708 1978
1709 $map->{last_save} = $cf::RUNTIME; 1979 $map->{last_save} = $cf::RUNTIME;
1710 1980
… …
1712 or return; 1982 or return;
1713 1983
1714 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1984 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715 # doing this can freeze the server in a sync job, obviously 1985 # doing this can freeze the server in a sync job, obviously
1716 #$cf::WAIT_FOR_TICK->wait; 1986 #$cf::WAIT_FOR_TICK->wait;
1987 undef $guard2;
1988 undef $guard1;
1717 $map->reset; 1989 $map->reset;
1718 undef $guard;
1719 return find $path; 1990 return find $path;
1720 } 1991 }
1721 1992
1722 $cf::MAP{$path} = $map 1993 $cf::MAP{$path} = $map
1723 } 1994 }
… …
1732 local $self->{deny_reset} = 1; # loading can take a long time 2003 local $self->{deny_reset} = 1; # loading can take a long time
1733 2004
1734 my $path = $self->{path}; 2005 my $path = $self->{path};
1735 2006
1736 { 2007 {
1737 my $guard = cf::lock_acquire "map_load:$path"; 2008 my $guard = cf::lock_acquire "map_data:$path";
1738 2009
2010 return unless $self->valid;
1739 return if $self->in_memory != cf::MAP_SWAPPED; 2011 return unless $self->in_memory == cf::MAP_SWAPPED;
1740 2012
1741 $self->in_memory (cf::MAP_LOADING); 2013 $self->in_memory (cf::MAP_LOADING);
1742 2014
1743 $self->alloc; 2015 $self->alloc;
1744 2016
1745 $self->pre_load; 2017 $self->pre_load;
1746 Coro::cede; 2018 cf::cede_to_tick;
1747 2019
2020 my $f = new_from_file cf::object::thawer $self->{load_path};
2021 $f->skip_block;
1748 $self->_load_objects ($self->{load_path}, 1) 2022 $self->_load_objects ($f)
1749 or return; 2023 or return;
1750 2024
1751 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2025 $self->post_load_original
1752 if delete $self->{load_original}; 2026 if delete $self->{load_original};
1753 2027
1754 if (my $uniq = $self->uniq_path) { 2028 if (my $uniq = $self->uniq_path) {
1755 utf8::encode $uniq; 2029 utf8::encode $uniq;
1756 if (aio_open $uniq, O_RDONLY, 0) { 2030 unless (aio_stat $uniq) {
2031 if (my $f = new_from_file cf::object::thawer $uniq) {
1757 $self->clear_unique_items; 2032 $self->clear_unique_items;
1758 $self->_load_objects ($uniq, 0); 2033 $self->_load_objects ($f);
2034 $f->resolve_delayed_derefs;
2035 }
1759 } 2036 }
1760 } 2037 }
1761 2038
1762 Coro::cede; 2039 $f->resolve_delayed_derefs;
2040
2041 cf::cede_to_tick;
1763 # now do the right thing for maps 2042 # now do the right thing for maps
1764 $self->link_multipart_objects; 2043 $self->link_multipart_objects;
1765 $self->difficulty ($self->estimate_difficulty) 2044 $self->difficulty ($self->estimate_difficulty)
1766 unless $self->difficulty; 2045 unless $self->difficulty;
1767 Coro::cede; 2046 cf::cede_to_tick;
1768 2047
1769 unless ($self->{deny_activate}) { 2048 unless ($self->{deny_activate}) {
1770 $self->decay_objects; 2049 $self->decay_objects;
1771 $self->fix_auto_apply; 2050 $self->fix_auto_apply;
1772 $self->update_buttons; 2051 $self->update_buttons;
1773 Coro::cede; 2052 cf::cede_to_tick;
1774 $self->set_darkness_map;
1775 Coro::cede;
1776 $self->activate; 2053 $self->activate;
1777 } 2054 }
1778 2055
2056 $self->{last_save} = $cf::RUNTIME;
2057 $self->last_access ($cf::RUNTIME);
2058
1779 $self->in_memory (cf::MAP_IN_MEMORY); 2059 $self->in_memory (cf::MAP_ACTIVE);
1780 } 2060 }
1781 2061
1782 $self->post_load; 2062 $self->post_load;
1783} 2063}
1784 2064
… …
1793 2073
1794 $self 2074 $self
1795} 2075}
1796 2076
1797# find and load all maps in the 3x3 area around a map 2077# find and load all maps in the 3x3 area around a map
1798sub load_diag { 2078sub load_neighbours {
1799 my ($map) = @_; 2079 my ($map) = @_;
1800 2080
1801 my @diag; # diagonal neighbours 2081 my @neigh; # diagonal neighbours
1802 2082
1803 for (0 .. 3) { 2083 for (0 .. 3) {
1804 my $neigh = $map->tile_path ($_) 2084 my $neigh = $map->tile_path ($_)
1805 or next; 2085 or next;
1806 $neigh = find $neigh, $map 2086 $neigh = find $neigh, $map
1807 or next; 2087 or next;
1808 $neigh->load; 2088 $neigh->load;
1809 2089
2090 push @neigh,
1810 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2091 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1811 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2092 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1812 } 2093 }
1813 2094
1814 for (@diag) { 2095 for (grep defined $_->[0], @neigh) {
2096 my ($path, $origin) = @$_;
1815 my $neigh = find @$_ 2097 my $neigh = find $path, $origin
1816 or next; 2098 or next;
1817 $neigh->load; 2099 $neigh->load;
1818 } 2100 }
1819} 2101}
1820 2102
… …
1825} 2107}
1826 2108
1827sub do_load_sync { 2109sub do_load_sync {
1828 my ($map) = @_; 2110 my ($map) = @_;
1829 2111
2112 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2113 if $Coro::current == $Coro::main;
2114
1830 cf::sync_job { $map->load }; 2115 cf::sync_job { $map->load };
1831} 2116}
1832 2117
1833our %MAP_PREFETCH; 2118our %MAP_PREFETCH;
1834our $MAP_PREFETCHER = undef; 2119our $MAP_PREFETCHER = undef;
1835 2120
1836sub find_async { 2121sub find_async {
1837 my ($path, $origin) = @_; 2122 my ($path, $origin, $load) = @_;
1838 2123
1839 $path = normalise $path, $origin && $origin->{path}; 2124 $path = normalise $path, $origin && $origin->{path};
1840 2125
1841 if (my $map = $cf::MAP{$path}) { 2126 if (my $map = $cf::MAP{$path}) {
1842 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2127 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1843 } 2128 }
1844 2129
1845 undef $MAP_PREFETCH{$path}; 2130 $MAP_PREFETCH{$path} |= $load;
2131
1846 $MAP_PREFETCHER ||= cf::async { 2132 $MAP_PREFETCHER ||= cf::async {
2133 $Coro::current->{desc} = "map prefetcher";
2134
1847 while (%MAP_PREFETCH) { 2135 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) { 2136 while (my ($k, $v) = each %MAP_PREFETCH) {
1849 my $map = find $path 2137 if (my $map = find $k) {
1850 or next;
1851 $map->load; 2138 $map->load if $v;
2139 }
1852 2140
1853 delete $MAP_PREFETCH{$path}; 2141 delete $MAP_PREFETCH{$k};
1854 } 2142 }
1855 } 2143 }
1856 undef $MAP_PREFETCHER; 2144 undef $MAP_PREFETCHER;
1857 }; 2145 };
1858 $MAP_PREFETCHER->prio (6); 2146 $MAP_PREFETCHER->prio (6);
… …
1861} 2149}
1862 2150
1863sub save { 2151sub save {
1864 my ($self) = @_; 2152 my ($self) = @_;
1865 2153
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2154 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2155
1868 $self->{last_save} = $cf::RUNTIME; 2156 $self->{last_save} = $cf::RUNTIME;
1869 2157
1870 return unless $self->dirty; 2158 return unless $self->dirty;
1871 2159
… …
1877 return if $self->{deny_save}; 2165 return if $self->{deny_save};
1878 2166
1879 local $self->{last_access} = $self->last_access;#d# 2167 local $self->{last_access} = $self->last_access;#d#
1880 2168
1881 cf::async { 2169 cf::async {
2170 $Coro::current->{desc} = "map player save";
1882 $_->contr->save for $self->players; 2171 $_->contr->save for $self->players;
1883 }; 2172 };
2173
2174 cf::get_slot 0.02;
1884 2175
1885 if ($uniq) { 2176 if ($uniq) {
1886 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1887 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2178 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1888 } else { 2179 } else {
… …
1894 my ($self) = @_; 2185 my ($self) = @_;
1895 2186
1896 # save first because save cedes 2187 # save first because save cedes
1897 $self->save; 2188 $self->save;
1898 2189
1899 my $lock = cf::lock_acquire "map_data:" . $self->path; 2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
1900 2191
1901 return if $self->players; 2192 return if $self->players;
1902 return if $self->in_memory != cf::MAP_IN_MEMORY; 2193 return if $self->in_memory != cf::MAP_ACTIVE;
1903 return if $self->{deny_save}; 2194 return if $self->{deny_save};
1904 2195
2196 $self->in_memory (cf::MAP_SWAPPED);
2197
2198 $self->deactivate;
2199 $_->clear_links_to ($self) for values %cf::MAP;
1905 $self->clear; 2200 $self->clear;
1906 $self->in_memory (cf::MAP_SWAPPED);
1907} 2201}
1908 2202
1909sub reset_at { 2203sub reset_at {
1910 my ($self) = @_; 2204 my ($self) = @_;
1911 2205
… …
1943 if $uniq; 2237 if $uniq;
1944 } 2238 }
1945 2239
1946 delete $cf::MAP{$self->path}; 2240 delete $cf::MAP{$self->path};
1947 2241
2242 $self->deactivate;
2243 $_->clear_links_to ($self) for values %cf::MAP;
1948 $self->clear; 2244 $self->clear;
1949
1950 $_->clear_links_to ($self) for values %cf::MAP;
1951 2245
1952 $self->unlink_save; 2246 $self->unlink_save;
1953 $self->destroy; 2247 $self->destroy;
1954} 2248}
1955 2249
1956my $nuke_counter = "aaaa"; 2250my $nuke_counter = "aaaa";
1957 2251
1958sub nuke { 2252sub nuke {
1959 my ($self) = @_; 2253 my ($self) = @_;
1960 2254
2255 {
2256 my $lock = cf::lock_acquire "map_data:$self->{path}";
2257
1961 delete $cf::MAP{$self->path}; 2258 delete $cf::MAP{$self->path};
1962 2259
1963 $self->unlink_save; 2260 $self->unlink_save;
1964 2261
1965 bless $self, "cf::map"; 2262 bless $self, "cf::map";
1966 delete $self->{deny_reset}; 2263 delete $self->{deny_reset};
1967 $self->{deny_save} = 1; 2264 $self->{deny_save} = 1;
1968 $self->reset_timeout (1); 2265 $self->reset_timeout (1);
1969 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2266 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970 2267
1971 $cf::MAP{$self->path} = $self; 2268 $cf::MAP{$self->path} = $self;
2269 }
1972 2270
1973 $self->reset; # polite request, might not happen 2271 $self->reset; # polite request, might not happen
1974} 2272}
1975 2273
1976=item $maps = cf::map::tmp_maps 2274=item $maps = cf::map::tmp_maps
… …
2018 2316
2019sub unique_maps() { 2317sub unique_maps() {
2020 [ 2318 [
2021 map { 2319 map {
2022 utf8::decode $_; 2320 utf8::decode $_;
2023 /\.map$/ 2321 s/\.map$//; # TODO future compatibility hack
2322 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2323 ? ()
2024 ? normalise $_ 2324 : normalise $_
2025 : ()
2026 } @{ aio_readdir $UNIQUEDIR or [] } 2325 } @{ aio_readdir $UNIQUEDIR or [] }
2027 ] 2326 ]
2028} 2327}
2029 2328
2030package cf;
2031
2032=back 2329=back
2033 2330
2034=head3 cf::object 2331=head3 cf::object
2035 2332
2036=cut 2333=cut
… …
2039 2336
2040=over 4 2337=over 4
2041 2338
2042=item $ob->inv_recursive 2339=item $ob->inv_recursive
2043 2340
2044Returns the inventory of the object _and_ their inventories, recursively. 2341Returns the inventory of the object I<and> their inventories, recursively,
2342but I<not> the object itself.
2045 2343
2046=cut 2344=cut
2047 2345
2048sub inv_recursive_; 2346sub inv_recursive_;
2049sub inv_recursive_ { 2347sub inv_recursive_ {
… …
2052 2350
2053sub inv_recursive { 2351sub inv_recursive {
2054 inv_recursive_ inv $_[0] 2352 inv_recursive_ inv $_[0]
2055} 2353}
2056 2354
2355=item $ref = $ob->ref
2356
2357Creates and returns a persistent reference to an object that can be stored as a string.
2358
2359=item $ob = cf::object::deref ($refstring)
2360
2361returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2362even if the object actually exists. May block.
2363
2364=cut
2365
2366sub deref {
2367 my ($ref) = @_;
2368
2369 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2370 my ($uuid, $name) = ($1, $2);
2371 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2372 or return;
2373 $pl->ob->uuid eq $uuid
2374 or return;
2375
2376 $pl->ob
2377 } else {
2378 warn "$ref: cannot resolve object reference\n";
2379 undef
2380 }
2381}
2382
2057package cf; 2383package cf;
2058 2384
2059=back 2385=back
2060 2386
2061=head3 cf::object::player 2387=head3 cf::object::player
… …
2067Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2393Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2068can be C<undef>. Does the right thing when the player is currently in a 2394can be C<undef>. Does the right thing when the player is currently in a
2069dialogue with the given NPC character. 2395dialogue with the given NPC character.
2070 2396
2071=cut 2397=cut
2398
2399our $SAY_CHANNEL = {
2400 id => "say",
2401 title => "Map",
2402 reply => "say ",
2403 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2404};
2405
2406our $CHAT_CHANNEL = {
2407 id => "chat",
2408 title => "Chat",
2409 reply => "chat ",
2410 tooltip => "Player chat and shouts, global to the server.",
2411};
2072 2412
2073# rough implementation of a future "reply" method that works 2413# rough implementation of a future "reply" method that works
2074# with dialog boxes. 2414# with dialog boxes.
2075#TODO: the first argument must go, split into a $npc->reply_to ( method 2415#TODO: the first argument must go, split into a $npc->reply_to ( method
2076sub cf::object::player::reply($$$;$) { 2416sub cf::object::player::reply($$$;$) {
… …
2083 2423
2084 } else { 2424 } else {
2085 my $pl = $self->contr; 2425 my $pl = $self->contr;
2086 2426
2087 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2427 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088 my $diag = $pl->{npc_dialog}; 2428 my $dialog = $pl->{npc_dialog};
2089 $diag->{pl}->ext_reply ( 2429 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090 $diag->{id},
2091 msgtype => "reply",
2092 msg => $diag->{pl}->expand_cfpod ($msg),
2093 add_topics => []
2094 );
2095 2430
2096 } else { 2431 } else {
2097 $msg = $npc->name . " says: $msg" if $npc; 2432 $msg = $npc->name . " says: $msg" if $npc;
2098 $self->message ($msg, $flags); 2433 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2099 } 2434 }
2100 } 2435 }
2436}
2437
2438=item $object->send_msg ($channel, $msg, $color, [extra...])
2439
2440=cut
2441
2442sub cf::object::send_msg {
2443 my $pl = shift->contr
2444 or return;
2445 $pl->send_msg (@_);
2101} 2446}
2102 2447
2103=item $player_object->may ("access") 2448=item $player_object->may ("access")
2104 2449
2105Returns wether the given player is authorized to access resource "access" 2450Returns wether the given player is authorized to access resource "access"
… …
2118 2463
2119=item $player_object->enter_link 2464=item $player_object->enter_link
2120 2465
2121Freezes the player and moves him/her to a special map (C<{link}>). 2466Freezes the player and moves him/her to a special map (C<{link}>).
2122 2467
2123The player should be reasonably safe there for short amounts of time. You 2468The player should be reasonably safe there for short amounts of time (e.g.
2124I<MUST> call C<leave_link> as soon as possible, though. 2469for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2470though, as the palyer cannot control the character while it is on the link
2471map.
2125 2472
2126Will never block. 2473Will never block.
2127 2474
2128=item $player_object->leave_link ($map, $x, $y) 2475=item $player_object->leave_link ($map, $x, $y)
2129 2476
… …
2184 # use -1 or undef as default coordinates, not 0, 0 2531 # use -1 or undef as default coordinates, not 0, 0
2185 ($x, $y) = ($map->enter_x, $map->enter_y) 2532 ($x, $y) = ($map->enter_x, $map->enter_y)
2186 if $x <=0 && $y <= 0; 2533 if $x <=0 && $y <= 0;
2187 2534
2188 $map->load; 2535 $map->load;
2189 $map->load_diag; 2536 $map->load_neighbours;
2190 2537
2191 return unless $self->contr->active; 2538 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2192 $self->activate_recursive; 2540 $self->activate_recursive;
2193 2541
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2543 $self->enter_map ($map, $x, $y);
2196} 2544}
2197 2545
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2546=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199 2547
2200Moves the player to the given map-path and coordinates by first freezing 2548Moves the player to the given map-path and coordinates by first freezing
2201her, loading and preparing them map, calling the provided $check callback 2549her, loading and preparing them map, calling the provided $check callback
2202that has to return the map if sucecssful, and then unfreezes the player on 2550that has to return the map if sucecssful, and then unfreezes the player on
2203the new (success) or old (failed) map position. 2551the new (success) or old (failed) map position. In either case, $done will
2552be called at the end of this process.
2553
2554Note that $check will be called with a potentially non-loaded map, so if
2555it needs a loaded map it has to call C<< ->load >>.
2204 2556
2205=cut 2557=cut
2206 2558
2207our $GOTOGEN; 2559our $GOTOGEN;
2208 2560
2209sub cf::object::player::goto { 2561sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2562 my ($self, $path, $x, $y, $check, $done) = @_;
2211 2563
2212 # do generation counting so two concurrent goto's will be executed in-order 2564 # do generation counting so two concurrent goto's will be executed in-order
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2565 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2566
2215 $self->enter_link; 2567 $self->enter_link;
2216 2568
2217 (async { 2569 (async {
2570 $Coro::current->{desc} = "player::goto $path $x $y";
2571
2572 # *tag paths override both path and x|y
2573 if ($path =~ /^\*(.*)$/) {
2574 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2575 my $ob = $obs[rand @obs];
2576
2577 # see if we actually can go there
2578 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2579 $ob = $obs[rand @obs];
2580 } else {
2581 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2582 }
2583 # else put us there anyways for now #d#
2584
2585 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2586 } else {
2587 ($path, $x, $y) = (undef, undef, undef);
2588 }
2589 }
2590
2218 my $map = eval { 2591 my $map = eval {
2219 my $map = cf::map::find $path; 2592 my $map = defined $path ? cf::map::find $path : undef;
2220 2593
2221 if ($map) { 2594 if ($map) {
2222 $map = $map->customise_for ($self); 2595 $map = $map->customise_for ($self);
2223 $map = $check->($map) if $check && $map; 2596 $map = $check->($map) if $check && $map;
2224 } else { 2597 } else {
2225 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2598 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2226 } 2599 }
2227 2600
2228 $map 2601 $map
2229 }; 2602 };
2230 2603
… …
2235 2608
2236 if ($gen == $self->{_goto_generation}) { 2609 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2610 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2611 $self->leave_link ($map, $x, $y);
2239 } 2612 }
2613
2614 $done->() if $done;
2240 })->prio (1); 2615 })->prio (1);
2241} 2616}
2242 2617
2243=item $player_object->enter_exit ($exit_object) 2618=item $player_object->enter_exit ($exit_object)
2244 2619
… …
2264} 2639}
2265 2640
2266sub prepare_random_map { 2641sub prepare_random_map {
2267 my ($exit) = @_; 2642 my ($exit) = @_;
2268 2643
2269 my $guard = cf::lock_acquire "exit_prepare:$exit";
2270
2271 # all this does is basically replace the /! path by 2644 # all this does is basically replace the /! path by
2272 # a new random map path (?random/...) with a seed 2645 # a new random map path (?random/...) with a seed
2273 # that depends on the exit object 2646 # that depends on the exit object
2274 2647
2275 my $rmp = parse_random_map_params $exit->msg; 2648 my $rmp = parse_random_map_params $exit->msg;
… …
2277 if ($exit->map) { 2650 if ($exit->map) {
2278 $rmp->{region} = $exit->region->name; 2651 $rmp->{region} = $exit->region->name;
2279 $rmp->{origin_map} = $exit->map->path; 2652 $rmp->{origin_map} = $exit->map->path;
2280 $rmp->{origin_x} = $exit->x; 2653 $rmp->{origin_x} = $exit->x;
2281 $rmp->{origin_y} = $exit->y; 2654 $rmp->{origin_y} = $exit->y;
2655
2656 $exit->map->touch;
2282 } 2657 }
2283 2658
2284 $rmp->{random_seed} ||= $exit->random_seed; 2659 $rmp->{random_seed} ||= $exit->random_seed;
2285 2660
2286 my $data = cf::to_json $rmp; 2661 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2287 my $md5 = Digest::MD5::md5_hex $data; 2662 my $md5 = Digest::MD5::md5_hex $data;
2288 my $meta = "$RANDOMDIR/$md5.meta"; 2663 my $meta = "$RANDOMDIR/$md5.meta";
2289 2664
2290 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2665 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2291 aio_write $fh, 0, (length $data), $data, 0; 2666 aio_write $fh, 0, (length $data), $data, 0;
2292 undef $fh; 2667 undef $fh;
2293 aio_rename "$meta~", $meta; 2668 aio_rename "$meta~", $meta;
2294 2669
2670 my $slaying = "?random/$md5";
2671
2672 if ($exit->valid) {
2295 $exit->slaying ("?random/$md5"); 2673 $exit->slaying ("?random/$md5");
2296 $exit->msg (undef); 2674 $exit->msg (undef);
2675 }
2297 } 2676 }
2298} 2677}
2299 2678
2300sub cf::object::player::enter_exit { 2679sub cf::object::player::enter_exit {
2301 my ($self, $exit) = @_; 2680 my ($self, $exit) = @_;
2302 2681
2303 return unless $self->type == cf::PLAYER; 2682 return unless $self->type == cf::PLAYER;
2304 2683
2305 if ($exit->slaying eq "/!") {
2306 #TODO: this should de-fi-ni-te-ly not be a sync-job
2307 # the problem is that $exit might not survive long enough
2308 # so it needs to be done right now, right here
2309 cf::sync_job { prepare_random_map $exit };
2310 }
2311
2312 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2313 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp;
2315
2316 $self->enter_link; 2684 $self->enter_link;
2317 2685
2318 (async { 2686 (async {
2319 $self->deactivate_recursive; # just to be sure 2687 $Coro::current->{desc} = "enter_exit";
2688
2320 unless (eval { 2689 unless (eval {
2690 $self->deactivate_recursive; # just to be sure
2691
2692 # random map handling
2693 {
2694 my $guard = cf::lock_acquire "exit_prepare:$exit";
2695
2696 prepare_random_map $exit
2697 if $exit->slaying eq "/!";
2698 }
2699
2700 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2701 my $x = $exit->stats->hp;
2702 my $y = $exit->stats->sp;
2703
2321 $self->goto ($slaying, $hp, $sp); 2704 $self->goto ($map, $x, $y);
2322 2705
2706 # if exit is damned, update players death & WoR home-position
2707 $self->contr->savebed ($map, $x, $y)
2708 if $exit->flag (cf::FLAG_DAMNED);
2709
2323 1; 2710 1
2324 }) { 2711 }) {
2325 $self->message ("Something went wrong deep within the crossfire server. " 2712 $self->message ("Something went wrong deep within the deliantra server. "
2326 . "I'll try to bring you back to the map you were before. " 2713 . "I'll try to bring you back to the map you were before. "
2327 . "Please report this to the dungeon master!", 2714 . "Please report this to the dungeon master!",
2328 cf::NDI_UNIQUE | cf::NDI_RED); 2715 cf::NDI_UNIQUE | cf::NDI_RED);
2329 2716
2330 warn "ERROR in enter_exit: $@"; 2717 warn "ERROR in enter_exit: $@";
… …
2349 2736
2350 utf8::encode $text; 2737 utf8::encode $text;
2351 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2738 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352} 2739}
2353 2740
2354=item $client->send_msg ($color, $type, $msg, [extra...]) 2741=item $client->send_msg ($channel, $msg, $color, [extra...])
2355 2742
2356Send a drawinfo or msg packet to the client, formatting the msg for the 2743Send a drawinfo or msg packet to the client, formatting the msg for the
2357client if neccessary. C<$type> should be a string identifying the type of 2744client if neccessary. C<$type> should be a string identifying the type of
2358the message, with C<log> being the default. If C<$color> is negative, suppress 2745the message, with C<log> being the default. If C<$color> is negative, suppress
2359the message unless the client supports the msg packet. 2746the message unless the client supports the msg packet.
2360 2747
2361=cut 2748=cut
2362 2749
2750# non-persistent channels (usually the info channel)
2751our %CHANNEL = (
2752 "c/identify" => {
2753 id => "infobox",
2754 title => "Identify",
2755 reply => undef,
2756 tooltip => "Items recently identified",
2757 },
2758 "c/examine" => {
2759 id => "infobox",
2760 title => "Examine",
2761 reply => undef,
2762 tooltip => "Signs and other items you examined",
2763 },
2764 "c/book" => {
2765 id => "infobox",
2766 title => "Book",
2767 reply => undef,
2768 tooltip => "The contents of a note or book",
2769 },
2770 "c/lookat" => {
2771 id => "infobox",
2772 title => "Look",
2773 reply => undef,
2774 tooltip => "What you saw there",
2775 },
2776 "c/who" => {
2777 id => "infobox",
2778 title => "Players",
2779 reply => undef,
2780 tooltip => "Shows players who are currently online",
2781 },
2782 "c/body" => {
2783 id => "infobox",
2784 title => "Body Parts",
2785 reply => undef,
2786 tooltip => "Shows which body parts you posess and are available",
2787 },
2788 "c/statistics" => {
2789 id => "infobox",
2790 title => "Statistics",
2791 reply => undef,
2792 tooltip => "Shows your primary statistics",
2793 },
2794 "c/skills" => {
2795 id => "infobox",
2796 title => "Skills",
2797 reply => undef,
2798 tooltip => "Shows your experience per skill and item power",
2799 },
2800 "c/shopitems" => {
2801 id => "infobox",
2802 title => "Shop Items",
2803 reply => undef,
2804 tooltip => "Shows the items currently for sale in this shop",
2805 },
2806 "c/resistances" => {
2807 id => "infobox",
2808 title => "Resistances",
2809 reply => undef,
2810 tooltip => "Shows your resistances",
2811 },
2812 "c/pets" => {
2813 id => "infobox",
2814 title => "Pets",
2815 reply => undef,
2816 tooltip => "Shows information abotu your pets/a specific pet",
2817 },
2818 "c/perceiveself" => {
2819 id => "infobox",
2820 title => "Perceive Self",
2821 reply => undef,
2822 tooltip => "You gained detailed knowledge about yourself",
2823 },
2824 "c/uptime" => {
2825 id => "infobox",
2826 title => "Uptime",
2827 reply => undef,
2828 tooltip => "How long the server has been running since last restart",
2829 },
2830 "c/mapinfo" => {
2831 id => "infobox",
2832 title => "Map Info",
2833 reply => undef,
2834 tooltip => "Information related to the maps",
2835 },
2836 "c/party" => {
2837 id => "party",
2838 title => "Party",
2839 reply => "gsay ",
2840 tooltip => "Messages and chat related to your party",
2841 },
2842 "c/death" => {
2843 id => "death",
2844 title => "Death",
2845 reply => undef,
2846 tooltip => "Reason for and more info about your most recent death",
2847 },
2848 "c/say" => $SAY_CHANNEL,
2849 "c/chat" => $CHAT_CHANNEL,
2850);
2851
2363sub cf::client::send_msg { 2852sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2853 my ($self, $channel, $msg, $color, @extra) = @_;
2365 2854
2366 $msg = $self->pl->expand_cfpod ($msg); 2855 $msg = $self->pl->expand_cfpod ($msg)
2856 unless $color & cf::NDI_VERBATIM;
2367 2857
2368 if ($self->can_msg) { 2858 $color &= cf::NDI_CLIENT_MASK; # just in case...
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);
2370 } else {
2371 # replace some tags by gcfclient-compatible ones
2372 for ($msg) {
2373 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2379 }
2380 2859
2381 if ($color >= 0) { 2860 # check predefined channels, for the benefit of C
2382 if (0 && $msg =~ /\[/) { 2861 if ($CHANNEL{$channel}) {
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2862 $channel = $CHANNEL{$channel};
2384 } else { 2863
2385 s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2864 $self->ext_msg (channel_info => $channel);
2386 $self->send_packet ("drawinfo $color $msg") 2865 $channel = $channel->{id};
2866
2867 } elsif (ref $channel) {
2868 # send meta info to client, if not yet sent
2869 unless (exists $self->{channel}{$channel->{id}}) {
2870 $self->{channel}{$channel->{id}} = $channel;
2871 $self->ext_msg (channel_info => $channel);
2387 } 2872 }
2388 }
2389 }
2390}
2391 2873
2874 $channel = $channel->{id};
2875 }
2876
2877 return unless @extra || length $msg;
2878
2879 # default colour, mask it out
2880 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2881 if $color & cf::NDI_DEF;
2882
2883 my $pkt = "msg "
2884 . $self->{json_coder}->encode (
2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2886 );
2887
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if (8192 < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt);
2899}
2900
2392=item $client->ext_event ($type, %msg) 2901=item $client->ext_msg ($type, @msg)
2393 2902
2394Sends an exti event to the client. 2903Sends an ext event to the client.
2395 2904
2396=cut 2905=cut
2397 2906
2398sub cf::client::ext_event($$%) { 2907sub cf::client::ext_msg($$@) {
2399 my ($self, $type, %msg) = @_; 2908 my ($self, $type, @msg) = @_;
2400 2909
2910 if ($self->extcmd == 2) {
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2912 } elsif ($self->extcmd == 1) { # TODO: remove
2401 $msg{msgtype} = "event_$type"; 2913 push @msg, msgtype => "event_$type";
2402 $self->send_packet ("ext " . cf::to_json \%msg); 2914 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2915 }
2916}
2917
2918=item $client->ext_reply ($msgid, @msg)
2919
2920Sends an ext reply to the client.
2921
2922=cut
2923
2924sub cf::client::ext_reply($$@) {
2925 my ($self, $id, @msg) = @_;
2926
2927 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2929 } elsif ($self->extcmd == 1) {
2930 #TODO: version 1, remove
2931 unshift @msg, msgtype => "reply", msgid => $id;
2932 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933 }
2403} 2934}
2404 2935
2405=item $success = $client->query ($flags, "text", \&cb) 2936=item $success = $client->query ($flags, "text", \&cb)
2406 2937
2407Queues a query to the client, calling the given callback with 2938Queues a query to the client, calling the given callback with
2408the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2939the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2409C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2940C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2410 2941
2411Queries can fail, so check the return code. Or don't, as queries will become 2942Queries can fail, so check the return code. Or don't, as queries will
2412reliable at some point in the future. 2943become reliable at some point in the future.
2413 2944
2414=cut 2945=cut
2415 2946
2416sub cf::client::query { 2947sub cf::client::query {
2417 my ($self, $flags, $text, $cb) = @_; 2948 my ($self, $flags, $text, $cb) = @_;
… …
2425 utf8::encode $text; 2956 utf8::encode $text;
2426 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2957 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427 2958
2428 $self->send_packet ($self->{query_queue}[0][0]) 2959 $self->send_packet ($self->{query_queue}[0][0])
2429 if @{ $self->{query_queue} } == 1; 2960 if @{ $self->{query_queue} } == 1;
2961
2962 1
2430} 2963}
2431 2964
2432cf::client->attach ( 2965cf::client->attach (
2966 on_connect => sub {
2967 my ($ns) = @_;
2968
2969 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2970 },
2433 on_reply => sub { 2971 on_reply => sub {
2434 my ($ns, $msg) = @_; 2972 my ($ns, $msg) = @_;
2435 2973
2436 # this weird shuffling is so that direct followup queries 2974 # this weird shuffling is so that direct followup queries
2437 # get handled first 2975 # get handled first
… …
2449 } else { 2987 } else {
2450 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2988 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451 } 2989 }
2452 } 2990 }
2453 }, 2991 },
2992 on_exticmd => sub {
2993 my ($ns, $buf) = @_;
2994
2995 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2996
2997 if (ref $msg) {
2998 my ($type, $reply, @payload) =
2999 "ARRAY" eq ref $msg
3000 ? @$msg
3001 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3002
3003 my @reply;
3004
3005 if (my $cb = $EXTICMD{$type}) {
3006 @reply = $cb->($ns, @payload);
3007 }
3008
3009 $ns->ext_reply ($reply, @reply)
3010 if $reply;
3011
3012 } else {
3013 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3014 }
3015
3016 cf::override;
3017 },
2454); 3018);
2455 3019
2456=item $client->async (\&cb) 3020=item $client->async (\&cb)
2457 3021
2458Create a new coroutine, running the specified callback. The coroutine will 3022Create a new coroutine, running the specified callback. The coroutine will
… …
2499our $safe = new Safe "safe"; 3063our $safe = new Safe "safe";
2500our $safe_hole = new Safe::Hole; 3064our $safe_hole = new Safe::Hole;
2501 3065
2502$SIG{FPE} = 'IGNORE'; 3066$SIG{FPE} = 'IGNORE';
2503 3067
2504$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3068$safe->permit_only (Opcode::opset qw(
3069 :base_core :base_mem :base_orig :base_math
3070 grepstart grepwhile mapstart mapwhile
3071 sort time
3072));
2505 3073
2506# here we export the classes and methods available to script code 3074# here we export the classes and methods available to script code
2507 3075
2508=pod 3076=pod
2509 3077
2510The following functions and methods are available within a safe environment: 3078The following functions and methods are available within a safe environment:
2511 3079
2512 cf::object contr pay_amount pay_player map 3080 cf::object
3081 contr pay_amount pay_player map x y force_find force_add destroy
3082 insert remove name archname title slaying race decrease split
3083 value
3084
2513 cf::object::player player 3085 cf::object::player
2514 cf::player peaceful 3086 player
2515 cf::map trigger 3087
3088 cf::player
3089 peaceful
3090
3091 cf::map
3092 trigger
2516 3093
2517=cut 3094=cut
2518 3095
2519for ( 3096for (
2520 ["cf::object" => qw(contr pay_amount pay_player map)], 3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv nrof name archname title slaying race
3099 decrease split destroy change_exp value msg lore send_msg)],
2521 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
2522 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful send_msg)],
2523 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
2524) { 3103) {
2525 no strict 'refs'; 3104 no strict 'refs';
2526 my ($pkg, @funs) = @$_; 3105 my ($pkg, @funs) = @$_;
2527 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2544 my ($code, %vars) = @_; 3123 my ($code, %vars) = @_;
2545 3124
2546 my $qcode = $code; 3125 my $qcode = $code;
2547 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2548 $qcode =~ s/\n/\\n/g; 3127 $qcode =~ s/\n/\\n/g;
3128
3129 %vars = (_dummy => 0) unless %vars;
2549 3130
2550 local $_; 3131 local $_;
2551 local @safe::cf::_safe_eval_args = values %vars; 3132 local @safe::cf::_safe_eval_args = values %vars;
2552 3133
2553 my $eval = 3134 my $eval =
… …
2601# the server's init and main functions 3182# the server's init and main functions
2602 3183
2603sub load_facedata($) { 3184sub load_facedata($) {
2604 my ($path) = @_; 3185 my ($path) = @_;
2605 3186
3187 # HACK to clear player env face cache, we need some signal framework
3188 # for this (global event?)
3189 %ext::player_env::MUSIC_FACE_CACHE = ();
3190
3191 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3192
2606 warn "loading facedata from $path\n"; 3193 warn "loading facedata from $path\n";
2607 3194
2608 my $facedata; 3195 my $facedata;
2609 0 < aio_load $path, $facedata 3196 0 < aio_load $path, $facedata
2610 or die "$path: $!"; 3197 or die "$path: $!";
… …
2612 $facedata = Coro::Storable::thaw $facedata; 3199 $facedata = Coro::Storable::thaw $facedata;
2613 3200
2614 $facedata->{version} == 2 3201 $facedata->{version} == 2
2615 or cf::cleanup "$path: version mismatch, cannot proceed."; 3202 or cf::cleanup "$path: version mismatch, cannot proceed.";
2616 3203
3204 # patch in the exptable
3205 $facedata->{resource}{"res/exp_table"} = {
3206 type => FT_RSRC,
3207 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3208 };
3209 cf::cede_to_tick;
3210
2617 { 3211 {
2618 my $faces = $facedata->{faceinfo}; 3212 my $faces = $facedata->{faceinfo};
2619 3213
2620 while (my ($face, $info) = each %$faces) { 3214 while (my ($face, $info) = each %$faces) {
2621 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3215 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216
2622 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3217 cf::face::set_visibility $idx, $info->{visibility};
3218 cf::face::set_magicmap $idx, $info->{magicmap};
2623 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3219 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2624 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3220 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2625 Coro::cede; 3221
3222 cf::cede_to_tick;
2626 } 3223 }
2627 3224
2628 while (my ($face, $info) = each %$faces) { 3225 while (my ($face, $info) = each %$faces) {
2629 next unless $info->{smooth}; 3226 next unless $info->{smooth};
3227
2630 my $idx = cf::face::find $face 3228 my $idx = cf::face::find $face
2631 or next; 3229 or next;
3230
2632 if (my $smooth = cf::face::find $info->{smooth}) { 3231 if (my $smooth = cf::face::find $info->{smooth}) {
3232 cf::face::set_smooth $idx, $smooth;
2633 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3233 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2634 } else { 3234 } else {
2635 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3235 warn "smooth face '$info->{smooth}' not found for face '$face'";
2636 } 3236 }
2637 Coro::cede; 3237
3238 cf::cede_to_tick;
2638 } 3239 }
2639 } 3240 }
2640 3241
2641 { 3242 {
2642 my $anims = $facedata->{animinfo}; 3243 my $anims = $facedata->{animinfo};
2643 3244
2644 while (my ($anim, $info) = each %$anims) { 3245 while (my ($anim, $info) = each %$anims) {
2645 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3246 cf::anim::set $anim, $info->{frames}, $info->{facings};
2646 Coro::cede; 3247 cf::cede_to_tick;
2647 } 3248 }
2648 3249
2649 cf::anim::invalidate_all; # d'oh 3250 cf::anim::invalidate_all; # d'oh
2650 } 3251 }
2651 3252
3253 {
3254 # TODO: for gcfclient pleasure, we should give resources
3255 # that gcfclient doesn't grok a >10000 face index.
3256 my $res = $facedata->{resource};
3257
3258 while (my ($name, $info) = each %$res) {
3259 if (defined $info->{type}) {
3260 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3261 my $data;
3262
3263 if ($info->{type} & 1) {
3264 # prepend meta info
3265
3266 my $meta = $enc->encode ({
3267 name => $name,
3268 %{ $info->{meta} || {} },
3269 });
3270
3271 $data = pack "(w/a*)*", $meta, $info->{data};
3272 } else {
3273 $data = $info->{data};
3274 }
3275
3276 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3277 cf::face::set_type $idx, $info->{type};
3278 } else {
3279 $RESOURCE{$name} = $info;
3280 }
3281
3282 cf::cede_to_tick;
3283 }
3284 }
3285
3286 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3287
2652 1 3288 1
2653} 3289}
2654 3290
3291cf::global->attach (on_resource_update => sub {
3292 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3293 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3294
3295 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3296 my $sound = $soundconf->{compat}[$_]
3297 or next;
3298
3299 my $face = cf::face::find "sound/$sound->[1]";
3300 cf::sound::set $sound->[0] => $face;
3301 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3302 }
3303
3304 while (my ($k, $v) = each %{$soundconf->{event}}) {
3305 my $face = cf::face::find "sound/$v";
3306 cf::sound::set $k => $face;
3307 }
3308 }
3309});
3310
3311register_exticmd fx_want => sub {
3312 my ($ns, $want) = @_;
3313
3314 while (my ($k, $v) = each %$want) {
3315 $ns->fx_want ($k, $v);
3316 }
3317};
3318
3319sub load_resource_file($) {
3320 my $guard = lock_acquire "load_resource_file";
3321
3322 my $status = load_resource_file_ $_[0];
3323 get_slot 0.1, 100;
3324 cf::arch::commit_load;
3325
3326 $status
3327}
3328
2655sub reload_regions { 3329sub reload_regions {
3330 # HACK to clear player env face cache, we need some signal framework
3331 # for this (global event?)
3332 %ext::player_env::MUSIC_FACE_CACHE = ();
3333
2656 load_resource_file "$MAPDIR/regions" 3334 load_resource_file "$MAPDIR/regions"
2657 or die "unable to load regions file\n"; 3335 or die "unable to load regions file\n";
3336
3337 for (cf::region::list) {
3338 $_->{match} = qr/$_->{match}/
3339 if exists $_->{match};
3340 }
2658} 3341}
2659 3342
2660sub reload_facedata { 3343sub reload_facedata {
2661 load_facedata "$DATADIR/facedata" 3344 load_facedata "$DATADIR/facedata"
2662 or die "unable to load facedata\n"; 3345 or die "unable to load facedata\n";
… …
2673} 3356}
2674 3357
2675sub reload_resources { 3358sub reload_resources {
2676 warn "reloading resource files...\n"; 3359 warn "reloading resource files...\n";
2677 3360
3361 reload_facedata;
3362 reload_archetypes;
2678 reload_regions; 3363 reload_regions;
2679 reload_facedata;
2680 #reload_archetypes;#d#
2681 reload_archetypes;
2682 reload_treasures; 3364 reload_treasures;
2683 3365
2684 warn "finished reloading resource files\n"; 3366 warn "finished reloading resource files\n";
2685} 3367}
2686 3368
2687sub init { 3369sub reload_config {
2688 reload_resources;
2689}
2690
2691sub cfg_load {
2692 open my $fh, "<:utf8", "$CONFDIR/config" 3370 open my $fh, "<:utf8", "$CONFDIR/config"
2693 or return; 3371 or return;
2694 3372
2695 local $/; 3373 local $/;
2696 *CFG = YAML::Syck::Load <$fh>; 3374 *CFG = YAML::Load <$fh>;
2697 3375
2698 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3376 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2699 3377
2700 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3378 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2701 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3379 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2707 }; 3385 };
2708 warn $@ if $@; 3386 warn $@ if $@;
2709 } 3387 }
2710} 3388}
2711 3389
3390sub pidfile() {
3391 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3392 or die "$PIDFILE: $!";
3393 flock $fh, &Fcntl::LOCK_EX
3394 or die "$PIDFILE: flock: $!";
3395 $fh
3396}
3397
3398# make sure only one server instance is running at any one time
3399sub atomic {
3400 my $fh = pidfile;
3401
3402 my $pid = <$fh>;
3403 kill 9, $pid if $pid > 0;
3404
3405 seek $fh, 0, 0;
3406 print $fh $$;
3407}
3408
3409sub main_loop {
3410 warn "EV::loop starting\n";
3411 if (1) {
3412 EV::loop;
3413 }
3414 warn "EV::loop returned\n";
3415 goto &main_loop unless $REALLY_UNLOOP;
3416}
3417
2712sub main { 3418sub main {
3419 cf::init_globals; # initialise logging
3420
3421 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3423 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3425
3426 cf::init_experience;
3427 cf::init_anim;
3428 cf::init_attackmess;
3429 cf::init_dynamic;
3430
3431 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3432
2713 # we must not ever block the main coroutine 3433 # we must not ever block the main coroutine
2714 local $Coro::idle = sub { 3434 local $Coro::idle = sub {
2715 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3435 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2716 (async { 3436 (async {
2717 Event::one_event; 3437 $Coro::current->{desc} = "IDLE BUG HANDLER";
3438 EV::loop EV::LOOP_ONESHOT;
2718 })->prio (Coro::PRIO_MAX); 3439 })->prio (Coro::PRIO_MAX);
2719 }; 3440 };
2720 3441
2721 cfg_load; 3442 evthread_start IO::AIO::poll_fileno;
3443
3444 cf::sync_job {
3445 reload_resources;
3446 reload_config;
2722 db_init; 3447 db_init;
3448
3449 cf::load_settings;
3450 cf::load_materials;
3451 cf::init_uuid;
3452 cf::init_signals;
3453 cf::init_commands;
3454 cf::init_skills;
3455
3456 cf::init_beforeplay;
3457
3458 atomic;
3459
2723 load_extensions; 3460 load_extensions;
2724 3461
2725 $TICK_WATCHER->start; 3462 utime time, time, $RUNTIMEFILE;
2726 Event::loop; 3463
3464 # no (long-running) fork's whatsoever before this point(!)
3465 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3466
3467 (pop @POST_INIT)->(0) while @POST_INIT;
3468 };
3469
3470 main_loop;
2727} 3471}
2728 3472
2729############################################################################# 3473#############################################################################
2730# initialisation and cleanup 3474# initialisation and cleanup
2731 3475
2732# install some emergency cleanup handlers 3476# install some emergency cleanup handlers
2733BEGIN { 3477BEGIN {
3478 our %SIGWATCHER = ();
2734 for my $signal (qw(INT HUP TERM)) { 3479 for my $signal (qw(INT HUP TERM)) {
2735 Event->signal ( 3480 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2736 reentrant => 0,
2737 data => WF_AUTOCANCEL,
2738 signal => $signal,
2739 prio => 0,
2740 cb => sub {
2741 cf::cleanup "SIG$signal"; 3481 cf::cleanup "SIG$signal";
2742 },
2743 ); 3482 };
2744 } 3483 }
2745} 3484}
2746 3485
2747sub write_runtime { 3486sub write_runtime_sync {
2748 my $runtime = "$LOCALDIR/runtime";
2749
2750 # first touch the runtime file to show we are still running: 3487 # first touch the runtime file to show we are still running:
2751 # the fsync below can take a very very long time. 3488 # the fsync below can take a very very long time.
2752 3489
2753 IO::AIO::aio_utime $runtime, undef, undef; 3490 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2754 3491
2755 my $guard = cf::lock_acquire "write_runtime"; 3492 my $guard = cf::lock_acquire "write_runtime";
2756 3493
2757 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3494 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2758 or return; 3495 or return;
2759 3496
2760 my $value = $cf::RUNTIME + 90 + 10; 3497 my $value = $cf::RUNTIME + 90 + 10;
2761 # 10 is the runtime save interval, for a monotonic clock 3498 # 10 is the runtime save interval, for a monotonic clock
2762 # 60 allows for the watchdog to kill the server. 3499 # 60 allows for the watchdog to kill the server.
… …
2772 aio_utime $fh, undef, undef; 3509 aio_utime $fh, undef, undef;
2773 3510
2774 close $fh 3511 close $fh
2775 or return; 3512 or return;
2776 3513
2777 aio_rename "$runtime~", $runtime 3514 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2778 and return; 3515 and return;
2779 3516
2780 warn "runtime file written.\n"; 3517 warn "runtime file written.\n";
2781 3518
2782 1 3519 1
3520}
3521
3522our $uuid_lock;
3523our $uuid_skip;
3524
3525sub write_uuid_sync($) {
3526 $uuid_skip ||= $_[0];
3527
3528 return if $uuid_lock;
3529 local $uuid_lock = 1;
3530
3531 my $uuid = "$LOCALDIR/uuid";
3532
3533 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3534 or return;
3535
3536 my $value = uuid_seq uuid_cur;
3537
3538 unless ($value) {
3539 warn "cowardly refusing to write zero uuid value!\n";
3540 return;
3541 }
3542
3543 my $value = uuid_str $value + $uuid_skip;
3544 $uuid_skip = 0;
3545
3546 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3547 and return;
3548
3549 # always fsync - this file is important
3550 aio_fsync $fh
3551 and return;
3552
3553 close $fh
3554 or return;
3555
3556 aio_rename "$uuid~", $uuid
3557 and return;
3558
3559 warn "uuid file written ($value).\n";
3560
3561 1
3562
3563}
3564
3565sub write_uuid($$) {
3566 my ($skip, $sync) = @_;
3567
3568 $sync ? write_uuid_sync $skip
3569 : async { write_uuid_sync $skip };
2783} 3570}
2784 3571
2785sub emergency_save() { 3572sub emergency_save() {
2786 my $freeze_guard = cf::freeze_mainloop; 3573 my $freeze_guard = cf::freeze_mainloop;
2787 3574
2788 warn "enter emergency perl save\n"; 3575 warn "emergency_perl_save: enter\n";
2789 3576
2790 cf::sync_job { 3577 cf::sync_job {
3578 # this is a trade-off: we want to be very quick here, so
3579 # save all maps without fsync, and later call a global sync
3580 # (which in turn might be very very slow)
3581 local $USE_FSYNC = 0;
3582
2791 # use a peculiar iteration method to avoid tripping on perl 3583 # use a peculiar iteration method to avoid tripping on perl
2792 # refcount bugs in for. also avoids problems with players 3584 # refcount bugs in for. also avoids problems with players
2793 # and maps saved/destroyed asynchronously. 3585 # and maps saved/destroyed asynchronously.
2794 warn "begin emergency player save\n"; 3586 warn "emergency_perl_save: begin player save\n";
2795 for my $login (keys %cf::PLAYER) { 3587 for my $login (keys %cf::PLAYER) {
2796 my $pl = $cf::PLAYER{$login} or next; 3588 my $pl = $cf::PLAYER{$login} or next;
2797 $pl->valid or next; 3589 $pl->valid or next;
3590 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2798 $pl->save; 3591 $pl->save;
2799 } 3592 }
2800 warn "end emergency player save\n"; 3593 warn "emergency_perl_save: end player save\n";
2801 3594
2802 warn "begin emergency map save\n"; 3595 warn "emergency_perl_save: begin map save\n";
2803 for my $path (keys %cf::MAP) { 3596 for my $path (keys %cf::MAP) {
2804 my $map = $cf::MAP{$path} or next; 3597 my $map = $cf::MAP{$path} or next;
2805 $map->valid or next; 3598 $map->valid or next;
2806 $map->save; 3599 $map->save;
2807 } 3600 }
2808 warn "end emergency map save\n"; 3601 warn "emergency_perl_save: end map save\n";
2809 3602
2810 warn "begin emergency database checkpoint\n"; 3603 warn "emergency_perl_save: begin database checkpoint\n";
2811 BDB::db_env_txn_checkpoint $DB_ENV; 3604 BDB::db_env_txn_checkpoint $DB_ENV;
2812 warn "end emergency database checkpoint\n"; 3605 warn "emergency_perl_save: end database checkpoint\n";
3606
3607 warn "emergency_perl_save: begin write uuid\n";
3608 write_uuid_sync 1;
3609 warn "emergency_perl_save: end write uuid\n";
2813 }; 3610 };
2814 3611
3612 warn "emergency_perl_save: starting sync()\n";
3613 IO::AIO::aio_sync sub {
3614 warn "emergency_perl_save: finished sync()\n";
3615 };
3616
2815 warn "leave emergency perl save\n"; 3617 warn "emergency_perl_save: leave\n";
2816} 3618}
2817 3619
2818sub post_cleanup { 3620sub post_cleanup {
2819 my ($make_core) = @_; 3621 my ($make_core) = @_;
2820 3622
2821 warn Carp::longmess "post_cleanup backtrace" 3623 warn Carp::longmess "post_cleanup backtrace"
2822 if $make_core; 3624 if $make_core;
3625
3626 my $fh = pidfile;
3627 unlink $PIDFILE if <$fh> == $$;
3628}
3629
3630# a safer delete_package, copied from Symbol
3631sub clear_package($) {
3632 my $pkg = shift;
3633
3634 # expand to full symbol table name if needed
3635 unless ($pkg =~ /^main::.*::$/) {
3636 $pkg = "main$pkg" if $pkg =~ /^::/;
3637 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3638 $pkg .= '::' unless $pkg =~ /::$/;
3639 }
3640
3641 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3642 my $stem_symtab = *{$stem}{HASH};
3643
3644 defined $stem_symtab and exists $stem_symtab->{$leaf}
3645 or return;
3646
3647 # clear all symbols
3648 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3649 for my $name (keys %$leaf_symtab) {
3650 _gv_clear *{"$pkg$name"};
3651# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3652 }
3653 warn "cleared package $pkg\n";#d#
2823} 3654}
2824 3655
2825sub do_reload_perl() { 3656sub do_reload_perl() {
2826 # can/must only be called in main 3657 # can/must only be called in main
2827 if ($Coro::current != $Coro::main) { 3658 if ($Coro::current != $Coro::main) {
2828 warn "can only reload from main coroutine"; 3659 warn "can only reload from main coroutine";
2829 return; 3660 return;
2830 } 3661 }
2831 3662
3663 return if $RELOAD++;
3664
3665 my $t1 = EV::time;
3666
3667 while ($RELOAD) {
2832 warn "reloading..."; 3668 warn "reloading...";
2833 3669
2834 warn "entering sync_job"; 3670 warn "entering sync_job";
2835 3671
2836 cf::sync_job { 3672 cf::sync_job {
2837 cf::write_runtime; # external watchdog should not bark 3673 cf::write_runtime_sync; # external watchdog should not bark
2838 cf::emergency_save; 3674 cf::emergency_save;
2839 cf::write_runtime; # external watchdog should not bark 3675 cf::write_runtime_sync; # external watchdog should not bark
2840 3676
2841 warn "syncing database to disk"; 3677 warn "syncing database to disk";
2842 BDB::db_env_txn_checkpoint $DB_ENV; 3678 BDB::db_env_txn_checkpoint $DB_ENV;
2843 3679
2844 # if anything goes wrong in here, we should simply crash as we already saved 3680 # if anything goes wrong in here, we should simply crash as we already saved
2845 3681
2846 warn "cancelling all WF_AUTOCANCEL watchers";
2847 for (Event::all_watchers) {
2848 $_->cancel if $_->data & WF_AUTOCANCEL;
2849 }
2850
2851 warn "flushing outstanding aio requests"; 3682 warn "flushing outstanding aio requests";
2852 for (;;) {
2853 BDB::flush;
2854 IO::AIO::flush;
2855 Coro::cede;
2856 last unless IO::AIO::nreqs || BDB::nreqs; 3683 while (IO::AIO::nreqs || BDB::nreqs) {
2857 warn "iterate..."; 3684 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2858 }
2859
2860 ++$RELOAD;
2861
2862 warn "cancelling all extension coros";
2863 $_->cancel for values %EXT_CORO;
2864 %EXT_CORO = ();
2865
2866 warn "removing commands";
2867 %COMMAND = ();
2868
2869 warn "removing ext commands";
2870 %EXTCMD = ();
2871
2872 warn "unloading/nuking all extensions";
2873 for my $pkg (@EXTS) {
2874 warn "... unloading $pkg";
2875
2876 if (my $cb = $pkg->can ("unload")) {
2877 eval {
2878 $cb->($pkg);
2879 1
2880 } or warn "$pkg unloaded, but with errors: $@";
2881 } 3685 }
2882 3686
2883 warn "... nuking $pkg"; 3687 warn "cancelling all extension coros";
2884 Symbol::delete_package $pkg; 3688 $_->cancel for values %EXT_CORO;
2885 } 3689 %EXT_CORO = ();
2886 3690
2887 warn "unloading all perl modules loaded from $LIBDIR"; 3691 warn "removing commands";
2888 while (my ($k, $v) = each %INC) { 3692 %COMMAND = ();
2889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2890 3693
3694 warn "removing ext/exti commands";
3695 %EXTCMD = ();
3696 %EXTICMD = ();
3697
3698 warn "unloading/nuking all extensions";
3699 for my $pkg (@EXTS) {
2891 warn "... unloading $k"; 3700 warn "... unloading $pkg";
2892 delete $INC{$k};
2893 3701
2894 $k =~ s/\.pm$//;
2895 $k =~ s/\//::/g;
2896
2897 if (my $cb = $k->can ("unload_module")) { 3702 if (my $cb = $pkg->can ("unload")) {
3703 eval {
2898 $cb->(); 3704 $cb->($pkg);
3705 1
3706 } or warn "$pkg unloaded, but with errors: $@";
3707 }
3708
3709 warn "... clearing $pkg";
3710 clear_package $pkg;
2899 } 3711 }
2900 3712
2901 Symbol::delete_package $k; 3713 warn "unloading all perl modules loaded from $LIBDIR";
3714 while (my ($k, $v) = each %INC) {
3715 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3716
3717 warn "... unloading $k";
3718 delete $INC{$k};
3719
3720 $k =~ s/\.pm$//;
3721 $k =~ s/\//::/g;
3722
3723 if (my $cb = $k->can ("unload_module")) {
3724 $cb->();
3725 }
3726
3727 clear_package $k;
2902 } 3728 }
2903 3729
2904 warn "getting rid of safe::, as good as possible"; 3730 warn "getting rid of safe::, as good as possible";
2905 Symbol::delete_package "safe::$_" 3731 clear_package "safe::$_"
2906 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3732 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2907 3733
2908 warn "unloading cf.pm \"a bit\""; 3734 warn "unloading cf.pm \"a bit\"";
2909 delete $INC{"cf.pm"}; 3735 delete $INC{"cf.pm"};
2910 delete $INC{"cf/pod.pm"}; 3736 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2911 3737
2912 # don't, removes xs symbols, too, 3738 # don't, removes xs symbols, too,
2913 # and global variables created in xs 3739 # and global variables created in xs
2914 #Symbol::delete_package __PACKAGE__; 3740 #clear_package __PACKAGE__;
2915 3741
2916 warn "unload completed, starting to reload now"; 3742 warn "unload completed, starting to reload now";
2917 3743
2918 warn "reloading cf.pm"; 3744 warn "reloading cf.pm";
2919 require cf; 3745 require cf;
2920 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3746 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2921 3747
2922 warn "loading config and database again"; 3748 warn "loading config and database again";
2923 cf::cfg_load; 3749 cf::reload_config;
2924 3750
2925 warn "loading extensions"; 3751 warn "loading extensions";
2926 cf::load_extensions; 3752 cf::load_extensions;
2927 3753
3754 if ($REATTACH_ON_RELOAD) {
2928 warn "reattaching attachments to objects/players"; 3755 warn "reattaching attachments to objects/players";
2929 _global_reattach; # objects, sockets 3756 _global_reattach; # objects, sockets
2930 warn "reattaching attachments to maps"; 3757 warn "reattaching attachments to maps";
2931 reattach $_ for values %MAP; 3758 reattach $_ for values %MAP;
2932 warn "reattaching attachments to players"; 3759 warn "reattaching attachments to players";
2933 reattach $_ for values %PLAYER; 3760 reattach $_ for values %PLAYER;
3761 }
2934 3762
3763 warn "running post_init jobs";
3764 (pop @POST_INIT)->(1) while @POST_INIT;
3765
2935 warn "leaving sync_job"; 3766 warn "leaving sync_job";
2936 3767
2937 1 3768 1
2938 } or do { 3769 } or do {
2939 warn $@; 3770 warn $@;
2940 warn "error while reloading, exiting."; 3771 cf::cleanup "error while reloading, exiting.";
2941 exit 1;
2942 }; 3772 };
2943 3773
2944 warn "reloaded"; 3774 warn "reloaded";
3775 --$RELOAD;
3776 }
3777
3778 $t1 = EV::time - $t1;
3779 warn "reload completed in ${t1}s\n";
2945}; 3780};
2946 3781
2947our $RELOAD_WATCHER; # used only during reload 3782our $RELOAD_WATCHER; # used only during reload
2948 3783
2949sub reload_perl() { 3784sub reload_perl() {
2950 # doing reload synchronously and two reloads happen back-to-back, 3785 # doing reload synchronously and two reloads happen back-to-back,
2951 # coro crashes during coro_state_free->destroy here. 3786 # coro crashes during coro_state_free->destroy here.
2952 3787
2953 $RELOAD_WATCHER ||= Event->timer ( 3788 $RELOAD_WATCHER ||= cf::async {
2954 reentrant => 0, 3789 Coro::AIO::aio_wait cache_extensions;
2955 after => 0, 3790
2956 data => WF_AUTOCANCEL, 3791 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
2957 cb => sub {
2958 do_reload_perl; 3792 do_reload_perl;
2959 undef $RELOAD_WATCHER; 3793 undef $RELOAD_WATCHER;
2960 }, 3794 };
2961 ); 3795 };
2962} 3796}
2963 3797
2964register_command "reload" => sub { 3798register_command "reload" => sub {
2965 my ($who, $arg) = @_; 3799 my ($who, $arg) = @_;
2966 3800
2967 if ($who->flag (FLAG_WIZ)) { 3801 if ($who->flag (FLAG_WIZ)) {
2968 $who->message ("reloading server."); 3802 $who->message ("reloading server.");
3803 async {
3804 $Coro::current->{desc} = "perl_reload";
2969 async { reload_perl }; 3805 reload_perl;
3806 };
2970 } 3807 }
2971}; 3808};
2972 3809
2973unshift @INC, $LIBDIR; 3810unshift @INC, $LIBDIR;
2974 3811
… …
2976 3813
2977our @WAIT_FOR_TICK; 3814our @WAIT_FOR_TICK;
2978our @WAIT_FOR_TICK_BEGIN; 3815our @WAIT_FOR_TICK_BEGIN;
2979 3816
2980sub wait_for_tick { 3817sub wait_for_tick {
2981 return unless $TICK_WATCHER->is_active;
2982 return if $Coro::current == $Coro::main; 3818 return if tick_inhibit || $Coro::current == $Coro::main;
2983 3819
2984 my $signal = new Coro::Signal; 3820 my $signal = new Coro::Signal;
2985 push @WAIT_FOR_TICK, $signal; 3821 push @WAIT_FOR_TICK, $signal;
2986 $signal->wait; 3822 $signal->wait;
2987} 3823}
2988 3824
2989sub wait_for_tick_begin { 3825sub wait_for_tick_begin {
2990 return unless $TICK_WATCHER->is_active;
2991 return if $Coro::current == $Coro::main; 3826 return if tick_inhibit || $Coro::current == $Coro::main;
2992 3827
2993 my $signal = new Coro::Signal; 3828 my $signal = new Coro::Signal;
2994 push @WAIT_FOR_TICK_BEGIN, $signal; 3829 push @WAIT_FOR_TICK_BEGIN, $signal;
2995 $signal->wait; 3830 $signal->wait;
2996} 3831}
2997 3832
2998 my $min = 1e6;#d# 3833sub tick {
2999 my $avg = 10;
3000$TICK_WATCHER = Event->timer (
3001 reentrant => 0,
3002 parked => 1,
3003 prio => 0,
3004 at => $NEXT_TICK || $TICK,
3005 data => WF_AUTOCANCEL,
3006 cb => sub {
3007 if ($Coro::current != $Coro::main) { 3834 if ($Coro::current != $Coro::main) {
3008 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3835 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3009 unless ++$bug_warning > 10; 3836 unless ++$bug_warning > 10;
3010 return; 3837 return;
3011 } 3838 }
3012 3839
3013 $NOW = $tick_start = Event::time;
3014
3015 cf::server_tick; # one server iteration 3840 cf::server_tick; # one server iteration
3016 3841
3017 0 && sync_job {#d# 3842 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3018 for(1..10) { 3843 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3019 my $t = Event::time; 3844 Coro::async_pool {
3020 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3845 $Coro::current->{desc} = "runtime saver";
3021 or die; 3846 write_runtime_sync
3022 3847 or warn "ERROR: unable to write runtime file: $!";
3023 $map->width (50);
3024 $map->height (50);
3025 $map->alloc;
3026 $map->_load_objects ("/tmp/x.map", 1);
3027 my $t = Event::time - $t;
3028
3029 #next unless $t < 0.0013;#d#
3030 if ($t < $min) {
3031 $min = $t;
3032 }
3033 $avg = $avg * 0.99 + $t * 0.01;
3034 }
3035 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3036 exit 0;
3037 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3038 }; 3848 };
3849 }
3039 3850
3040 $RUNTIME += $TICK;
3041 $NEXT_TICK += $TICK;
3042
3043 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3044 $NEXT_RUNTIME_WRITE = $NOW + 10;
3045 Coro::async_pool {
3046 write_runtime
3047 or warn "ERROR: unable to write runtime file: $!";
3048 };
3049 }
3050
3051# my $AFTER = Event::time;
3052# warn $AFTER - $NOW;#d#
3053
3054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3851 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3055 $sig->send; 3852 $sig->send;
3056 } 3853 }
3057 while (my $sig = shift @WAIT_FOR_TICK) { 3854 while (my $sig = shift @WAIT_FOR_TICK) {
3058 $sig->send; 3855 $sig->send;
3059 } 3856 }
3060 3857
3061 $NOW = Event::time; 3858 $LOAD = ($NOW - $TICK_START) / $TICK;
3062
3063 # if we are delayed by four ticks or more, skip them all
3064 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3065
3066 $TICK_WATCHER->at ($NEXT_TICK);
3067 $TICK_WATCHER->start;
3068
3069 $LOAD = ($NOW - $tick_start) / $TICK;
3070 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3859 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3071 3860
3072 _post_tick; 3861 if (0) {
3073 3862 if ($NEXT_TICK) {
3074 3863 my $jitter = $TICK_START - $NEXT_TICK;
3864 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3865 warn "jitter $JITTER\n";#d#
3866 }
3075 }, 3867 }
3076); 3868}
3077 3869
3078{ 3870{
3079 BDB::max_poll_time $TICK * 0.1; 3871 # configure BDB
3080 $BDB_POLL_WATCHER = Event->io ( 3872
3081 reentrant => 0,
3082 fd => BDB::poll_fileno,
3083 poll => 'r',
3084 prio => 0,
3085 data => WF_AUTOCANCEL,
3086 cb => \&BDB::poll_cb,
3087 );
3088 BDB::min_parallel 8; 3873 BDB::min_parallel 8;
3089 3874 BDB::max_poll_reqs $TICK * 0.1;
3090 BDB::set_sync_prepare { 3875 $AnyEvent::BDB::WATCHER->priority (1);
3091 my $status;
3092 my $current = $Coro::current;
3093 (
3094 sub {
3095 $status = $!;
3096 $current->ready; undef $current;
3097 },
3098 sub {
3099 Coro::schedule while defined $current;
3100 $! = $status;
3101 },
3102 )
3103 };
3104 3876
3105 unless ($DB_ENV) { 3877 unless ($DB_ENV) {
3106 $DB_ENV = BDB::db_env_create; 3878 $DB_ENV = BDB::db_env_create;
3879 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3880 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3881 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3882 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3883 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3107 3884
3108 cf::sync_job { 3885 cf::sync_job {
3109 eval { 3886 eval {
3110 BDB::db_env_open 3887 BDB::db_env_open
3111 $DB_ENV, 3888 $DB_ENV,
… …
3113 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3890 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3114 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3891 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3115 0666; 3892 0666;
3116 3893
3117 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3894 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3118
3119 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3120 $DB_ENV->set_lk_detect;
3121 }; 3895 };
3122 3896
3123 cf::cleanup "db_env_open(db): $@" if $@; 3897 cf::cleanup "db_env_open(db): $@" if $@;
3124 }; 3898 };
3125 } 3899 }
3900
3901 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3902 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3903 };
3904 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3905 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3906 };
3907 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3908 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3909 };
3126} 3910}
3127 3911
3128{ 3912{
3913 # configure IO::AIO
3914
3129 IO::AIO::min_parallel 8; 3915 IO::AIO::min_parallel 8;
3130
3131 undef $Coro::AIO::WATCHER;
3132 IO::AIO::max_poll_time $TICK * 0.1; 3916 IO::AIO::max_poll_time $TICK * 0.1;
3133 $AIO_POLL_WATCHER = Event->io ( 3917 undef $AnyEvent::AIO::WATCHER;
3134 reentrant => 0,
3135 data => WF_AUTOCANCEL,
3136 fd => IO::AIO::poll_fileno,
3137 poll => 'r',
3138 prio => 6,
3139 cb => \&IO::AIO::poll_cb,
3140 );
3141} 3918}
3142 3919
3143my $_log_backtrace; 3920my $_log_backtrace;
3144 3921
3145sub _log_backtrace { 3922sub _log_backtrace {
… …
3148 $msg =~ s/\n//; 3925 $msg =~ s/\n//;
3149 3926
3150 # limit the # of concurrent backtraces 3927 # limit the # of concurrent backtraces
3151 if ($_log_backtrace < 2) { 3928 if ($_log_backtrace < 2) {
3152 ++$_log_backtrace; 3929 ++$_log_backtrace;
3930 my $perl_bt = Carp::longmess $msg;
3153 async { 3931 async {
3932 $Coro::current->{desc} = "abt $msg";
3933
3154 my @bt = fork_call { 3934 my @bt = fork_call {
3155 @addr = map { sprintf "%x", $_ } @addr; 3935 @addr = map { sprintf "%x", $_ } @addr;
3156 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3936 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3157 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3937 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3158 or die "addr2line: $!"; 3938 or die "addr2line: $!";
… …
3166 } 3946 }
3167 3947
3168 @funcs 3948 @funcs
3169 }; 3949 };
3170 3950
3171 LOG llevInfo, "[ABT] $msg\n"; 3951 LOG llevInfo, "[ABT] $perl_bt\n";
3952 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3172 LOG llevInfo, "[ABT] $_\n" for @bt; 3953 LOG llevInfo, "[ABT] $_\n" for @bt;
3173 --$_log_backtrace; 3954 --$_log_backtrace;
3174 }; 3955 };
3175 } else { 3956 } else {
3176 LOG llevInfo, "[ABT] $msg\n"; 3957 LOG llevInfo, "[ABT] $msg\n";
3177 LOG llevInfo, "[ABT] [suppressed]\n"; 3958 LOG llevInfo, "[ABT] [suppressed]\n";
3178 } 3959 }
3179} 3960}
3180 3961
3181# load additional modules 3962# load additional modules
3182use cf::pod; 3963require "cf/$_.pm" for @EXTRA_MODULES;
3183 3964
3184END { cf::emergency_save } 3965END { cf::emergency_save }
3185 3966
31861 39671
3187 3968

Diff Legend

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