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.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.476 by root, Wed Sep 2 16:54:20 2009 UTC

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

Diff Legend

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