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.120 by root, Tue Jan 2 11:08:36 2007 UTC vs.
Revision 1.154 by root, Tue Jan 9 15:36:19 2007 UTC

8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 29# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 30$YAML::Syck::ImplicitUnicode = 1;
30 31
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 32$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 33
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 34sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
47our %CFG; 48our %CFG;
48 49
49our $UPTIME; $UPTIME ||= time; 50our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 51our $RUNTIME;
51 52
53our %PLAYER; # all users
52our %MAP; # all maps 54our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 55our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 56our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 57our %EXT_CORO; # coroutines bound to extensions
57 58
58binmode STDOUT; 59binmode STDOUT;
59binmode STDERR; 60binmode STDERR;
60 61
61# read virtual server time, if available 62# read virtual server time, if available
71mkdir cf::localdir . "/" . cf::uniquedir; 72mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 73mkdir $RANDOM_MAPS;
73 74
74# a special map that is always available 75# a special map that is always available
75our $LINK_MAP; 76our $LINK_MAP;
76 77our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 78
79############################################################################# 79#############################################################################
80 80
81=head2 GLOBAL VARIABLES 81=head2 GLOBAL VARIABLES
82 82
119 utf8::encode $msg; 119 utf8::encode $msg;
120 120
121 $msg .= "\n" 121 $msg .= "\n"
122 unless $msg =~ /\n$/; 122 unless $msg =~ /\n$/;
123 123
124 LOG llevError, "cfperl: $msg"; 124 LOG llevError, $msg;
125 }; 125 };
126} 126}
127 127
128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
155 155
156=head2 UTILITY FUNCTIONS 156=head2 UTILITY FUNCTIONS
157 157
158=over 4 158=over 4
159 159
160=item dumpval $ref
161
160=cut 162=cut
163
164sub dumpval {
165 eval {
166 local $SIG{__DIE__};
167 my $d;
168 if (1) {
169 $d = new Data::Dumper([$_[0]], ["*var"]);
170 $d->Terse(1);
171 $d->Indent(2);
172 $d->Quotekeys(0);
173 $d->Useqq(1);
174 #$d->Bless(...);
175 $d->Seen($_[1]) if @_ > 1;
176 $d = $d->Dump();
177 }
178 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
179 $d
180 } || "[unable to dump $_[0]: '$@']";
181}
161 182
162use JSON::Syck (); # TODO# replace by JSON::PC once working 183use JSON::Syck (); # TODO# replace by JSON::PC once working
163 184
164=item $ref = cf::from_json $json 185=item $ref = cf::from_json $json
165 186
181sub to_json($) { 202sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 203 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 204 JSON::Syck::Dump $_[0]
184} 205}
185 206
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string 207=item cf::lock_wait $string
209 208
210Wait until the given lock is available. See cf::lock_acquire. 209Wait until the given lock is available. See cf::lock_acquire.
211 210
212=item my $lock = cf::lock_acquire $string 211=item my $lock = cf::lock_acquire $string
213 212
214Wait until the given lock is available and then acquires it and returns 213Wait until the given lock is available and then acquires it and returns
215a guard object. If the guard object gets destroyed (goes out of scope, 214a Coro::guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically 215for example when the coroutine gets canceled), the lock is automatically
217returned. 216returned.
218 217
219Lock names should begin with a unique identifier (for example, find_map 218Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 219uses map_find and cf::map::load uses map_load).
221 220
222=cut 221=cut
223 222
224our %LOCK; 223our %LOCK;
225 224
239 # wait, to be sure we are not locked 238 # wait, to be sure we are not locked
240 lock_wait $key; 239 lock_wait $key;
241 240
242 $LOCK{$key} = []; 241 $LOCK{$key} = [];
243 242
244 cf::guard { 243 Coro::guard {
245 # wake up all waiters, to be on the safe side 244 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 245 $_->ready for @{ delete $LOCK{$key} };
247 } 246 }
248} 247}
248
249sub freeze_mainloop {
250 return unless $TICK_WATCHER->is_active;
251
252 my $guard = Coro::guard { $TICK_WATCHER->start };
253 $TICK_WATCHER->stop;
254 $guard
255}
256
257=item cf::async { BLOCK }
258
259Currently the same as Coro::async_pool, meaning you cannot use
260C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
261thing you are allowed to do is call C<prio> on it.
262
263=cut
264
265BEGIN { *async = \&Coro::async_pool }
249 266
250=item cf::sync_job { BLOCK } 267=item cf::sync_job { BLOCK }
251 268
252The design of crossfire+ requires that the main coro ($Coro::main) is 269The design of crossfire+ requires that the main coro ($Coro::main) is
253always able to handle events or runnable, as crossfire+ is only partly 270always able to handle events or runnable, as crossfire+ is only partly
267 # this is the main coro, too bad, we have to block 284 # this is the main coro, too bad, we have to block
268 # till the operation succeeds, freezing the server :/ 285 # till the operation succeeds, freezing the server :/
269 286
270 # TODO: use suspend/resume instead 287 # TODO: use suspend/resume instead
271 # (but this is cancel-safe) 288 # (but this is cancel-safe)
272 local $FREEZE = 1; 289 my $freeze_guard = freeze_mainloop;
273 290
274 my $busy = 1; 291 my $busy = 1;
275 my @res; 292 my @res;
276 293
277 (Coro::async { 294 (async {
278 @res = eval { $job->() }; 295 @res = eval { $job->() };
279 warn $@ if $@; 296 warn $@ if $@;
280 undef $busy; 297 undef $busy;
281 })->prio (Coro::PRIO_MAX); 298 })->prio (Coro::PRIO_MAX);
282 299
283 while ($busy) { 300 while ($busy) {
284 Coro::cede_notself; 301 Coro::cede or Event::one_event;
285 Event::one_event unless Coro::nready;
286 } 302 }
287 303
288 wantarray ? @res : $res[0] 304 wantarray ? @res : $res[0]
289 } else { 305 } else {
290 # we are in another coroutine, how wonderful, everything just works 306 # we are in another coroutine, how wonderful, everything just works
291 307
292 $job->() 308 $job->()
293 } 309 }
294} 310}
295 311
296=item $coro = cf::coro { BLOCK } 312=item $coro = cf::async_ext { BLOCK }
297 313
298Creates and returns a new coro. This coro is automcatially being canceled 314Like async, but this coro is automcatially being canceled when the
299when the extension calling this is being unloaded. 315extension calling this is being unloaded.
300 316
301=cut 317=cut
302 318
303sub coro(&) { 319sub async_ext(&) {
304 my $cb = shift; 320 my $cb = shift;
305 321
306 my $coro; $coro = async { 322 my $coro = &Coro::async ($cb);
307 eval {
308 $cb->();
309 };
310 warn $@ if $@;
311 };
312 323
313 $coro->on_destroy (sub { 324 $coro->on_destroy (sub {
314 delete $EXT_CORO{$coro+0}; 325 delete $EXT_CORO{$coro+0};
315 }); 326 });
316 $EXT_CORO{$coro+0} = $coro; 327 $EXT_CORO{$coro+0} = $coro;
345=cut 356=cut
346 357
347############################################################################# 358#############################################################################
348 359
349package cf::path; 360package cf::path;
361
362# used to convert map paths into valid unix filenames by repalcing / by ∕
363our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
350 364
351sub new { 365sub new {
352 my ($class, $path, $base) = @_; 366 my ($class, $path, $base) = @_;
353 367
354 $path = $path->as_string if ref $path; 368 $path = $path->as_string if ref $path;
418# } 432# }
419} 433}
420 434
421# escape the /'s in the path 435# escape the /'s in the path
422sub _escaped_path { 436sub _escaped_path {
423 # ∕ is U+2215
424 (my $path = $_[0]{path}) =~ s/\///g; 437 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
425 $path 438 $path
426} 439}
427 440
428# the original (read-only) location 441# the original (read-only) location
429sub load_path { 442sub load_path {
1083 1096
1084=head2 CORE EXTENSIONS 1097=head2 CORE EXTENSIONS
1085 1098
1086Functions and methods that extend core crossfire objects. 1099Functions and methods that extend core crossfire objects.
1087 1100
1101=cut
1102
1103package cf::player;
1104
1105use Coro::AIO;
1106
1088=head3 cf::player 1107=head3 cf::player
1089 1108
1090=over 4 1109=over 4
1091 1110
1092=item cf::player::exists $login 1111=item cf::player::find $login
1093 1112
1094Returns true when the given account exists. 1113Returns the given player object, loading it if necessary (might block).
1095 1114
1096=cut 1115=cut
1097 1116
1098sub cf::player::exists($) { 1117sub playerdir($) {
1099 cf::player::find $_[0] 1118 cf::localdir
1100 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1119 . "/"
1120 . cf::playerdir
1121 . "/"
1122 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1123}
1124
1125sub path($) {
1126 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1127
1128 (playerdir $login) . "/$login.pl"
1129}
1130
1131sub find_active($) {
1132 $cf::PLAYER{$_[0]}
1133 and $cf::PLAYER{$_[0]}->active
1134 and $cf::PLAYER{$_[0]}
1135}
1136
1137sub exists($) {
1138 my ($login) = @_;
1139
1140 $cf::PLAYER{$login}
1141 or cf::sync_job { !aio_stat $login }
1142}
1143
1144sub find($) {
1145 return $cf::PLAYER{$_[0]} || do {
1146 my $login = $_[0];
1147
1148 my $guard = cf::lock_acquire "user_find:$login";
1149
1150 $cf::PLAYER{$_[0]} || do {
1151 my $pl = load_pl path $login
1152 or return;
1153 $cf::PLAYER{$login} = $pl
1154 }
1155 }
1156}
1157
1158sub save($) {
1159 my ($pl) = @_;
1160
1161 return if $pl->{deny_save};
1162
1163 my $path = path $pl;
1164 my $guard = cf::lock_acquire "user_save:$path";
1165
1166 return if $pl->{deny_save};
1167
1168 aio_mkdir playerdir $pl, 0770;
1169 $pl->{last_save} = $cf::RUNTIME;
1170
1171 $pl->save_pl ($path);
1172 Coro::cede;
1173}
1174
1175sub new($) {
1176 my ($login) = @_;
1177
1178 my $self = create;
1179
1180 $self->ob->name ($login);
1181 $self->{deny_save} = 1;
1182
1183 $cf::PLAYER{$login} = $self;
1184
1185 $self
1186}
1187
1188=item $pl->quit_character
1189
1190Nukes the player without looking back. If logged in, the connection will
1191be destroyed. May block for a long time.
1192
1193=cut
1194
1195sub quit_character {
1196 my ($pl) = @_;
1197
1198 $pl->{deny_save} = 1;
1199 $pl->password ("*"); # this should lock out the player until we nuked the dir
1200
1201 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1202 $pl->deactivate;
1203 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1204 $pl->ns->destroy if $pl->ns;
1205
1206 my $path = playerdir $pl;
1207 my $temp = "$path~$cf::RUNTIME~deleting~";
1208 aio_rename $path, $temp;
1209 delete $cf::PLAYER{$pl->ob->name};
1210 $pl->destroy;
1211 IO::AIO::aio_rmtree $temp;
1212}
1213
1214=item cf::player::list_logins
1215
1216Returns am arrayref of all valid playernames in the system, can take a
1217while and may block, so not sync_job-capable, ever.
1218
1219=cut
1220
1221sub list_logins {
1222 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1223 or return [];
1224
1225 my @logins;
1226
1227 for my $login (@$dirs) {
1228 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1229 aio_read $fh, 0, 512, my $buf, 0 or next;
1230 $buf !~ /^password -------------$/ or next; # official not-valid tag
1231
1232 utf8::decode $login;
1233 push @logins, $login;
1234 }
1235
1236 \@logins
1237}
1238
1239=item $player->maps
1240
1241Returns an arrayref of cf::path's of all maps that are private for this
1242player. May block.
1243
1244=cut
1245
1246sub maps($) {
1247 my ($pl) = @_;
1248
1249 my $files = aio_readdir playerdir $pl
1250 or return;
1251
1252 my @paths;
1253
1254 for (@$files) {
1255 utf8::decode $_;
1256 next if /\.(?:pl|pst)$/;
1257 next unless /^$PATH_SEP/;
1258
1259 s/$PATH_SEP/\//g;
1260 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1261 }
1262
1263 \@paths
1101} 1264}
1102 1265
1103=item $player->ext_reply ($msgid, $msgtype, %msg) 1266=item $player->ext_reply ($msgid, $msgtype, %msg)
1104 1267
1105Sends an ext reply to the player. 1268Sends an ext reply to the player.
1106 1269
1107=cut 1270=cut
1108 1271
1109sub cf::player::ext_reply($$$%) { 1272sub ext_reply($$$%) {
1110 my ($self, $id, %msg) = @_; 1273 my ($self, $id, %msg) = @_;
1111 1274
1112 $msg{msgid} = $id; 1275 $msg{msgid} = $id;
1113 1276
1114 $self->send ("ext " . to_json \%msg); 1277 $self->send ("ext " . cf::to_json \%msg);
1115} 1278}
1279
1280package cf;
1116 1281
1117=back 1282=back
1118 1283
1119 1284
1120=head3 cf::map 1285=head3 cf::map
1126package cf::map; 1291package cf::map;
1127 1292
1128use Fcntl; 1293use Fcntl;
1129use Coro::AIO; 1294use Coro::AIO;
1130 1295
1131our $MAX_RESET = 7200; 1296our $MAX_RESET = 3600;
1132our $DEFAULT_RESET = 3600; 1297our $DEFAULT_RESET = 3000;
1133 1298
1134sub generate_random_map { 1299sub generate_random_map {
1135 my ($path, $rmp) = @_; 1300 my ($path, $rmp) = @_;
1136 1301
1137 # mit "rum" bekleckern, nicht 1302 # mit "rum" bekleckern, nicht
1153# and all this just because we cannot iterate over 1318# and all this just because we cannot iterate over
1154# all maps in C++... 1319# all maps in C++...
1155sub change_all_map_light { 1320sub change_all_map_light {
1156 my ($change) = @_; 1321 my ($change) = @_;
1157 1322
1158 $_->change_map_light ($change) for values %cf::MAP; 1323 $_->change_map_light ($change)
1324 for grep $_->outdoor, values %cf::MAP;
1159} 1325}
1160 1326
1161sub try_load_header($) { 1327sub try_load_header($) {
1162 my ($path) = @_; 1328 my ($path) = @_;
1163 1329
1166 or return; 1332 or return;
1167 1333
1168 my $map = cf::map::new 1334 my $map = cf::map::new
1169 or return; 1335 or return;
1170 1336
1337 # for better error messages only, will be overwritten
1338 $map->path ($path);
1339
1171 $map->load_header ($path) 1340 $map->load_header ($path)
1172 or return; 1341 or return;
1173 1342
1174 $map->{load_path} = $path; 1343 $map->{load_path} = $path;
1175 1344
1176 $map 1345 $map
1177} 1346}
1178 1347
1348sub find;
1179sub find_map { 1349sub find {
1180 my ($path, $origin) = @_; 1350 my ($path, $origin) = @_;
1181 1351
1182 #warn "find_map<$path,$origin>\n";#d# 1352 #warn "find<$path,$origin>\n";#d#
1183 1353
1184 $path = new cf::path $path, $origin && $origin->path; 1354 $path = new cf::path $path, $origin && $origin->path;
1185 my $key = $path->as_string; 1355 my $key = $path->as_string;
1186 1356
1187 cf::lock_wait "map_find:$key"; 1357 cf::lock_wait "map_find:$key";
1190 my $guard = cf::lock_acquire "map_find:$key"; 1360 my $guard = cf::lock_acquire "map_find:$key";
1191 1361
1192 # do it the slow way 1362 # do it the slow way
1193 my $map = try_load_header $path->save_path; 1363 my $map = try_load_header $path->save_path;
1194 1364
1365 Coro::cede;
1366
1195 if ($map) { 1367 if ($map) {
1368 $map->last_access ((delete $map->{last_access})
1369 || $cf::RUNTIME); #d#
1196 # safety 1370 # safety
1197 $map->{instantiate_time} = $cf::RUNTIME 1371 $map->{instantiate_time} = $cf::RUNTIME
1198 if $map->{instantiate_time} > $cf::RUNTIME; 1372 if $map->{instantiate_time} > $cf::RUNTIME;
1199 } else { 1373 } else {
1200 if (my $rmp = $path->random_map_params) { 1374 if (my $rmp = $path->random_map_params) {
1205 1379
1206 $map or return; 1380 $map or return;
1207 1381
1208 $map->{load_original} = 1; 1382 $map->{load_original} = 1;
1209 $map->{instantiate_time} = $cf::RUNTIME; 1383 $map->{instantiate_time} = $cf::RUNTIME;
1384 $map->last_access ($cf::RUNTIME);
1210 $map->instantiate; 1385 $map->instantiate;
1211 1386
1212 # per-player maps become, after loading, normal maps 1387 # per-player maps become, after loading, normal maps
1213 $map->per_player (0) if $path->{user_rel}; 1388 $map->per_player (0) if $path->{user_rel};
1214 } 1389 }
1215 #Coro::Timer::sleep 1;#d#
1216 1390
1217 $map->path ($key); 1391 $map->path ($key);
1218 $map->{path} = $path; 1392 $map->{path} = $path;
1219 $map->{last_save} = $cf::RUNTIME; 1393 $map->{last_save} = $cf::RUNTIME;
1220 $map->last_access ($cf::RUNTIME); 1394
1395 Coro::cede;
1221 1396
1222 if ($map->should_reset) { 1397 if ($map->should_reset) {
1223 $map->reset; 1398 $map->reset;
1399 undef $guard;
1224 $map = find_map $path; 1400 $map = find $path
1401 or return;
1225 } 1402 }
1226 1403
1227 $cf::MAP{$key} = $map 1404 $cf::MAP{$key} = $map
1228 } 1405 }
1229} 1406}
1250 if (aio_open $uniq, O_RDONLY, 0) { 1427 if (aio_open $uniq, O_RDONLY, 0) {
1251 $self->clear_unique_items; 1428 $self->clear_unique_items;
1252 $self->load_objects ($uniq, 0); 1429 $self->load_objects ($uniq, 0);
1253 } 1430 }
1254 } 1431 }
1432
1433 Coro::cede;
1255 1434
1256 # now do the right thing for maps 1435 # now do the right thing for maps
1257 $self->link_multipart_objects; 1436 $self->link_multipart_objects;
1258 1437
1259 if ($self->{path}->is_style_map) { 1438 if ($self->{path}->is_style_map) {
1267 $self->difficulty ($self->estimate_difficulty) 1446 $self->difficulty ($self->estimate_difficulty)
1268 unless $self->difficulty; 1447 unless $self->difficulty;
1269 $self->activate; 1448 $self->activate;
1270 } 1449 }
1271 1450
1451 Coro::cede;
1452
1272 $self->in_memory (cf::MAP_IN_MEMORY); 1453 $self->in_memory (cf::MAP_IN_MEMORY);
1273} 1454}
1274 1455
1275sub load_map_sync { 1456sub find_sync {
1276 my ($path, $origin) = @_; 1457 my ($path, $origin) = @_;
1277 1458
1278 #warn "load_map_sync<$path, $origin>\n";#d# 1459 cf::sync_job { cf::map::find $path, $origin }
1460}
1279 1461
1280 cf::sync_job { 1462sub do_load_sync {
1281 my $map = cf::map::find_map $path, $origin 1463 my ($map) = @_;
1282 or return; 1464
1283 $map->load; 1465 cf::sync_job { $map->load };
1284 $map
1285 }
1286} 1466}
1287 1467
1288sub save { 1468sub save {
1289 my ($self) = @_; 1469 my ($self) = @_;
1290 1470
1471 my $lock = cf::lock_acquire "map_data:" . $self->path;
1472
1291 $self->{last_save} = $cf::RUNTIME; 1473 $self->{last_save} = $cf::RUNTIME;
1292 1474
1293 return unless $self->dirty; 1475 return unless $self->dirty;
1294 1476
1295 my $save = $self->{path}->save_path; utf8::encode $save; 1477 my $save = $self->{path}->save_path; utf8::encode $save;
1296 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1478 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1297 1479
1298 $self->{load_path} = $save; 1480 $self->{load_path} = $save;
1299 1481
1300 return if $self->{deny_save}; 1482 return if $self->{deny_save};
1483
1484 local $self->{last_access} = $self->last_access;#d#
1485
1486 cf::async {
1487 $_->contr->save for $self->players;
1488 };
1301 1489
1302 if ($uniq) { 1490 if ($uniq) {
1303 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1491 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1304 $self->save_objects ($uniq, cf::IO_UNIQUES); 1492 $self->save_objects ($uniq, cf::IO_UNIQUES);
1305 } else { 1493 } else {
1308} 1496}
1309 1497
1310sub swap_out { 1498sub swap_out {
1311 my ($self) = @_; 1499 my ($self) = @_;
1312 1500
1501 # save first because save cedes
1502 $self->save;
1503
1504 my $lock = cf::lock_acquire "map_data:" . $self->path;
1505
1313 return if $self->players; 1506 return if $self->players;
1314 return if $self->in_memory != cf::MAP_IN_MEMORY; 1507 return if $self->in_memory != cf::MAP_IN_MEMORY;
1315 return if $self->{deny_save}; 1508 return if $self->{deny_save};
1316 1509
1317 $self->save;
1318 $self->clear; 1510 $self->clear;
1319 $self->in_memory (cf::MAP_SWAPPED); 1511 $self->in_memory (cf::MAP_SWAPPED);
1320} 1512}
1321 1513
1322sub reset_at { 1514sub reset_at {
1360} 1552}
1361 1553
1362sub reset { 1554sub reset {
1363 my ($self) = @_; 1555 my ($self) = @_;
1364 1556
1557 my $lock = cf::lock_acquire "map_data:" . $self->path;
1558
1365 return if $self->players; 1559 return if $self->players;
1366 return if $self->{path}{user_rel};#d# 1560 return if $self->{path}{user_rel};#d#
1367 1561
1368 warn "resetting map ", $self->path;#d# 1562 warn "resetting map ", $self->path;#d#
1369 1563
1388 1582
1389sub customise_for { 1583sub customise_for {
1390 my ($map, $ob) = @_; 1584 my ($map, $ob) = @_;
1391 1585
1392 if ($map->per_player) { 1586 if ($map->per_player) {
1393 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1587 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1394 } 1588 }
1395 1589
1396 $map 1590 $map
1397} 1591}
1398 1592
1399sub emergency_save { 1593sub emergency_save {
1400 local $cf::FREEZE = 1; 1594 my $freeze_guard = cf::freeze_mainloop;
1401 1595
1402 warn "enter emergency map save\n"; 1596 warn "enter emergency perl save\n";
1403 1597
1404 cf::sync_job { 1598 cf::sync_job {
1599 warn "begin emergency player save\n";
1600 $_->save for values %cf::PLAYER;
1601 warn "end emergency player save\n";
1602
1405 warn "begin emergency map save\n"; 1603 warn "begin emergency map save\n";
1406 $_->save for values %cf::MAP; 1604 $_->save for values %cf::MAP;
1605 warn "end emergency map save\n";
1407 }; 1606 };
1408 1607
1409 warn "end emergency map save\n"; 1608 warn "leave emergency perl save\n";
1410} 1609}
1411 1610
1412package cf; 1611package cf;
1413 1612
1414=back 1613=back
1495 my $link_pos = delete $self->{_link_pos}; 1694 my $link_pos = delete $self->{_link_pos};
1496 1695
1497 unless ($map) { 1696 unless ($map) {
1498 # restore original map position 1697 # restore original map position
1499 ($map, $x, $y) = @{ $link_pos || [] }; 1698 ($map, $x, $y) = @{ $link_pos || [] };
1500 $map = cf::map::find_map $map; 1699 $map = cf::map::find $map;
1501 1700
1502 unless ($map) { 1701 unless ($map) {
1503 ($map, $x, $y) = @$EMERGENCY_POSITION; 1702 ($map, $x, $y) = @$EMERGENCY_POSITION;
1504 $map = cf::map::find_map $map 1703 $map = cf::map::find $map
1505 or die "FATAL: cannot load emergency map\n"; 1704 or die "FATAL: cannot load emergency map\n";
1506 } 1705 }
1507 } 1706 }
1508 1707
1509 ($x, $y) = (-1, -1) 1708 ($x, $y) = (-1, -1)
1513 ($x, $y) = ($map->enter_x, $map->enter_y) 1712 ($x, $y) = ($map->enter_x, $map->enter_y)
1514 if $x <=0 && $y <= 0; 1713 if $x <=0 && $y <= 0;
1515 1714
1516 $map->load; 1715 $map->load;
1517 1716
1717 return unless $self->contr->active;
1518 $self->activate_recursive; 1718 $self->activate_recursive;
1519 $self->enter_map ($map, $x, $y); 1719 $self->enter_map ($map, $x, $y);
1520} 1720}
1521 1721
1522cf::player->attach ( 1722cf::player->attach (
1535 1735
1536 # try to abort aborted map switching on player login :) 1736 # try to abort aborted map switching on player login :)
1537 # should happen only on crashes 1737 # should happen only on crashes
1538 if ($pl->ob->{_link_pos}) { 1738 if ($pl->ob->{_link_pos}) {
1539 $pl->ob->enter_link; 1739 $pl->ob->enter_link;
1540 Coro::async { 1740 (async {
1541 # we need this sleep as the login has a concurrent enter_exit running 1741 # we need this sleep as the login has a concurrent enter_exit running
1542 # and this sleep increases chances of the player not ending up in scorn 1742 # and this sleep increases chances of the player not ending up in scorn
1743 $pl->ob->reply (undef,
1744 "There was an internal problem at your last logout, "
1745 . "the server will try to bring you to your intended destination in a second.",
1746 cf::NDI_RED);
1543 Coro::Timer::sleep 1; 1747 Coro::Timer::sleep 1;
1544 $pl->ob->leave_link; 1748 $pl->ob->leave_link;
1545 }; 1749 })->prio (2);
1546 } 1750 }
1547 }, 1751 },
1548); 1752);
1549 1753
1550=item $player_object->goto_map ($path, $x, $y) 1754=item $player_object->goto ($path, $x, $y)
1551 1755
1552=cut 1756=cut
1553 1757
1554sub cf::object::player::goto_map { 1758sub cf::object::player::goto {
1555 my ($self, $path, $x, $y) = @_; 1759 my ($self, $path, $x, $y) = @_;
1556 1760
1761 $path = new cf::path $path;
1762 $path ne "/" or Carp::cluck ("oy");#d#
1763
1557 $self->enter_link; 1764 $self->enter_link;
1558 1765
1559 (Coro::async { 1766 (async {
1560 $path = new cf::path $path;
1561
1562 my $map = cf::map::find_map $path->as_string; 1767 my $map = cf::map::find $path->as_string;
1563 $map = $map->customise_for ($self) if $map; 1768 $map = $map->customise_for ($self) if $map;
1564 1769
1565# warn "entering ", $map->path, " at ($x, $y)\n" 1770# warn "entering ", $map->path, " at ($x, $y)\n"
1566# if $map; 1771# if $map;
1567 1772
1568 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1773 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1569 1774
1570 $self->leave_link ($map, $x, $y); 1775 $self->leave_link ($map, $x, $y);
1571 })->prio (1); 1776 })->prio (1);
1572} 1777}
1573 1778
1626 1831
1627 return unless $self->type == cf::PLAYER; 1832 return unless $self->type == cf::PLAYER;
1628 1833
1629 $self->enter_link; 1834 $self->enter_link;
1630 1835
1631 (Coro::async { 1836 (async {
1837 $self->deactivate_recursive; # just to be sure
1632 unless (eval { 1838 unless (eval {
1633
1634 prepare_random_map $exit 1839 prepare_random_map $exit
1635 if $exit->slaying eq "/!"; 1840 if $exit->slaying eq "/!";
1636 1841
1637 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1842 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1638 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1843 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1639 1844
1640 1; 1845 1;
1641 }) { 1846 }) {
1642 $self->message ("Something went wrong deep within the crossfire server. " 1847 $self->message ("Something went wrong deep within the crossfire server. "
1643 . "I'll try to bring you back to the map you were before. " 1848 . "I'll try to bring you back to the map you were before. "
1700 on_reply => sub { 1905 on_reply => sub {
1701 my ($ns, $msg) = @_; 1906 my ($ns, $msg) = @_;
1702 1907
1703 # this weird shuffling is so that direct followup queries 1908 # this weird shuffling is so that direct followup queries
1704 # get handled first 1909 # get handled first
1705 my $queue = delete $ns->{query_queue}; 1910 my $queue = delete $ns->{query_queue}
1911 or return; # be conservative, not sure how that can happen, but we saw a crash here
1706 1912
1707 (shift @$queue)->[1]->($msg); 1913 (shift @$queue)->[1]->($msg);
1708 1914
1709 push @{ $ns->{query_queue} }, @$queue; 1915 push @{ $ns->{query_queue} }, @$queue;
1710 1916
1716 } 1922 }
1717 } 1923 }
1718 }, 1924 },
1719); 1925);
1720 1926
1721=item $client->coro (\&cb) 1927=item $client->async (\&cb)
1722 1928
1723Create a new coroutine, running the specified callback. The coroutine will 1929Create a new coroutine, running the specified callback. The coroutine will
1724be automatically cancelled when the client gets destroyed (e.g. on logout, 1930be automatically cancelled when the client gets destroyed (e.g. on logout,
1725or loss of connection). 1931or loss of connection).
1726 1932
1727=cut 1933=cut
1728 1934
1729sub cf::client::coro { 1935sub cf::client::async {
1730 my ($self, $cb) = @_; 1936 my ($self, $cb) = @_;
1731 1937
1732 my $coro; $coro = async { 1938 my $coro = &Coro::async ($cb);
1733 eval {
1734 $cb->();
1735 };
1736 warn $@ if $@;
1737 };
1738 1939
1739 $coro->on_destroy (sub { 1940 $coro->on_destroy (sub {
1740 delete $self->{_coro}{$coro+0}; 1941 delete $self->{_coro}{$coro+0};
1741 }); 1942 });
1742 1943
1914 2115
1915{ 2116{
1916 my $path = cf::localdir . "/database.pst"; 2117 my $path = cf::localdir . "/database.pst";
1917 2118
1918 sub db_load() { 2119 sub db_load() {
1919 warn "loading database $path\n";#d# remove later
1920 $DB = stat $path ? Storable::retrieve $path : { }; 2120 $DB = stat $path ? Storable::retrieve $path : { };
1921 } 2121 }
1922 2122
1923 my $pid; 2123 my $pid;
1924 2124
1925 sub db_save() { 2125 sub db_save() {
1926 warn "saving database $path\n";#d# remove later
1927 waitpid $pid, 0 if $pid; 2126 waitpid $pid, 0 if $pid;
1928 if (0 == ($pid = fork)) { 2127 if (0 == ($pid = fork)) {
1929 $DB->{_meta}{version} = 1; 2128 $DB->{_meta}{version} = 1;
1930 Storable::nstore $DB, "$path~"; 2129 Storable::nstore $DB, "$path~";
1931 rename "$path~", $path; 2130 rename "$path~", $path;
1979 open my $fh, "<:utf8", cf::confdir . "/config" 2178 open my $fh, "<:utf8", cf::confdir . "/config"
1980 or return; 2179 or return;
1981 2180
1982 local $/; 2181 local $/;
1983 *CFG = YAML::Syck::Load <$fh>; 2182 *CFG = YAML::Syck::Load <$fh>;
2183
2184 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2185
2186 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2187 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2188
2189 if (exists $CFG{mlockall}) {
2190 eval {
2191 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2192 and die "WARNING: m(un)lockall failed: $!\n";
2193 };
2194 warn $@ if $@;
2195 }
1984} 2196}
1985 2197
1986sub main { 2198sub main {
1987 # we must not ever block the main coroutine 2199 # we must not ever block the main coroutine
1988 local $Coro::idle = sub { 2200 local $Coro::idle = sub {
1989 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1990 (Coro::unblock_sub {
1991 Event::one_event; 2202 async { Event::one_event };
1992 })->();
1993 }; 2203 };
1994 2204
1995 cfg_load; 2205 cfg_load;
1996 db_load; 2206 db_load;
1997 load_extensions; 2207 load_extensions;
2008 return; 2218 return;
2009 } 2219 }
2010 2220
2011 warn "reloading..."; 2221 warn "reloading...";
2012 2222
2013 local $FREEZE = 1; 2223 my $guard = freeze_mainloop;
2014 cf::emergency_save; 2224 cf::emergency_save;
2015 2225
2016 eval { 2226 eval {
2017 # if anything goes wrong in here, we should simply crash as we already saved 2227 # if anything goes wrong in here, we should simply crash as we already saved
2018 2228
2080 cf::load_extensions; 2290 cf::load_extensions;
2081 2291
2082 # reattach attachments to objects 2292 # reattach attachments to objects
2083 warn "reattach"; 2293 warn "reattach";
2084 _global_reattach; 2294 _global_reattach;
2295 reattach $_ for values %MAP;
2085 }; 2296 };
2086 2297
2087 if ($@) { 2298 if ($@) {
2088 warn $@; 2299 warn $@;
2089 warn "error while reloading, exiting."; 2300 warn "error while reloading, exiting.";
2105 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2316 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2106 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2317 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2107 2318
2108 # dirty hack because... archetypes are not yet loaded 2319 # dirty hack because... archetypes are not yet loaded
2109 Event->timer ( 2320 Event->timer (
2110 after => 2, 2321 after => 10,
2111 cb => sub { 2322 cb => sub {
2112 $_[0]->w->cancel; 2323 $_[0]->w->cancel;
2113 2324
2114 # provide some exits "home" 2325 # provide some exits "home"
2115 my $exit = cf::object::new "exit"; 2326 my $exit = cf::object::new "exit";
2154 reentrant => 0, 2365 reentrant => 0,
2155 prio => 0, 2366 prio => 0,
2156 at => $NEXT_TICK || $TICK, 2367 at => $NEXT_TICK || $TICK,
2157 data => WF_AUTOCANCEL, 2368 data => WF_AUTOCANCEL,
2158 cb => sub { 2369 cb => sub {
2159 unless ($FREEZE) {
2160 cf::server_tick; # one server iteration 2370 cf::server_tick; # one server iteration
2161 $RUNTIME += $TICK; 2371 $RUNTIME += $TICK;
2162 }
2163
2164 $NEXT_TICK += $TICK; 2372 $NEXT_TICK += $TICK;
2165 2373
2166 # if we are delayed by four ticks or more, skip them all 2374 # if we are delayed by four ticks or more, skip them all
2167 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2375 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2168 2376
2191 or warn "ERROR: unable to write runtime file: $!"; 2399 or warn "ERROR: unable to write runtime file: $!";
2192 })->(); 2400 })->();
2193 }, 2401 },
2194); 2402);
2195 2403
2404END { cf::emergency_save }
2405
21961 24061
2197 2407

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines