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.300 by root, Tue Jul 10 06:44:29 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
25use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
26use BDB (); 54use BDB ();
27use Data::Dumper; 55use Data::Dumper;
28use Digest::MD5; 56use Digest::MD5;
29use Fcntl; 57use Fcntl;
30use YAML::Syck (); 58use YAML ();
31use IO::AIO 2.32 (); 59use IO::AIO ();
32use Time::HiRes; 60use Time::HiRes;
33use Compress::LZF; 61use Compress::LZF;
62use Digest::MD5 ();
63
64AnyEvent::detect;
34 65
35# configure various modules to our taste 66# configure various modules to our taste
36# 67#
37$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
38Coro::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";
39Compress::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
40 76
41$Event::Eval = 1; # no idea why this is required, but it is 77# strictly for debugging
42 78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 79
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 81
50our %COMMAND = (); 82our %COMMAND = ();
51our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
… …
54our %EXTCMD = (); 86our %EXTCMD = ();
55our %EXTICMD = (); 87our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
58 90
59our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 92our @EVENT;
61 93
62our $CONFDIR = confdir; 94our $CONFDIR = confdir;
63our $DATADIR = datadir; 95our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 96our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 97our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 98our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 99our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 100our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 102our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 103our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 104our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime";
107
108our %RESOURCE;
73 109
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 112our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 113our $USE_FSYNC = 1; # use fsync to write maps - default on
81 114
115our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER;
82our $BDB_POLL_WATCHER; 117our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 118our $DB_ENV;
119
120our @EXTRA_MODULES = qw(pod mapscript);
84 121
85our %CFG; 122our %CFG;
86 123
87our $UPTIME; $UPTIME ||= time; 124our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 125our $RUNTIME;
126our $NOW;
89 127
90our %PLAYER; # all users 128our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 129our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 130our $LINK_MAP; # the special {link} map, which is always available
93 131
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 133our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 134
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 135our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 136our $LOADAVG; # same thing, but with alpha-smoothing
137our $JITTER; # average jitter
99our $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 :)
100 144
101binmode STDOUT; 145binmode STDOUT;
102binmode STDERR; 146binmode STDERR;
103 147
104# read virtual server time, if available 148# read virtual server time, if available
105unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 149unless ($RUNTIME || !-e $RUNTIMEFILE) {
106 open my $fh, "<", "$LOCALDIR/runtime" 150 open my $fh, "<", $RUNTIMEFILE
107 or die "unable to read runtime file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
108 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
109} 153}
154
155eval "sub TICK() { $TICK } 1" or die;
110 156
111mkdir $_ 157mkdir $_
112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
113 159
114our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
… …
157 203
158The raw value load value from the last tick. 204The raw value load value from the last tick.
159 205
160=item %cf::CFG 206=item %cf::CFG
161 207
162Configuration for the server, loaded from C</etc/crossfire/config>, or 208Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 209from wherever your confdir points to.
164 210
165=item cf::wait_for_tick, cf::wait_for_tick_begin 211=item cf::wait_for_tick, cf::wait_for_tick_begin
166 212
167These 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
168returns 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
169per 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.
170 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
171=back 223=back
172 224
173=cut 225=cut
174 226
175BEGIN { 227BEGIN {
… …
179 $msg .= "\n" 231 $msg .= "\n"
180 unless $msg =~ /\n$/; 232 unless $msg =~ /\n$/;
181 233
182 $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;
183 235
184 utf8::encode $msg;
185 LOG llevError, $msg; 236 LOG llevError, $msg;
186 }; 237 };
187} 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#?
188 254
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
199for my $pkg (qw( 265for my $pkg (qw(
200 cf::global cf::attachable 266 cf::global cf::attachable
201 cf::object cf::object::player 267 cf::object cf::object::player
202 cf::client cf::player 268 cf::client cf::player
203 cf::arch cf::living 269 cf::arch cf::living
270 cf::map cf::mapspace
204 cf::map cf::party cf::region 271 cf::party cf::region
205)) { 272)) {
206 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 274}
209 275
210$Event::DIED = sub { 276$EV::DIED = sub {
211 warn "error in event callback: @_"; 277 warn "error in event callback: @_";
212}; 278};
213 279
214############################################################################# 280#############################################################################
215 281
… …
238 $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;
239 $d 305 $d
240 } || "[unable to dump $_[0]: '$@']"; 306 } || "[unable to dump $_[0]: '$@']";
241} 307}
242 308
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
251=cut 317=cut
252 318
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 319our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 320
255sub to_json ($) { $json_coder->encode ($_[0]) } 321sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[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}
257 337
258=item cf::lock_wait $string 338=item cf::lock_wait $string
259 339
260Wait until the given lock is available. See cf::lock_acquire. 340Wait until the given lock is available. See cf::lock_acquire.
261 341
262=item my $lock = cf::lock_acquire $string 342=item my $lock = cf::lock_acquire $string
263 343
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 346for example when the coroutine gets canceled), the lock is automatically
267returned. 347returned.
268 348
349Locks are *not* recursive, locking from the same coro twice results in a
350deadlocked coro.
351
269Lock 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
270uses map_find and cf::map::load uses map_load). 353uses map_find and cf::map::load uses map_load).
271 354
272=item $locked = cf::lock_active $string 355=item $locked = cf::lock_active $string
273 356
274Return 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.
275 358
276=cut 359=cut
277 360
278our %LOCK; 361our $LOCKS = new Coro::SemaphoreSet;
279 362
280sub lock_wait($) { 363sub lock_wait($) {
281 my ($key) = @_; 364 $LOCKS->wait ($_[0]);
282
283 # wait for lock, if any
284 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule;
287 }
288} 365}
289 366
290sub lock_acquire($) { 367sub lock_acquire($) {
291 my ($key) = @_; 368 $LOCKS->guard ($_[0])
292
293 # wait, to be sure we are not locked
294 lock_wait $key;
295
296 $LOCK{$key} = [];
297
298 Coro::guard {
299 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} };
301 }
302} 369}
303 370
304sub lock_active($) { 371sub lock_active($) {
305 my ($key) = @_; 372 $LOCKS->count ($_[0]) < 1
306
307 ! ! $LOCK{$key}
308} 373}
309 374
310sub freeze_mainloop { 375sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 376 tick_inhibit_inc;
312 377
313 my $guard = Coro::guard { 378 &Guard::guard (\&tick_inhibit_dec);
314 $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 }
315 }; 439 }
316 $TICK_WATCHER->stop; 440};
317 $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;
318} 454}
319 455
320=item cf::async { BLOCK } 456=item cf::async { BLOCK }
321 457
322Currently the same as Coro::async_pool, meaning you cannot use 458Currently the same as Coro::async_pool, meaning you cannot use
… …
327 463
328BEGIN { *async = \&Coro::async_pool } 464BEGIN { *async = \&Coro::async_pool }
329 465
330=item cf::sync_job { BLOCK } 466=item cf::sync_job { BLOCK }
331 467
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 468The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 469is always able to handle events or runnable, as Deliantra is only
334partly 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
335acceptable. 471acceptable.
336 472
337If 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
338the given BLOCK in another coroutine while waiting for the result. The 474the given BLOCK in another coroutine while waiting for the result. The
… …
343 479
344sub sync_job(&) { 480sub sync_job(&) {
345 my ($job) = @_; 481 my ($job) = @_;
346 482
347 if ($Coro::current == $Coro::main) { 483 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 484 my $time = EV::time;
349 485
350 # this is the main coro, too bad, we have to block 486 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 487 # till the operation succeeds, freezing the server :/
352 488
353 # TODO: use suspend/resume instead 489 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 490
355 my $freeze_guard = freeze_mainloop; 491 my $freeze_guard = freeze_mainloop;
356 492
357 my $busy = 1; 493 my $busy = 1;
358 my @res; 494 my @res;
359 495
360 (async { 496 (async {
497 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 498 @res = eval { $job->() };
362 warn $@ if $@; 499 warn $@ if $@;
363 undef $busy; 500 undef $busy;
364 })->prio (Coro::PRIO_MAX); 501 })->prio (Coro::PRIO_MAX);
365 502
366 while ($busy) { 503 while ($busy) {
367 Coro::cede or Event::one_event; 504 if (Coro::nready) {
505 Coro::cede_notself;
506 } else {
507 EV::loop EV::LOOP_ONESHOT;
368 } 508 }
509 }
369 510
370 $time = Event::time - $time; 511 my $time = EV::time - $time;
371 512
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 513 $TICK_START += $time; # do not account sync jobs to server load
376 514
377 wantarray ? @res : $res[0] 515 wantarray ? @res : $res[0]
378 } else { 516 } else {
379 # we are in another coroutine, how wonderful, everything just works 517 # we are in another coroutine, how wonderful, everything just works
380 518
… …
405=item fork_call { }, $args 543=item fork_call { }, $args
406 544
407Executes the given code block with the given arguments in a seperate 545Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 546process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 547Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 548never block itself or use any form of event handling.
411 549
412=cut 550=cut
413
414sub _store_scalar {
415 open my $fh, ">", \my $buf
416 or die "fork_call: cannot open fh-to-buf in child : $!";
417 Storable::store_fd $_[0], $fh;
418 close $fh;
419
420 $buf
421}
422 551
423sub fork_call(&@) { 552sub fork_call(&@) {
424 my ($cb, @args) = @_; 553 my ($cb, @args) = @_;
425 554
426# 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,
427# or die "socketpair: $!"; 556 # otherwise perl prematurely frees the stuff :/
428 pipe my $fh1, my $fh2 557 # TODO: investigate and fix (likely this will be rather laborious)
429 or die "pipe: $!";
430 558
431 if (my $pid = fork) { 559 my @res = Coro::Util::fork_eval {
432 close $fh2;
433
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
436 $res = Coro::Storable::thaw $res;
437
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals; 560 reset_signals;
445 local $SIG{__WARN__}; 561 &$cb
446 local $SIG{__DIE__}; 562 }, @args;
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452 563
453 eval { 564 wantarray ? @res : $res[-1]
454 close $fh1; 565}
455 566
456 my @res = eval { $cb->(@args) }; 567=item $coin = coin_from_name $name
457 568
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 569=cut
459 close $fh2;
460 };
461 570
462 warn $@ if $@; 571our %coin_alias = (
463 _exit 0; 572 "silver" => "silvercoin",
464 } 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
465} 592}
466 593
467=item $value = cf::db_get $family => $key 594=item $value = cf::db_get $family => $key
468 595
469Returns a single value from the environment database. 596Returns a single value from the environment database.
… …
471=item cf::db_put $family => $key => $value 598=item cf::db_put $family => $key => $value
472 599
473Stores 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
474data 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).
475 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
476=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}
477 626
478our $DB; 627our $DB;
479 628
480sub db_init { 629sub db_init {
481 unless ($DB) {
482 $DB = BDB::db_create $DB_ENV;
483
484 cf::sync_job { 630 cf::sync_job {
485 eval { 631 $DB ||= db_table "db";
486 $DB->set_flags (BDB::CHKSUM);
487
488 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
489 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
490 cf::cleanup "db_open(db): $!" if $!;
491 };
492 cf::cleanup "db_open(db): $@" if $@;
493 };
494 } 632 };
495} 633}
496 634
497sub db_get($$) { 635sub db_get($$) {
498 my $key = "$_[0]/$_[1]"; 636 my $key = "$_[0]/$_[1]";
499 637
… …
549 if (1) { 687 if (1) {
550 $md5 = 688 $md5 =
551 join "\x00", 689 join "\x00",
552 $processversion, 690 $processversion,
553 map { 691 map {
554 Coro::cede; 692 cf::cede_to_tick;
555 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 693 ($src->[$_], Digest::MD5::md5_hex $data[$_])
556 } 0.. $#$src; 694 } 0.. $#$src;
557 695
558 696
559 my $dbmd5 = db_get cache => "$id/md5"; 697 my $dbmd5 = db_get cache => "$id/md5";
… …
597 735
598############################################################################# 736#############################################################################
599 737
600=head2 ATTACHABLE OBJECTS 738=head2 ATTACHABLE OBJECTS
601 739
602Many 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
603attach callbacks/event handlers (a collection of which is called an "attachment") 741attach callbacks/event handlers (a collection of which is called an "attachment")
604to it. All such attachable objects support the following methods. 742to it. All such attachable objects support the following methods.
605 743
606In 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>
607C<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
608Crossfire TRT). 746Deliantra).
609 747
610=over 4 748=over 4
611 749
612=item $attachable->attach ($attachment, key => $value...) 750=item $attachable->attach ($attachment, key => $value...)
613 751
… …
657=item cf::CLASS::attachment $name, ... 795=item cf::CLASS::attachment $name, ...
658 796
659Register an attachment by C<$name> through which attachable objects of the 797Register an attachment by C<$name> through which attachable objects of the
660given CLASS can refer to this attachment. 798given CLASS can refer to this attachment.
661 799
662Some classes such as crossfire maps and objects can specify attachments 800Some classes such as deliantra maps and objects can specify attachments
663that 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.
664 802
665These calls expect any number of the following handler/hook descriptions: 803These calls expect any number of the following handler/hook descriptions:
666 804
667=over 4 805=over 4
… …
865 "; 1003 ";
866 die if $@; 1004 die if $@;
867} 1005}
868 1006
869our $override; 1007our $override;
870our @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?
871 1009
872sub override { 1010sub override {
873 $override = 1; 1011 $override = 1;
874 @invoke_results = (); 1012 @INVOKE_RESULTS = (@_);
875} 1013}
876 1014
877sub do_invoke { 1015sub do_invoke {
878 my $event = shift; 1016 my $event = shift;
879 my $callbacks = shift; 1017 my $callbacks = shift;
880 1018
881 @invoke_results = (); 1019 @INVOKE_RESULTS = ();
882 1020
883 local $override; 1021 local $override;
884 1022
885 for (@$callbacks) { 1023 for (@$callbacks) {
886 eval { &{$_->[1]} }; 1024 eval { &{$_->[1]} };
… …
895 } 1033 }
896 1034
897 0 1035 0
898} 1036}
899 1037
900=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1038=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
901 1039
902=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1040=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
903 1041
904Generate an object-specific event with the given arguments. 1042Generate an object-specific event with the given arguments.
905 1043
906This 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
907removed 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
908results (if you must, access C<@cf::invoke_results> directly). 1046results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909 1047
910=back 1048=back
911 1049
912=cut 1050=cut
913 1051
914############################################################################# 1052#############################################################################
915# 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}
916 1096
917sub reattach { 1097sub reattach {
918 # basically do the same as instantiate, without calling instantiate 1098 # basically do the same as instantiate, without calling instantiate
919 my ($obj) = @_; 1099 my ($obj) = @_;
920 1100
1101 # no longer needed after getting rid of delete_package?
921 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
922 1103
923 my $registry = $obj->registry; 1104 my $registry = $obj->registry;
924 1105
925 @$registry = (); 1106 @$registry = ();
926 1107
… …
941cf::attachable->attach ( 1122cf::attachable->attach (
942 prio => -1000000, 1123 prio => -1000000,
943 on_instantiate => sub { 1124 on_instantiate => sub {
944 my ($obj, $data) = @_; 1125 my ($obj, $data) = @_;
945 1126
946 $data = from_json $data; 1127 $data = decode_json $data;
947 1128
948 for (@$data) { 1129 for (@$data) {
949 my ($name, $args) = @$_; 1130 my ($name, $args) = @$_;
950 1131
951 $obj->attach ($name, %{$args || {} }); 1132 $obj->attach ($name, %{$args || {} });
… …
967sub object_freezer_save { 1148sub object_freezer_save {
968 my ($filename, $rdata, $objs) = @_; 1149 my ($filename, $rdata, $objs) = @_;
969 1150
970 sync_job { 1151 sync_job {
971 if (length $$rdata) { 1152 if (length $$rdata) {
1153 utf8::decode (my $decname = $filename);
972 warn sprintf "saving %s (%d,%d)\n", 1154 warn sprintf "saving %s (%d,%d)\n",
973 $filename, length $$rdata, scalar @$objs; 1155 $decname, length $$rdata, scalar @$objs;
974 1156
975 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
976 chmod SAVE_MODE, $fh; 1158 aio_chmod $fh, SAVE_MODE;
977 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
978 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 }
979 close $fh; 1164 aio_close $fh;
980 1165
981 if (@$objs) { 1166 if (@$objs) {
982 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) {
983 chmod SAVE_MODE, $fh; 1168 aio_chmod $fh, SAVE_MODE;
984 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1169 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
985 aio_write $fh, 0, (length $data), $data, 0; 1170 aio_write $fh, 0, (length $data), $data, 0;
986 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 }
987 close $fh; 1175 aio_close $fh;
988 aio_rename "$filename.pst~", "$filename.pst"; 1176 aio_rename "$filename.pst~", "$filename.pst";
989 } 1177 }
990 } else { 1178 } else {
991 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
992 } 1180 }
993 1181
994 aio_rename "$filename~", $filename; 1182 aio_rename "$filename~", $filename;
1183
1184 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC;
995 } else { 1186 } else {
996 warn "FATAL: $filename~: $!\n"; 1187 warn "unable to save objects: $filename~: $!\n";
997 } 1188 }
998 } else { 1189 } else {
999 aio_unlink $filename; 1190 aio_unlink $filename;
1000 aio_unlink "$filename.pst"; 1191 aio_unlink "$filename.pst";
1001 } 1192 }
1002 } 1193 };
1003} 1194}
1004 1195
1005sub object_freezer_as_string { 1196sub object_freezer_as_string {
1006 my ($rdata, $objs) = @_; 1197 my ($rdata, $objs) = @_;
1007 1198
… …
1019 or return; 1210 or return;
1020 1211
1021 unless (aio_stat "$filename.pst") { 1212 unless (aio_stat "$filename.pst") {
1022 (aio_load "$filename.pst", $av) >= 0 1213 (aio_load "$filename.pst", $av) >= 0
1023 or return; 1214 or return;
1215
1024 $av = eval { (Storable::thaw $av)->{objs} }; 1216 my $st = eval { Coro::Storable::thaw $av };
1217 $av = $st->{objs};
1025 } 1218 }
1026 1219
1220 utf8::decode (my $decname = $filename);
1027 warn sprintf "loading %s (%d)\n", 1221 warn sprintf "loading %s (%d,%d)\n",
1028 $filename, length $data, scalar @{$av || []}; 1222 $decname, length $data, scalar @{$av || []};
1223
1029 return ($data, $av); 1224 ($data, $av)
1030} 1225}
1031 1226
1032=head2 COMMAND CALLBACKS 1227=head2 COMMAND CALLBACKS
1033 1228
1034=over 4 1229=over 4
… …
1088 my ($name, $cb) = @_; 1283 my ($name, $cb) = @_;
1089 1284
1090 $EXTICMD{$name} = $cb; 1285 $EXTICMD{$name} = $cb;
1091} 1286}
1092 1287
1288use File::Glob ();
1289
1093cf::player->attach ( 1290cf::player->attach (
1094 on_command => sub { 1291 on_command => sub {
1095 my ($pl, $name, $params) = @_; 1292 my ($pl, $name, $params) = @_;
1096 1293
1097 my $cb = $COMMAND{$name} 1294 my $cb = $COMMAND{$name}
… …
1107 my ($pl, $buf) = @_; 1304 my ($pl, $buf) = @_;
1108 1305
1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1306 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110 1307
1111 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
1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1316 if (my $cb = $EXTCMD{$type}) {
1113 if (my %reply = $cb->($pl, $msg)) { 1317 @reply = $cb->($pl, @payload);
1114 $pl->ext_reply ($msg->{msgid}, %reply);
1115 }
1116 } 1318 }
1319
1320 $pl->ext_reply ($reply, @reply)
1321 if $reply;
1322
1117 } else { 1323 } else {
1118 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1324 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119 } 1325 }
1120 1326
1121 cf::override; 1327 cf::override;
1122 }, 1328 },
1123); 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}
1124 1343
1125sub load_extensions { 1344sub load_extensions {
1126 cf::sync_job { 1345 cf::sync_job {
1127 my %todo; 1346 my %todo;
1128 1347
… …
1148 1367
1149 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1368 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1150 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1369 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1151 1370
1152 $ext{source} = 1371 $ext{source} =
1153 "package $pkg; use strict; use utf8;\n" 1372 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1154 . "#line 1 \"$path\"\n{\n" 1373 . "#line 1 \"$path\"\n{\n"
1155 . $source 1374 . $source
1156 . "\n};\n1"; 1375 . "\n};\n1";
1157 1376
1158 $todo{$base} = \%ext; 1377 $todo{$base} = \%ext;
… …
1174 my $msg = $@ ? "$v->{path}: $@\n" 1393 my $msg = $@ ? "$v->{path}: $@\n"
1175 : "$v->{base}: extension inactive.\n"; 1394 : "$v->{base}: extension inactive.\n";
1176 1395
1177 if (exists $v->{meta}{mandatory}) { 1396 if (exists $v->{meta}{mandatory}) {
1178 warn $msg; 1397 warn $msg;
1179 warn "mandatory extension failed to load, exiting.\n"; 1398 cf::cleanup "mandatory extension failed to load, exiting.";
1180 exit 1;
1181 } 1399 }
1182 1400
1183 warn $msg; 1401 warn $msg;
1184 } 1402 }
1185 1403
… …
1199 1417
1200=back 1418=back
1201 1419
1202=head2 CORE EXTENSIONS 1420=head2 CORE EXTENSIONS
1203 1421
1204Functions and methods that extend core crossfire objects. 1422Functions and methods that extend core deliantra objects.
1205 1423
1206=cut 1424=cut
1207 1425
1208package cf::player; 1426package cf::player;
1209 1427
1210use Coro::AIO; 1428use Coro::AIO;
1211 1429
1212=head3 cf::player 1430=head3 cf::player
1213 1431
1214=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}
1215 1447
1216=item cf::player::find $login 1448=item cf::player::find $login
1217 1449
1218Returns the given player object, loading it if necessary (might block). 1450Returns the given player object, loading it if necessary (might block).
1219 1451
… …
1238 1470
1239sub exists($) { 1471sub exists($) {
1240 my ($login) = @_; 1472 my ($login) = @_;
1241 1473
1242 $cf::PLAYER{$login} 1474 $cf::PLAYER{$login}
1243 or cf::sync_job { !aio_stat path $login } 1475 or !aio_stat path $login
1244} 1476}
1245 1477
1246sub find($) { 1478sub find($) {
1247 return $cf::PLAYER{$_[0]} || do { 1479 return $cf::PLAYER{$_[0]} || do {
1248 my $login = $_[0]; 1480 my $login = $_[0];
… …
1255 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1487 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1256 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1488 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1257 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1489 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1258 aio_unlink +(playerdir $login) . "/$login.pl"; 1490 aio_unlink +(playerdir $login) . "/$login.pl";
1259 1491
1260 my $pl = load_pl path $login 1492 my $f = new_from_file cf::object::thawer path $login
1261 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;
1262 $cf::PLAYER{$login} = $pl 1500 $cf::PLAYER{$login} = $pl
1263 } 1501 }
1264 } 1502 }
1265} 1503}
1266 1504
… …
1275 return if $pl->{deny_save}; 1513 return if $pl->{deny_save};
1276 1514
1277 aio_mkdir playerdir $pl, 0770; 1515 aio_mkdir playerdir $pl, 0770;
1278 $pl->{last_save} = $cf::RUNTIME; 1516 $pl->{last_save} = $cf::RUNTIME;
1279 1517
1518 cf::get_slot 0.01;
1519
1280 $pl->save_pl ($path); 1520 $pl->save_pl ($path);
1281 Coro::cede; 1521 cf::cede_to_tick;
1282} 1522}
1283 1523
1284sub new($) { 1524sub new($) {
1285 my ($login) = @_; 1525 my ($login) = @_;
1286 1526
… …
1292 $cf::PLAYER{$login} = $self; 1532 $cf::PLAYER{$login} = $self;
1293 1533
1294 $self 1534 $self
1295} 1535}
1296 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
1297=item $pl->quit_character 1547=item $pl->quit_character
1298 1548
1299Nukes the player without looking back. If logged in, the connection will 1549Nukes the player without looking back. If logged in, the connection will
1300be destroyed. May block for a long time. 1550be destroyed. May block for a long time.
1301 1551
… …
1305 my ($pl) = @_; 1555 my ($pl) = @_;
1306 1556
1307 my $name = $pl->ob->name; 1557 my $name = $pl->ob->name;
1308 1558
1309 $pl->{deny_save} = 1; 1559 $pl->{deny_save} = 1;
1310 $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
1311 1561
1312 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1313 $pl->deactivate; 1563 $pl->deactivate;
1564 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1565 $pl->ob->check_score;
1314 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1566 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1315 $pl->ns->destroy if $pl->ns; 1567 $pl->ns->destroy if $pl->ns;
1316 1568
1317 my $path = playerdir $pl; 1569 my $path = playerdir $pl;
1318 my $temp = "$path~$cf::RUNTIME~deleting~"; 1570 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1354 or return []; 1606 or return [];
1355 1607
1356 my @logins; 1608 my @logins;
1357 1609
1358 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") {
1359 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1616 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1360 aio_read $fh, 0, 512, my $buf, 0 or next; 1617 aio_read $fh, 0, 512, my $buf, 0 or next;
1361 $buf !~ /^password -------------$/m or next; # official not-valid tag 1618 $buf !~ /^password -------------$/m or next; # official not-valid tag
1619 }
1362 1620
1363 utf8::decode $login; 1621 utf8::decode $login;
1364 push @logins, $login; 1622 push @logins, $login;
1365 } 1623 }
1366 1624
… …
1393 } 1651 }
1394 1652
1395 \@paths 1653 \@paths
1396} 1654}
1397 1655
1398=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1656=item $protocol_xml = $player->expand_cfpod ($cfpod)
1399 1657
1400Expand crossfire pod fragments into protocol xml. 1658Expand deliantra pod fragments into protocol xml.
1401 1659
1402=cut
1403
1404sub expand_cfpod {
1405 ((my $self), (local $_)) = @_;
1406
1407 # escape & and <
1408 s/&/&amp;/g;
1409 s/(?<![BIUGH])</&lt;/g;
1410
1411 # this is buggy, it needs to properly take care of nested <'s
1412
1413 1 while
1414 # replace B<>, I<>, U<> etc.
1415 s/B<([^\>]*)>/<b>$1<\/b>/
1416 || s/I<([^\>]*)>/<i>$1<\/i>/
1417 || s/U<([^\>]*)>/<u>$1<\/u>/
1418 # replace G<male|female> tags
1419 || s{G<([^>|]*)\|([^>]*)>}{
1420 $self->gender ? $2 : $1
1421 }ge
1422 # replace H<hint text>
1423 || s{H<([^\>]*)>}
1424 {
1425 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1426 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1427 "")
1428 [$self->{hintmode}]
1429 }ge;
1430
1431 # create single paragraphs (very hackish)
1432 s/(?<=\S)\n(?=\w)/ /g;
1433
1434 # compress some whitespace
1435 s/\s+\n/\n/g; # ws line-ends
1436 s/\n\n+/\n/g; # double lines
1437 s/^\n+//; # beginning lines
1438 s/\n+$//; # ending lines
1439
1440 warn $_;#d#
1441 $_
1442}
1443
1444sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode}
1447}
1448
1449=item $player->ext_reply ($msgid, %msg) 1660=item $player->ext_reply ($msgid, @msg)
1450 1661
1451Sends an ext reply to the player. 1662Sends an ext reply to the player.
1452 1663
1453=cut 1664=cut
1454 1665
1455sub ext_reply($$%) { 1666sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1667 my ($self, $id, @msg) = @_;
1457 1668
1458 $msg{msgid} = $id; 1669 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1670}
1461 1671
1462=item $player->ext_event ($type, %msg) 1672=item $player->ext_msg ($type, @msg)
1463 1673
1464Sends an ext event to the client. 1674Sends an ext event to the client.
1465 1675
1466=cut 1676=cut
1467 1677
1468sub ext_event($$%) { 1678sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1679 my ($self, $type, @msg) = @_;
1470 1680
1471 $self->ns->ext_event ($type, %msg); 1681 $self->ns->ext_msg ($type, @msg);
1472} 1682}
1473 1683
1474=head3 cf::region 1684=head3 cf::region
1475 1685
1476=over 4 1686=over 4
… …
1489 my ($path) = @_; 1699 my ($path) = @_;
1490 1700
1491 my ($match, $specificity); 1701 my ($match, $specificity);
1492 1702
1493 for my $region (list) { 1703 for my $region (list) {
1494 if ($region->match && $path =~ $region->match) { 1704 if ($region->{match} && $path =~ $region->{match}) {
1495 ($match, $specificity) = ($region, $region->specificity) 1705 ($match, $specificity) = ($region, $region->specificity)
1496 if $region->specificity > $specificity; 1706 if $region->specificity > $specificity;
1497 } 1707 }
1498 } 1708 }
1499 1709
… …
1520our $MAX_RESET = 3600; 1730our $MAX_RESET = 3600;
1521our $DEFAULT_RESET = 3000; 1731our $DEFAULT_RESET = 3000;
1522 1732
1523sub generate_random_map { 1733sub generate_random_map {
1524 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
1525 # mit "rum" bekleckern, nicht 1738 # mit "rum" bekleckern, nicht
1526 $self->_create_random_map ( 1739 $self->_create_random_map (
1527 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1528 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1529 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1619 $self->init; # pass $1 etc. 1832 $self->init; # pass $1 etc.
1620 return $self; 1833 return $self;
1621 } 1834 }
1622 } 1835 }
1623 1836
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1837 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1838 ()
1626} 1839}
1627 1840
1628sub init { 1841sub init {
1629 my ($self) = @_; 1842 my ($self) = @_;
… …
1651 1864
1652# the temporary/swap location 1865# the temporary/swap location
1653sub save_path { 1866sub save_path {
1654 my ($self) = @_; 1867 my ($self) = @_;
1655 1868
1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1869 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1657 "$TMPDIR/$path.map" 1870 "$TMPDIR/$path.map"
1658} 1871}
1659 1872
1660# the unique path, undef == no special unique path 1873# the unique path, undef == no special unique path
1661sub uniq_path { 1874sub uniq_path {
1662 my ($self) = @_; 1875 my ($self) = @_;
1663 1876
1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1877 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1665 "$UNIQUEDIR/$path" 1878 "$UNIQUEDIR/$path"
1666}
1667
1668# and all this just because we cannot iterate over
1669# all maps in C++...
1670sub change_all_map_light {
1671 my ($change) = @_;
1672
1673 $_->change_map_light ($change)
1674 for grep $_->outdoor, values %cf::MAP;
1675} 1879}
1676 1880
1677sub decay_objects { 1881sub decay_objects {
1678 my ($self) = @_; 1882 my ($self) = @_;
1679 1883
… …
1692 1896
1693sub load_header_from($) { 1897sub load_header_from($) {
1694 my ($self, $path) = @_; 1898 my ($self, $path) = @_;
1695 1899
1696 utf8::encode $path; 1900 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1901 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 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;
1702 1909
1703 $self->{load_path} = $path; 1910 $self->{load_path} = $path;
1704 1911
1705 1 1912 1
1706} 1913}
… …
1760sub find { 1967sub find {
1761 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1762 1969
1763 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1764 1971
1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
1766 1974
1767 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1768 my $guard = cf::lock_acquire "map_find:$path";
1769 my $map = new_from_path cf::map $path 1976 my $map = new_from_path cf::map $path
1770 or return; 1977 or return;
1771 1978
1772 $map->{last_save} = $cf::RUNTIME; 1979 $map->{last_save} = $cf::RUNTIME;
1773 1980
… …
1775 or return; 1982 or return;
1776 1983
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1984 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 1985 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 1986 #$cf::WAIT_FOR_TICK->wait;
1987 undef $guard2;
1988 undef $guard1;
1780 $map->reset; 1989 $map->reset;
1781 undef $guard;
1782 return find $path; 1990 return find $path;
1783 } 1991 }
1784 1992
1785 $cf::MAP{$path} = $map 1993 $cf::MAP{$path} = $map
1786 } 1994 }
… …
1795 local $self->{deny_reset} = 1; # loading can take a long time 2003 local $self->{deny_reset} = 1; # loading can take a long time
1796 2004
1797 my $path = $self->{path}; 2005 my $path = $self->{path};
1798 2006
1799 { 2007 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2008 my $guard = cf::lock_acquire "map_data:$path";
1801 2009
2010 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2011 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2012
1804 $self->in_memory (cf::MAP_LOADING); 2013 $self->in_memory (cf::MAP_LOADING);
1805 2014
1806 $self->alloc; 2015 $self->alloc;
1807 2016
1808 $self->pre_load; 2017 $self->pre_load;
1809 Coro::cede; 2018 cf::cede_to_tick;
1810 2019
2020 my $f = new_from_file cf::object::thawer $self->{load_path};
2021 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2022 $self->_load_objects ($f)
1812 or return; 2023 or return;
1813 2024
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2025 $self->post_load_original
1815 if delete $self->{load_original}; 2026 if delete $self->{load_original};
1816 2027
1817 if (my $uniq = $self->uniq_path) { 2028 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2029 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2030 unless (aio_stat $uniq) {
2031 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2032 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2033 $self->_load_objects ($f);
2034 $f->resolve_delayed_derefs;
2035 }
1822 } 2036 }
1823 } 2037 }
1824 2038
1825 Coro::cede; 2039 $f->resolve_delayed_derefs;
2040
2041 cf::cede_to_tick;
1826 # now do the right thing for maps 2042 # now do the right thing for maps
1827 $self->link_multipart_objects; 2043 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2044 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2045 unless $self->difficulty;
1830 Coro::cede; 2046 cf::cede_to_tick;
1831 2047
1832 unless ($self->{deny_activate}) { 2048 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2049 $self->decay_objects;
1834 $self->fix_auto_apply; 2050 $self->fix_auto_apply;
1835 $self->update_buttons; 2051 $self->update_buttons;
1836 Coro::cede; 2052 cf::cede_to_tick;
1837 $self->set_darkness_map;
1838 Coro::cede;
1839 $self->activate; 2053 $self->activate;
1840 } 2054 }
1841 2055
2056 $self->{last_save} = $cf::RUNTIME;
2057 $self->last_access ($cf::RUNTIME);
2058
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2059 $self->in_memory (cf::MAP_ACTIVE);
1843 } 2060 }
1844 2061
1845 $self->post_load; 2062 $self->post_load;
1846} 2063}
1847 2064
… …
1856 2073
1857 $self 2074 $self
1858} 2075}
1859 2076
1860# 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
1861sub load_diag { 2078sub load_neighbours {
1862 my ($map) = @_; 2079 my ($map) = @_;
1863 2080
1864 my @diag; # diagonal neighbours 2081 my @neigh; # diagonal neighbours
1865 2082
1866 for (0 .. 3) { 2083 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2084 my $neigh = $map->tile_path ($_)
1868 or next; 2085 or next;
1869 $neigh = find $neigh, $map 2086 $neigh = find $neigh, $map
1870 or next; 2087 or next;
1871 $neigh->load; 2088 $neigh->load;
1872 2089
2090 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2091 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2092 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2093 }
1876 2094
1877 for (@diag) { 2095 for (grep defined $_->[0], @neigh) {
2096 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2097 my $neigh = find $path, $origin
1879 or next; 2098 or next;
1880 $neigh->load; 2099 $neigh->load;
1881 } 2100 }
1882} 2101}
1883 2102
… …
1888} 2107}
1889 2108
1890sub do_load_sync { 2109sub do_load_sync {
1891 my ($map) = @_; 2110 my ($map) = @_;
1892 2111
2112 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2113 if $Coro::current == $Coro::main;
2114
1893 cf::sync_job { $map->load }; 2115 cf::sync_job { $map->load };
1894} 2116}
1895 2117
1896our %MAP_PREFETCH; 2118our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2119our $MAP_PREFETCHER = undef;
1898 2120
1899sub find_async { 2121sub find_async {
1900 my ($path, $origin) = @_; 2122 my ($path, $origin, $load) = @_;
1901 2123
1902 $path = normalise $path, $origin && $origin->{path}; 2124 $path = normalise $path, $origin && $origin->{path};
1903 2125
1904 if (my $map = $cf::MAP{$path}) { 2126 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2127 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1906 } 2128 }
1907 2129
1908 undef $MAP_PREFETCH{$path}; 2130 $MAP_PREFETCH{$path} |= $load;
2131
1909 $MAP_PREFETCHER ||= cf::async { 2132 $MAP_PREFETCHER ||= cf::async {
2133 $Coro::current->{desc} = "map prefetcher";
2134
1910 while (%MAP_PREFETCH) { 2135 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2136 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 2137 if (my $map = find $k) {
1913 or next;
1914 $map->load; 2138 $map->load if $v;
2139 }
1915 2140
1916 delete $MAP_PREFETCH{$path}; 2141 delete $MAP_PREFETCH{$k};
1917 } 2142 }
1918 } 2143 }
1919 undef $MAP_PREFETCHER; 2144 undef $MAP_PREFETCHER;
1920 }; 2145 };
1921 $MAP_PREFETCHER->prio (6); 2146 $MAP_PREFETCHER->prio (6);
… …
1924} 2149}
1925 2150
1926sub save { 2151sub save {
1927 my ($self) = @_; 2152 my ($self) = @_;
1928 2153
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2154 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2155
1931 $self->{last_save} = $cf::RUNTIME; 2156 $self->{last_save} = $cf::RUNTIME;
1932 2157
1933 return unless $self->dirty; 2158 return unless $self->dirty;
1934 2159
… …
1940 return if $self->{deny_save}; 2165 return if $self->{deny_save};
1941 2166
1942 local $self->{last_access} = $self->last_access;#d# 2167 local $self->{last_access} = $self->last_access;#d#
1943 2168
1944 cf::async { 2169 cf::async {
2170 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2171 $_->contr->save for $self->players;
1946 }; 2172 };
2173
2174 cf::get_slot 0.02;
1947 2175
1948 if ($uniq) { 2176 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1950 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2178 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1951 } else { 2179 } else {
… …
1957 my ($self) = @_; 2185 my ($self) = @_;
1958 2186
1959 # save first because save cedes 2187 # save first because save cedes
1960 $self->save; 2188 $self->save;
1961 2189
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2191
1964 return if $self->players; 2192 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2193 return if $self->in_memory != cf::MAP_ACTIVE;
1966 return if $self->{deny_save}; 2194 return if $self->{deny_save};
1967 2195
2196 $self->in_memory (cf::MAP_SWAPPED);
2197
2198 $self->deactivate;
2199 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2200 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2201}
1971 2202
1972sub reset_at { 2203sub reset_at {
1973 my ($self) = @_; 2204 my ($self) = @_;
1974 2205
… …
2006 if $uniq; 2237 if $uniq;
2007 } 2238 }
2008 2239
2009 delete $cf::MAP{$self->path}; 2240 delete $cf::MAP{$self->path};
2010 2241
2242 $self->deactivate;
2243 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2244 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2245
2015 $self->unlink_save; 2246 $self->unlink_save;
2016 $self->destroy; 2247 $self->destroy;
2017} 2248}
2018 2249
2019my $nuke_counter = "aaaa"; 2250my $nuke_counter = "aaaa";
2020 2251
2021sub nuke { 2252sub nuke {
2022 my ($self) = @_; 2253 my ($self) = @_;
2023 2254
2255 {
2256 my $lock = cf::lock_acquire "map_data:$self->{path}";
2257
2024 delete $cf::MAP{$self->path}; 2258 delete $cf::MAP{$self->path};
2025 2259
2026 $self->unlink_save; 2260 $self->unlink_save;
2027 2261
2028 bless $self, "cf::map"; 2262 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2263 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2264 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2265 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2266 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2267
2034 $cf::MAP{$self->path} = $self; 2268 $cf::MAP{$self->path} = $self;
2269 }
2035 2270
2036 $self->reset; # polite request, might not happen 2271 $self->reset; # polite request, might not happen
2037} 2272}
2038 2273
2039=item $maps = cf::map::tmp_maps 2274=item $maps = cf::map::tmp_maps
… …
2081 2316
2082sub unique_maps() { 2317sub unique_maps() {
2083 [ 2318 [
2084 map { 2319 map {
2085 utf8::decode $_; 2320 utf8::decode $_;
2086 /\.map$/ 2321 s/\.map$//; # TODO future compatibility hack
2322 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2323 ? ()
2087 ? normalise $_ 2324 : normalise $_
2088 : ()
2089 } @{ aio_readdir $UNIQUEDIR or [] } 2325 } @{ aio_readdir $UNIQUEDIR or [] }
2090 ] 2326 ]
2091} 2327}
2092 2328
2093package cf;
2094
2095=back 2329=back
2096 2330
2097=head3 cf::object 2331=head3 cf::object
2098 2332
2099=cut 2333=cut
… …
2102 2336
2103=over 4 2337=over 4
2104 2338
2105=item $ob->inv_recursive 2339=item $ob->inv_recursive
2106 2340
2107Returns 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.
2108 2343
2109=cut 2344=cut
2110 2345
2111sub inv_recursive_; 2346sub inv_recursive_;
2112sub inv_recursive_ { 2347sub inv_recursive_ {
… …
2115 2350
2116sub inv_recursive { 2351sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2352 inv_recursive_ inv $_[0]
2118} 2353}
2119 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
2120package cf; 2383package cf;
2121 2384
2122=back 2385=back
2123 2386
2124=head3 cf::object::player 2387=head3 cf::object::player
… …
2130Sends 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>
2131can 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
2132dialogue with the given NPC character. 2395dialogue with the given NPC character.
2133 2396
2134=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};
2135 2412
2136# rough implementation of a future "reply" method that works 2413# rough implementation of a future "reply" method that works
2137# with dialog boxes. 2414# with dialog boxes.
2138#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
2139sub cf::object::player::reply($$$;$) { 2416sub cf::object::player::reply($$$;$) {
… …
2146 2423
2147 } else { 2424 } else {
2148 my $pl = $self->contr; 2425 my $pl = $self->contr;
2149 2426
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2427 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2428 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2429 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2430
2159 } else { 2431 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2432 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2433 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2162 } 2434 }
2163 } 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 (@_);
2164} 2446}
2165 2447
2166=item $player_object->may ("access") 2448=item $player_object->may ("access")
2167 2449
2168Returns wether the given player is authorized to access resource "access" 2450Returns wether the given player is authorized to access resource "access"
… …
2181 2463
2182=item $player_object->enter_link 2464=item $player_object->enter_link
2183 2465
2184Freezes 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}>).
2185 2467
2186The 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.
2187I<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.
2188 2472
2189Will never block. 2473Will never block.
2190 2474
2191=item $player_object->leave_link ($map, $x, $y) 2475=item $player_object->leave_link ($map, $x, $y)
2192 2476
… …
2247 # use -1 or undef as default coordinates, not 0, 0 2531 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2532 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2533 if $x <=0 && $y <= 0;
2250 2534
2251 $map->load; 2535 $map->load;
2252 $map->load_diag; 2536 $map->load_neighbours;
2253 2537
2254 return unless $self->contr->active; 2538 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2255 $self->activate_recursive; 2540 $self->activate_recursive;
2256 2541
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2543 $self->enter_map ($map, $x, $y);
2259} 2544}
2260 2545
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2546=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2547
2263Moves 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
2264her, loading and preparing them map, calling the provided $check callback 2549her, loading and preparing them map, calling the provided $check callback
2265that 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
2266the 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 >>.
2267 2556
2268=cut 2557=cut
2269 2558
2270our $GOTOGEN; 2559our $GOTOGEN;
2271 2560
2272sub cf::object::player::goto { 2561sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2562 my ($self, $path, $x, $y, $check, $done) = @_;
2274 2563
2275 # 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
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2565 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2566
2278 $self->enter_link; 2567 $self->enter_link;
2279 2568
2280 (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
2281 my $map = eval { 2591 my $map = eval {
2282 my $map = cf::map::find $path; 2592 my $map = defined $path ? cf::map::find $path : undef;
2283 2593
2284 if ($map) { 2594 if ($map) {
2285 $map = $map->customise_for ($self); 2595 $map = $map->customise_for ($self);
2286 $map = $check->($map) if $check && $map; 2596 $map = $check->($map) if $check && $map;
2287 } else { 2597 } else {
2288 $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);
2289 } 2599 }
2290 2600
2291 $map 2601 $map
2292 }; 2602 };
2293 2603
… …
2298 2608
2299 if ($gen == $self->{_goto_generation}) { 2609 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2610 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2611 $self->leave_link ($map, $x, $y);
2302 } 2612 }
2613
2614 $done->() if $done;
2303 })->prio (1); 2615 })->prio (1);
2304} 2616}
2305 2617
2306=item $player_object->enter_exit ($exit_object) 2618=item $player_object->enter_exit ($exit_object)
2307 2619
… …
2327} 2639}
2328 2640
2329sub prepare_random_map { 2641sub prepare_random_map {
2330 my ($exit) = @_; 2642 my ($exit) = @_;
2331 2643
2332 my $guard = cf::lock_acquire "exit_prepare:$exit";
2333
2334 # all this does is basically replace the /! path by 2644 # all this does is basically replace the /! path by
2335 # a new random map path (?random/...) with a seed 2645 # a new random map path (?random/...) with a seed
2336 # that depends on the exit object 2646 # that depends on the exit object
2337 2647
2338 my $rmp = parse_random_map_params $exit->msg; 2648 my $rmp = parse_random_map_params $exit->msg;
… …
2340 if ($exit->map) { 2650 if ($exit->map) {
2341 $rmp->{region} = $exit->region->name; 2651 $rmp->{region} = $exit->region->name;
2342 $rmp->{origin_map} = $exit->map->path; 2652 $rmp->{origin_map} = $exit->map->path;
2343 $rmp->{origin_x} = $exit->x; 2653 $rmp->{origin_x} = $exit->x;
2344 $rmp->{origin_y} = $exit->y; 2654 $rmp->{origin_y} = $exit->y;
2655
2656 $exit->map->touch;
2345 } 2657 }
2346 2658
2347 $rmp->{random_seed} ||= $exit->random_seed; 2659 $rmp->{random_seed} ||= $exit->random_seed;
2348 2660
2349 my $data = cf::to_json $rmp; 2661 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2350 my $md5 = Digest::MD5::md5_hex $data; 2662 my $md5 = Digest::MD5::md5_hex $data;
2351 my $meta = "$RANDOMDIR/$md5.meta"; 2663 my $meta = "$RANDOMDIR/$md5.meta";
2352 2664
2353 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2665 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2354 aio_write $fh, 0, (length $data), $data, 0; 2666 aio_write $fh, 0, (length $data), $data, 0;
2355 undef $fh; 2667 undef $fh;
2356 aio_rename "$meta~", $meta; 2668 aio_rename "$meta~", $meta;
2357 2669
2670 my $slaying = "?random/$md5";
2671
2672 if ($exit->valid) {
2358 $exit->slaying ("?random/$md5"); 2673 $exit->slaying ("?random/$md5");
2359 $exit->msg (undef); 2674 $exit->msg (undef);
2675 }
2360 } 2676 }
2361} 2677}
2362 2678
2363sub cf::object::player::enter_exit { 2679sub cf::object::player::enter_exit {
2364 my ($self, $exit) = @_; 2680 my ($self, $exit) = @_;
2365 2681
2366 return unless $self->type == cf::PLAYER; 2682 return unless $self->type == cf::PLAYER;
2367 2683
2368 if ($exit->slaying eq "/!") {
2369 #TODO: this should de-fi-ni-te-ly not be a sync-job
2370 # the problem is that $exit might not survive long enough
2371 # so it needs to be done right now, right here
2372 cf::sync_job { prepare_random_map $exit };
2373 }
2374
2375 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2376 my $hp = $exit->stats->hp;
2377 my $sp = $exit->stats->sp;
2378
2379 $self->enter_link; 2684 $self->enter_link;
2380 2685
2381 # if exit is damned, update players death & WoR home-position
2382 $self->contr->savebed ($slaying, $hp, $sp)
2383 if $exit->flag (FLAG_DAMNED);
2384
2385 (async { 2686 (async {
2386 $self->deactivate_recursive; # just to be sure 2687 $Coro::current->{desc} = "enter_exit";
2688
2387 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
2388 $self->goto ($slaying, $hp, $sp); 2704 $self->goto ($map, $x, $y);
2389 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
2390 1; 2710 1
2391 }) { 2711 }) {
2392 $self->message ("Something went wrong deep within the crossfire server. " 2712 $self->message ("Something went wrong deep within the deliantra server. "
2393 . "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. "
2394 . "Please report this to the dungeon master!", 2714 . "Please report this to the dungeon master!",
2395 cf::NDI_UNIQUE | cf::NDI_RED); 2715 cf::NDI_UNIQUE | cf::NDI_RED);
2396 2716
2397 warn "ERROR in enter_exit: $@"; 2717 warn "ERROR in enter_exit: $@";
… …
2416 2736
2417 utf8::encode $text; 2737 utf8::encode $text;
2418 $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);
2419} 2739}
2420 2740
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2741=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2742
2423Send 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
2424client 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
2425the 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
2426the message unless the client supports the msg packet. 2746the message unless the client supports the msg packet.
2427 2747
2428=cut 2748=cut
2429 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
2430sub cf::client::send_msg { 2852sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 2853 my ($self, $channel, $msg, $color, @extra) = @_;
2432 2854
2433 $msg = $self->pl->expand_cfpod ($msg); 2855 $msg = $self->pl->expand_cfpod ($msg)
2856 unless $color & cf::NDI_VERBATIM;
2857
2858 $color &= cf::NDI_CLIENT_MASK; # just in case...
2859
2860 # check predefined channels, for the benefit of C
2861 if ($CHANNEL{$channel}) {
2862 $channel = $CHANNEL{$channel};
2863
2864 $self->ext_msg (channel_info => $channel);
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);
2872 }
2873
2874 $channel = $channel->{id};
2875 }
2434 2876
2435 return unless @extra || length $msg; 2877 return unless @extra || length $msg;
2436 2878
2437 if ($self->can_msg) { 2879 # default colour, mask it out
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2880 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2439 } else { 2881 if $color & cf::NDI_DEF;
2440 # replace some tags by gcfclient-compatible ones
2441 for ($msg) {
2442 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448 }
2449 2882
2450 if ($color >= 0) { 2883 my $pkt = "msg "
2451 if (0 && $msg =~ /\[/) { 2884 . $self->{json_coder}->encode (
2452 $self->send_packet ("drawextinfo $color 4 0 $msg") 2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2453 } else { 2886 );
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg")
2456 }
2457 }
2458 }
2459}
2460 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
2461=item $client->ext_event ($type, %msg) 2901=item $client->ext_msg ($type, @msg)
2462 2902
2463Sends an ext event to the client. 2903Sends an ext event to the client.
2464 2904
2465=cut 2905=cut
2466 2906
2467sub cf::client::ext_event($$%) { 2907sub cf::client::ext_msg($$@) {
2468 my ($self, $type, %msg) = @_; 2908 my ($self, $type, @msg) = @_;
2469 2909
2910 if ($self->extcmd == 2) {
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2912 } elsif ($self->extcmd == 1) { # TODO: remove
2470 $msg{msgtype} = "event_$type"; 2913 push @msg, msgtype => "event_$type";
2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%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 }
2472} 2934}
2473 2935
2474=item $success = $client->query ($flags, "text", \&cb) 2936=item $success = $client->query ($flags, "text", \&cb)
2475 2937
2476Queues a query to the client, calling the given callback with 2938Queues a query to the client, calling the given callback with
… …
2531 my ($ns, $buf) = @_; 2993 my ($ns, $buf) = @_;
2532 2994
2533 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2995 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534 2996
2535 if (ref $msg) { 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
2536 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3005 if (my $cb = $EXTICMD{$type}) {
2537 if (my %reply = $cb->($ns, $msg)) { 3006 @reply = $cb->($ns, @payload);
2538 $reply{msgid} = $msg->{msgid};
2539 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540 }
2541 } 3007 }
3008
3009 $ns->ext_reply ($reply, @reply)
3010 if $reply;
3011
2542 } else { 3012 } else {
2543 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3013 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544 } 3014 }
2545 3015
2546 cf::override; 3016 cf::override;
… …
2593our $safe = new Safe "safe"; 3063our $safe = new Safe "safe";
2594our $safe_hole = new Safe::Hole; 3064our $safe_hole = new Safe::Hole;
2595 3065
2596$SIG{FPE} = 'IGNORE'; 3066$SIG{FPE} = 'IGNORE';
2597 3067
2598$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));
2599 3073
2600# here we export the classes and methods available to script code 3074# here we export the classes and methods available to script code
2601 3075
2602=pod 3076=pod
2603 3077
2604The following functions and methods are available within a safe environment: 3078The following functions and methods are available within a safe environment:
2605 3079
2606 cf::object 3080 cf::object
2607 contr pay_amount pay_player map x y force_find force_add 3081 contr pay_amount pay_player map x y force_find force_add destroy
2608 insert remove 3082 insert remove name archname title slaying race decrease split
3083 value
2609 3084
2610 cf::object::player 3085 cf::object::player
2611 player 3086 player
2612 3087
2613 cf::player 3088 cf::player
… …
2618 3093
2619=cut 3094=cut
2620 3095
2621for ( 3096for (
2622 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2623 insert remove)], 3098 insert remove inv nrof name archname title slaying race
3099 decrease split destroy change_exp value msg lore send_msg)],
2624 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
2625 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful send_msg)],
2626 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
2627) { 3103) {
2628 no strict 'refs'; 3104 no strict 'refs';
2629 my ($pkg, @funs) = @$_; 3105 my ($pkg, @funs) = @$_;
2630 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2647 my ($code, %vars) = @_; 3123 my ($code, %vars) = @_;
2648 3124
2649 my $qcode = $code; 3125 my $qcode = $code;
2650 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2651 $qcode =~ s/\n/\\n/g; 3127 $qcode =~ s/\n/\\n/g;
3128
3129 %vars = (_dummy => 0) unless %vars;
2652 3130
2653 local $_; 3131 local $_;
2654 local @safe::cf::_safe_eval_args = values %vars; 3132 local @safe::cf::_safe_eval_args = values %vars;
2655 3133
2656 my $eval = 3134 my $eval =
… …
2704# the server's init and main functions 3182# the server's init and main functions
2705 3183
2706sub load_facedata($) { 3184sub load_facedata($) {
2707 my ($path) = @_; 3185 my ($path) = @_;
2708 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
2709 warn "loading facedata from $path\n"; 3193 warn "loading facedata from $path\n";
2710 3194
2711 my $facedata; 3195 my $facedata;
2712 0 < aio_load $path, $facedata 3196 0 < aio_load $path, $facedata
2713 or die "$path: $!"; 3197 or die "$path: $!";
… …
2715 $facedata = Coro::Storable::thaw $facedata; 3199 $facedata = Coro::Storable::thaw $facedata;
2716 3200
2717 $facedata->{version} == 2 3201 $facedata->{version} == 2
2718 or cf::cleanup "$path: version mismatch, cannot proceed."; 3202 or cf::cleanup "$path: version mismatch, cannot proceed.";
2719 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
2720 { 3211 {
2721 my $faces = $facedata->{faceinfo}; 3212 my $faces = $facedata->{faceinfo};
2722 3213
2723 while (my ($face, $info) = each %$faces) { 3214 while (my ($face, $info) = each %$faces) {
2724 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3215 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216
2725 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3217 cf::face::set_visibility $idx, $info->{visibility};
3218 cf::face::set_magicmap $idx, $info->{magicmap};
2726 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3219 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2727 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3220 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2728 Coro::cede; 3221
3222 cf::cede_to_tick;
2729 } 3223 }
2730 3224
2731 while (my ($face, $info) = each %$faces) { 3225 while (my ($face, $info) = each %$faces) {
2732 next unless $info->{smooth}; 3226 next unless $info->{smooth};
3227
2733 my $idx = cf::face::find $face 3228 my $idx = cf::face::find $face
2734 or next; 3229 or next;
3230
2735 if (my $smooth = cf::face::find $info->{smooth}) { 3231 if (my $smooth = cf::face::find $info->{smooth}) {
3232 cf::face::set_smooth $idx, $smooth;
2736 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3233 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2737 } else { 3234 } else {
2738 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3235 warn "smooth face '$info->{smooth}' not found for face '$face'";
2739 } 3236 }
2740 Coro::cede; 3237
3238 cf::cede_to_tick;
2741 } 3239 }
2742 } 3240 }
2743 3241
2744 { 3242 {
2745 my $anims = $facedata->{animinfo}; 3243 my $anims = $facedata->{animinfo};
2746 3244
2747 while (my ($anim, $info) = each %$anims) { 3245 while (my ($anim, $info) = each %$anims) {
2748 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3246 cf::anim::set $anim, $info->{frames}, $info->{facings};
2749 Coro::cede; 3247 cf::cede_to_tick;
2750 } 3248 }
2751 3249
2752 cf::anim::invalidate_all; # d'oh 3250 cf::anim::invalidate_all; # d'oh
2753 } 3251 }
2754 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
2755 1 3288 1
2756} 3289}
2757 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
2758sub 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
2759 load_resource_file "$MAPDIR/regions" 3334 load_resource_file "$MAPDIR/regions"
2760 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 }
2761} 3341}
2762 3342
2763sub reload_facedata { 3343sub reload_facedata {
2764 load_facedata "$DATADIR/facedata" 3344 load_facedata "$DATADIR/facedata"
2765 or die "unable to load facedata\n"; 3345 or die "unable to load facedata\n";
2766} 3346}
2767 3347
2768sub reload_archetypes { 3348sub reload_archetypes {
2769 load_resource_file "$DATADIR/archetypes" 3349 load_resource_file "$DATADIR/archetypes"
2770 or die "unable to load archetypes\n"; 3350 or die "unable to load archetypes\n";
2771 #d# NEED to laod twice to resolve forward references
2772 # this really needs to be done in an extra post-pass
2773 # (which needs to be synchronous, so solve it differently)
2774 load_resource_file "$DATADIR/archetypes"
2775 or die "unable to load archetypes\n";
2776} 3351}
2777 3352
2778sub reload_treasures { 3353sub reload_treasures {
2779 load_resource_file "$DATADIR/treasures" 3354 load_resource_file "$DATADIR/treasures"
2780 or die "unable to load treasurelists\n"; 3355 or die "unable to load treasurelists\n";
2781} 3356}
2782 3357
2783sub reload_resources { 3358sub reload_resources {
2784 warn "reloading resource files...\n"; 3359 warn "reloading resource files...\n";
2785 3360
3361 reload_facedata;
3362 reload_archetypes;
2786 reload_regions; 3363 reload_regions;
2787 reload_facedata;
2788 #reload_archetypes;#d#
2789 reload_archetypes;
2790 reload_treasures; 3364 reload_treasures;
2791 3365
2792 warn "finished reloading resource files\n"; 3366 warn "finished reloading resource files\n";
2793} 3367}
2794 3368
2795sub init { 3369sub reload_config {
2796 reload_resources;
2797}
2798
2799sub cfg_load {
2800 open my $fh, "<:utf8", "$CONFDIR/config" 3370 open my $fh, "<:utf8", "$CONFDIR/config"
2801 or return; 3371 or return;
2802 3372
2803 local $/; 3373 local $/;
2804 *CFG = YAML::Syck::Load <$fh>; 3374 *CFG = YAML::Load <$fh>;
2805 3375
2806 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3376 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2807 3377
2808 $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};
2809 $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};
… …
2815 }; 3385 };
2816 warn $@ if $@; 3386 warn $@ if $@;
2817 } 3387 }
2818} 3388}
2819 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
2820sub 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
2821 # we must not ever block the main coroutine 3433 # we must not ever block the main coroutine
2822 local $Coro::idle = sub { 3434 local $Coro::idle = sub {
2823 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#
2824 (async { 3436 (async {
2825 Event::one_event; 3437 $Coro::current->{desc} = "IDLE BUG HANDLER";
3438 EV::loop EV::LOOP_ONESHOT;
2826 })->prio (Coro::PRIO_MAX); 3439 })->prio (Coro::PRIO_MAX);
2827 }; 3440 };
2828 3441
2829 cfg_load; 3442 evthread_start IO::AIO::poll_fileno;
3443
3444 cf::sync_job {
3445 reload_resources;
3446 reload_config;
2830 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
2831 load_extensions; 3460 load_extensions;
2832 3461
2833 $TICK_WATCHER->start; 3462 utime time, time, $RUNTIMEFILE;
2834 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;
2835} 3471}
2836 3472
2837############################################################################# 3473#############################################################################
2838# initialisation and cleanup 3474# initialisation and cleanup
2839 3475
2840# install some emergency cleanup handlers 3476# install some emergency cleanup handlers
2841BEGIN { 3477BEGIN {
3478 our %SIGWATCHER = ();
2842 for my $signal (qw(INT HUP TERM)) { 3479 for my $signal (qw(INT HUP TERM)) {
2843 Event->signal ( 3480 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2844 reentrant => 0,
2845 data => WF_AUTOCANCEL,
2846 signal => $signal,
2847 prio => 0,
2848 cb => sub {
2849 cf::cleanup "SIG$signal"; 3481 cf::cleanup "SIG$signal";
2850 },
2851 ); 3482 };
2852 } 3483 }
2853} 3484}
2854 3485
2855sub write_runtime { 3486sub write_runtime_sync {
2856 my $runtime = "$LOCALDIR/runtime";
2857
2858 # first touch the runtime file to show we are still running: 3487 # first touch the runtime file to show we are still running:
2859 # the fsync below can take a very very long time. 3488 # the fsync below can take a very very long time.
2860 3489
2861 IO::AIO::aio_utime $runtime, undef, undef; 3490 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2862 3491
2863 my $guard = cf::lock_acquire "write_runtime"; 3492 my $guard = cf::lock_acquire "write_runtime";
2864 3493
2865 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3494 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2866 or return; 3495 or return;
2867 3496
2868 my $value = $cf::RUNTIME + 90 + 10; 3497 my $value = $cf::RUNTIME + 90 + 10;
2869 # 10 is the runtime save interval, for a monotonic clock 3498 # 10 is the runtime save interval, for a monotonic clock
2870 # 60 allows for the watchdog to kill the server. 3499 # 60 allows for the watchdog to kill the server.
… …
2880 aio_utime $fh, undef, undef; 3509 aio_utime $fh, undef, undef;
2881 3510
2882 close $fh 3511 close $fh
2883 or return; 3512 or return;
2884 3513
2885 aio_rename "$runtime~", $runtime 3514 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2886 and return; 3515 and return;
2887 3516
2888 warn "runtime file written.\n"; 3517 warn "runtime file written.\n";
2889 3518
2890 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 };
2891} 3570}
2892 3571
2893sub emergency_save() { 3572sub emergency_save() {
2894 my $freeze_guard = cf::freeze_mainloop; 3573 my $freeze_guard = cf::freeze_mainloop;
2895 3574
2896 warn "enter emergency perl save\n"; 3575 warn "emergency_perl_save: enter\n";
2897 3576
2898 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
2899 # use a peculiar iteration method to avoid tripping on perl 3583 # use a peculiar iteration method to avoid tripping on perl
2900 # refcount bugs in for. also avoids problems with players 3584 # refcount bugs in for. also avoids problems with players
2901 # and maps saved/destroyed asynchronously. 3585 # and maps saved/destroyed asynchronously.
2902 warn "begin emergency player save\n"; 3586 warn "emergency_perl_save: begin player save\n";
2903 for my $login (keys %cf::PLAYER) { 3587 for my $login (keys %cf::PLAYER) {
2904 my $pl = $cf::PLAYER{$login} or next; 3588 my $pl = $cf::PLAYER{$login} or next;
2905 $pl->valid or next; 3589 $pl->valid or next;
3590 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2906 $pl->save; 3591 $pl->save;
2907 } 3592 }
2908 warn "end emergency player save\n"; 3593 warn "emergency_perl_save: end player save\n";
2909 3594
2910 warn "begin emergency map save\n"; 3595 warn "emergency_perl_save: begin map save\n";
2911 for my $path (keys %cf::MAP) { 3596 for my $path (keys %cf::MAP) {
2912 my $map = $cf::MAP{$path} or next; 3597 my $map = $cf::MAP{$path} or next;
2913 $map->valid or next; 3598 $map->valid or next;
2914 $map->save; 3599 $map->save;
2915 } 3600 }
2916 warn "end emergency map save\n"; 3601 warn "emergency_perl_save: end map save\n";
2917 3602
2918 warn "begin emergency database checkpoint\n"; 3603 warn "emergency_perl_save: begin database checkpoint\n";
2919 BDB::db_env_txn_checkpoint $DB_ENV; 3604 BDB::db_env_txn_checkpoint $DB_ENV;
2920 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";
2921 }; 3610 };
2922 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
2923 warn "leave emergency perl save\n"; 3617 warn "emergency_perl_save: leave\n";
2924} 3618}
2925 3619
2926sub post_cleanup { 3620sub post_cleanup {
2927 my ($make_core) = @_; 3621 my ($make_core) = @_;
2928 3622
2929 warn Carp::longmess "post_cleanup backtrace" 3623 warn Carp::longmess "post_cleanup backtrace"
2930 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#
2931} 3654}
2932 3655
2933sub do_reload_perl() { 3656sub do_reload_perl() {
2934 # can/must only be called in main 3657 # can/must only be called in main
2935 if ($Coro::current != $Coro::main) { 3658 if ($Coro::current != $Coro::main) {
2936 warn "can only reload from main coroutine"; 3659 warn "can only reload from main coroutine";
2937 return; 3660 return;
2938 } 3661 }
2939 3662
3663 return if $RELOAD++;
3664
3665 my $t1 = EV::time;
3666
3667 while ($RELOAD) {
2940 warn "reloading..."; 3668 warn "reloading...";
2941 3669
2942 warn "entering sync_job"; 3670 warn "entering sync_job";
2943 3671
2944 cf::sync_job { 3672 cf::sync_job {
2945 cf::write_runtime; # external watchdog should not bark 3673 cf::write_runtime_sync; # external watchdog should not bark
2946 cf::emergency_save; 3674 cf::emergency_save;
2947 cf::write_runtime; # external watchdog should not bark 3675 cf::write_runtime_sync; # external watchdog should not bark
2948 3676
2949 warn "syncing database to disk"; 3677 warn "syncing database to disk";
2950 BDB::db_env_txn_checkpoint $DB_ENV; 3678 BDB::db_env_txn_checkpoint $DB_ENV;
2951 3679
2952 # 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
2953 3681
2954 warn "cancelling all WF_AUTOCANCEL watchers";
2955 for (Event::all_watchers) {
2956 $_->cancel if $_->data & WF_AUTOCANCEL;
2957 }
2958
2959 warn "flushing outstanding aio requests"; 3682 warn "flushing outstanding aio requests";
2960 for (;;) {
2961 BDB::flush;
2962 IO::AIO::flush;
2963 Coro::cede;
2964 last unless IO::AIO::nreqs || BDB::nreqs; 3683 while (IO::AIO::nreqs || BDB::nreqs) {
2965 warn "iterate..."; 3684 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2966 }
2967
2968 ++$RELOAD;
2969
2970 warn "cancelling all extension coros";
2971 $_->cancel for values %EXT_CORO;
2972 %EXT_CORO = ();
2973
2974 warn "removing commands";
2975 %COMMAND = ();
2976
2977 warn "removing ext/exti commands";
2978 %EXTCMD = ();
2979 %EXTICMD = ();
2980
2981 warn "unloading/nuking all extensions";
2982 for my $pkg (@EXTS) {
2983 warn "... unloading $pkg";
2984
2985 if (my $cb = $pkg->can ("unload")) {
2986 eval {
2987 $cb->($pkg);
2988 1
2989 } or warn "$pkg unloaded, but with errors: $@";
2990 } 3685 }
2991 3686
2992 warn "... nuking $pkg"; 3687 warn "cancelling all extension coros";
2993 Symbol::delete_package $pkg; 3688 $_->cancel for values %EXT_CORO;
2994 } 3689 %EXT_CORO = ();
2995 3690
2996 warn "unloading all perl modules loaded from $LIBDIR"; 3691 warn "removing commands";
2997 while (my ($k, $v) = each %INC) { 3692 %COMMAND = ();
2998 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2999 3693
3694 warn "removing ext/exti commands";
3695 %EXTCMD = ();
3696 %EXTICMD = ();
3697
3698 warn "unloading/nuking all extensions";
3699 for my $pkg (@EXTS) {
3000 warn "... unloading $k"; 3700 warn "... unloading $pkg";
3001 delete $INC{$k};
3002 3701
3003 $k =~ s/\.pm$//;
3004 $k =~ s/\//::/g;
3005
3006 if (my $cb = $k->can ("unload_module")) { 3702 if (my $cb = $pkg->can ("unload")) {
3703 eval {
3007 $cb->(); 3704 $cb->($pkg);
3705 1
3706 } or warn "$pkg unloaded, but with errors: $@";
3707 }
3708
3709 warn "... clearing $pkg";
3710 clear_package $pkg;
3008 } 3711 }
3009 3712
3010 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;
3011 } 3728 }
3012 3729
3013 warn "getting rid of safe::, as good as possible"; 3730 warn "getting rid of safe::, as good as possible";
3014 Symbol::delete_package "safe::$_" 3731 clear_package "safe::$_"
3015 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);
3016 3733
3017 warn "unloading cf.pm \"a bit\""; 3734 warn "unloading cf.pm \"a bit\"";
3018 delete $INC{"cf.pm"}; 3735 delete $INC{"cf.pm"};
3019 delete $INC{"cf/pod.pm"}; 3736 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3020 3737
3021 # don't, removes xs symbols, too, 3738 # don't, removes xs symbols, too,
3022 # and global variables created in xs 3739 # and global variables created in xs
3023 #Symbol::delete_package __PACKAGE__; 3740 #clear_package __PACKAGE__;
3024 3741
3025 warn "unload completed, starting to reload now"; 3742 warn "unload completed, starting to reload now";
3026 3743
3027 warn "reloading cf.pm"; 3744 warn "reloading cf.pm";
3028 require cf; 3745 require cf;
3029 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3746 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3030 3747
3031 warn "loading config and database again"; 3748 warn "loading config and database again";
3032 cf::cfg_load; 3749 cf::reload_config;
3033 3750
3034 warn "loading extensions"; 3751 warn "loading extensions";
3035 cf::load_extensions; 3752 cf::load_extensions;
3036 3753
3754 if ($REATTACH_ON_RELOAD) {
3037 warn "reattaching attachments to objects/players"; 3755 warn "reattaching attachments to objects/players";
3038 _global_reattach; # objects, sockets 3756 _global_reattach; # objects, sockets
3039 warn "reattaching attachments to maps"; 3757 warn "reattaching attachments to maps";
3040 reattach $_ for values %MAP; 3758 reattach $_ for values %MAP;
3041 warn "reattaching attachments to players"; 3759 warn "reattaching attachments to players";
3042 reattach $_ for values %PLAYER; 3760 reattach $_ for values %PLAYER;
3761 }
3043 3762
3763 warn "running post_init jobs";
3764 (pop @POST_INIT)->(1) while @POST_INIT;
3765
3044 warn "leaving sync_job"; 3766 warn "leaving sync_job";
3045 3767
3046 1 3768 1
3047 } or do { 3769 } or do {
3048 warn $@; 3770 warn $@;
3049 warn "error while reloading, exiting."; 3771 cf::cleanup "error while reloading, exiting.";
3050 exit 1;
3051 }; 3772 };
3052 3773
3053 warn "reloaded"; 3774 warn "reloaded";
3775 --$RELOAD;
3776 }
3777
3778 $t1 = EV::time - $t1;
3779 warn "reload completed in ${t1}s\n";
3054}; 3780};
3055 3781
3056our $RELOAD_WATCHER; # used only during reload 3782our $RELOAD_WATCHER; # used only during reload
3057 3783
3058sub reload_perl() { 3784sub reload_perl() {
3059 # doing reload synchronously and two reloads happen back-to-back, 3785 # doing reload synchronously and two reloads happen back-to-back,
3060 # coro crashes during coro_state_free->destroy here. 3786 # coro crashes during coro_state_free->destroy here.
3061 3787
3062 $RELOAD_WATCHER ||= Event->timer ( 3788 $RELOAD_WATCHER ||= cf::async {
3063 reentrant => 0, 3789 Coro::AIO::aio_wait cache_extensions;
3064 after => 0, 3790
3065 data => WF_AUTOCANCEL, 3791 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3066 cb => sub {
3067 do_reload_perl; 3792 do_reload_perl;
3068 undef $RELOAD_WATCHER; 3793 undef $RELOAD_WATCHER;
3069 }, 3794 };
3070 ); 3795 };
3071} 3796}
3072 3797
3073register_command "reload" => sub { 3798register_command "reload" => sub {
3074 my ($who, $arg) = @_; 3799 my ($who, $arg) = @_;
3075 3800
3076 if ($who->flag (FLAG_WIZ)) { 3801 if ($who->flag (FLAG_WIZ)) {
3077 $who->message ("reloading server."); 3802 $who->message ("reloading server.");
3803 async {
3804 $Coro::current->{desc} = "perl_reload";
3078 async { reload_perl }; 3805 reload_perl;
3806 };
3079 } 3807 }
3080}; 3808};
3081 3809
3082unshift @INC, $LIBDIR; 3810unshift @INC, $LIBDIR;
3083 3811
… …
3085 3813
3086our @WAIT_FOR_TICK; 3814our @WAIT_FOR_TICK;
3087our @WAIT_FOR_TICK_BEGIN; 3815our @WAIT_FOR_TICK_BEGIN;
3088 3816
3089sub wait_for_tick { 3817sub wait_for_tick {
3090 return unless $TICK_WATCHER->is_active;
3091 return if $Coro::current == $Coro::main; 3818 return if tick_inhibit || $Coro::current == $Coro::main;
3092 3819
3093 my $signal = new Coro::Signal; 3820 my $signal = new Coro::Signal;
3094 push @WAIT_FOR_TICK, $signal; 3821 push @WAIT_FOR_TICK, $signal;
3095 $signal->wait; 3822 $signal->wait;
3096} 3823}
3097 3824
3098sub wait_for_tick_begin { 3825sub wait_for_tick_begin {
3099 return unless $TICK_WATCHER->is_active;
3100 return if $Coro::current == $Coro::main; 3826 return if tick_inhibit || $Coro::current == $Coro::main;
3101 3827
3102 my $signal = new Coro::Signal; 3828 my $signal = new Coro::Signal;
3103 push @WAIT_FOR_TICK_BEGIN, $signal; 3829 push @WAIT_FOR_TICK_BEGIN, $signal;
3104 $signal->wait; 3830 $signal->wait;
3105} 3831}
3106 3832
3107 my $min = 1e6;#d# 3833sub tick {
3108 my $avg = 10;
3109$TICK_WATCHER = Event->timer (
3110 reentrant => 0,
3111 parked => 1,
3112 prio => 0,
3113 at => $NEXT_TICK || $TICK,
3114 data => WF_AUTOCANCEL,
3115 cb => sub {
3116 if ($Coro::current != $Coro::main) { 3834 if ($Coro::current != $Coro::main) {
3117 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"
3118 unless ++$bug_warning > 10; 3836 unless ++$bug_warning > 10;
3119 return; 3837 return;
3120 } 3838 }
3121 3839
3122 $NOW = $tick_start = Event::time;
3123
3124 cf::server_tick; # one server iteration 3840 cf::server_tick; # one server iteration
3125 3841
3126 0 && sync_job {#d# 3842 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3127 for(1..10) { 3843 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3128 my $t = Event::time; 3844 Coro::async_pool {
3129 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3845 $Coro::current->{desc} = "runtime saver";
3130 or die; 3846 write_runtime_sync
3131 3847 or warn "ERROR: unable to write runtime file: $!";
3132 $map->width (50);
3133 $map->height (50);
3134 $map->alloc;
3135 $map->_load_objects ("/tmp/x.map", 1);
3136 my $t = Event::time - $t;
3137
3138 #next unless $t < 0.0013;#d#
3139 if ($t < $min) {
3140 $min = $t;
3141 }
3142 $avg = $avg * 0.99 + $t * 0.01;
3143 }
3144 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3145 exit 0;
3146 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3147 }; 3848 };
3849 }
3148 3850
3149 $RUNTIME += $TICK;
3150 $NEXT_TICK += $TICK;
3151
3152 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3153 $NEXT_RUNTIME_WRITE = $NOW + 10;
3154 Coro::async_pool {
3155 write_runtime
3156 or warn "ERROR: unable to write runtime file: $!";
3157 };
3158 }
3159
3160# my $AFTER = Event::time;
3161# warn $AFTER - $NOW;#d#
3162
3163 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3851 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3164 $sig->send; 3852 $sig->send;
3165 } 3853 }
3166 while (my $sig = shift @WAIT_FOR_TICK) { 3854 while (my $sig = shift @WAIT_FOR_TICK) {
3167 $sig->send; 3855 $sig->send;
3168 } 3856 }
3169 3857
3170 $NOW = Event::time; 3858 $LOAD = ($NOW - $TICK_START) / $TICK;
3171
3172 # if we are delayed by four ticks or more, skip them all
3173 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3174
3175 $TICK_WATCHER->at ($NEXT_TICK);
3176 $TICK_WATCHER->start;
3177
3178 $LOAD = ($NOW - $tick_start) / $TICK;
3179 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3859 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3180 3860
3181 _post_tick; 3861 if (0) {
3182 3862 if ($NEXT_TICK) {
3183 3863 my $jitter = $TICK_START - $NEXT_TICK;
3864 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3865 warn "jitter $JITTER\n";#d#
3866 }
3184 }, 3867 }
3185); 3868}
3186 3869
3187{ 3870{
3188 BDB::max_poll_time $TICK * 0.1; 3871 # configure BDB
3189 $BDB_POLL_WATCHER = Event->io ( 3872
3190 reentrant => 0,
3191 fd => BDB::poll_fileno,
3192 poll => 'r',
3193 prio => 0,
3194 data => WF_AUTOCANCEL,
3195 cb => \&BDB::poll_cb,
3196 );
3197 BDB::min_parallel 8; 3873 BDB::min_parallel 8;
3198 3874 BDB::max_poll_reqs $TICK * 0.1;
3199 BDB::set_sync_prepare { 3875 $AnyEvent::BDB::WATCHER->priority (1);
3200 my $status;
3201 my $current = $Coro::current;
3202 (
3203 sub {
3204 $status = $!;
3205 $current->ready; undef $current;
3206 },
3207 sub {
3208 Coro::schedule while defined $current;
3209 $! = $status;
3210 },
3211 )
3212 };
3213 3876
3214 unless ($DB_ENV) { 3877 unless ($DB_ENV) {
3215 $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);
3216 3884
3217 cf::sync_job { 3885 cf::sync_job {
3218 eval { 3886 eval {
3219 BDB::db_env_open 3887 BDB::db_env_open
3220 $DB_ENV, 3888 $DB_ENV,
… …
3222 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
3223 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3891 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3224 0666; 3892 0666;
3225 3893
3226 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3894 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3227
3228 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3229 $DB_ENV->set_lk_detect;
3230 }; 3895 };
3231 3896
3232 cf::cleanup "db_env_open(db): $@" if $@; 3897 cf::cleanup "db_env_open(db): $@" if $@;
3233 }; 3898 };
3234 } 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 };
3235} 3910}
3236 3911
3237{ 3912{
3913 # configure IO::AIO
3914
3238 IO::AIO::min_parallel 8; 3915 IO::AIO::min_parallel 8;
3239
3240 undef $Coro::AIO::WATCHER;
3241 IO::AIO::max_poll_time $TICK * 0.1; 3916 IO::AIO::max_poll_time $TICK * 0.1;
3242 $AIO_POLL_WATCHER = Event->io ( 3917 undef $AnyEvent::AIO::WATCHER;
3243 reentrant => 0,
3244 data => WF_AUTOCANCEL,
3245 fd => IO::AIO::poll_fileno,
3246 poll => 'r',
3247 prio => 6,
3248 cb => \&IO::AIO::poll_cb,
3249 );
3250} 3918}
3251 3919
3252my $_log_backtrace; 3920my $_log_backtrace;
3253 3921
3254sub _log_backtrace { 3922sub _log_backtrace {
… …
3257 $msg =~ s/\n//; 3925 $msg =~ s/\n//;
3258 3926
3259 # limit the # of concurrent backtraces 3927 # limit the # of concurrent backtraces
3260 if ($_log_backtrace < 2) { 3928 if ($_log_backtrace < 2) {
3261 ++$_log_backtrace; 3929 ++$_log_backtrace;
3930 my $perl_bt = Carp::longmess $msg;
3262 async { 3931 async {
3932 $Coro::current->{desc} = "abt $msg";
3933
3263 my @bt = fork_call { 3934 my @bt = fork_call {
3264 @addr = map { sprintf "%x", $_ } @addr; 3935 @addr = map { sprintf "%x", $_ } @addr;
3265 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3936 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3266 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 |"
3267 or die "addr2line: $!"; 3938 or die "addr2line: $!";
… …
3275 } 3946 }
3276 3947
3277 @funcs 3948 @funcs
3278 }; 3949 };
3279 3950
3280 LOG llevInfo, "[ABT] $msg\n"; 3951 LOG llevInfo, "[ABT] $perl_bt\n";
3952 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3281 LOG llevInfo, "[ABT] $_\n" for @bt; 3953 LOG llevInfo, "[ABT] $_\n" for @bt;
3282 --$_log_backtrace; 3954 --$_log_backtrace;
3283 }; 3955 };
3284 } else { 3956 } else {
3285 LOG llevInfo, "[ABT] $msg\n"; 3957 LOG llevInfo, "[ABT] $msg\n";
3286 LOG llevInfo, "[ABT] [suppressed]\n"; 3958 LOG llevInfo, "[ABT] [suppressed]\n";
3287 } 3959 }
3288} 3960}
3289 3961
3290# load additional modules 3962# load additional modules
3291use cf::pod; 3963require "cf/$_.pm" for @EXTRA_MODULES;
3292 3964
3293END { cf::emergency_save } 3965END { cf::emergency_save }
3294 3966
32951 39671
3296 3968

Diff Legend

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