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.310 by elmex, Mon Jul 16 15:43:49 2007 UTC vs.
Revision 1.481 by root, Sun Oct 11 00:24:35 2009 UTC

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

Diff Legend

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