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.281 by root, Sat Jun 16 23:22:59 2007 UTC vs.
Revision 1.478 by root, Thu Sep 17 01:57:31 2009 UTC

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

Diff Legend

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