OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 07:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Performance & Concurrency Improvements to Permissions

Browse source 
Modifying of permissions was only half protected, enabling concurrency
issues to occur if permissions were modified async.

While no plugin really should be doing that, modifying operations
are not heavily called, so they are safe to add synchronization to.

Now, all modification API's will be synchronized ensuring safety.

Additionally, hasPermission was victim to a common java newbie mistake
of calling if (containsKey(k)) return get(k), resulting in 2 map lookups.

Optimized it to simply be a single get call cutting permission map
lookups in half.
This commit is contained in:
Aikar 2018-09-13 20:51:50 -04:00
parent 2983b658fc
commit 6a9c8c348b
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
paper-api/src/main/java/org/bukkit/permissions/PermissibleBase.java
View file

@ -73,8 +73,11 @@ public class PermissibleBase implements Permissible {
String name = inName.toLowerCase(Locale.ROOT);
if (isPermissionSet(name)) {
return permissions.get(name).getValue();
// Paper start
PermissionAttachmentInfo info = permissions.get(name);
if (info != null) {
return info.getValue();
// Paper end
} else {
Permission perm = Bukkit.getServer().getPluginManager().getPermission(name);
@ -94,15 +97,18 @@ public class PermissibleBase implements Permissible {
String name = perm.getName().toLowerCase(Locale.ROOT);
if (isPermissionSet(name)) {
return permissions.get(name).getValue();
// Paper start
PermissionAttachmentInfo info = permissions.get(name);
if (info != null) {
return info.getValue();
}
// Paper end
return perm.getDefault().getValue(isOp());
}
@Override
@NotNull
public PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value) {
public synchronized PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value) { // Paper - synchronized
if (name == null) {
throw new IllegalArgumentException("Permission name cannot be null");
} else if (plugin == null) {
@ -121,7 +127,7 @@ public class PermissibleBase implements Permissible {
@Override
@NotNull
public PermissionAttachment addAttachment(@NotNull Plugin plugin) {
public synchronized PermissionAttachment addAttachment(@NotNull Plugin plugin) { // Paper - synchronized
if (plugin == null) {
throw new IllegalArgumentException("Plugin cannot be null");
} else if (!plugin.isEnabled()) {
@ -137,7 +143,7 @@ public class PermissibleBase implements Permissible {
}
@Override
public void removeAttachment(@NotNull PermissionAttachment attachment) {
public synchronized void removeAttachment(@NotNull PermissionAttachment attachment) { // Paper - synchronized
if (attachment == null) {
throw new IllegalArgumentException("Attachment cannot be null");
}
@ -156,7 +162,7 @@ public class PermissibleBase implements Permissible {
}
@Override
public void recalculatePermissions() {
public synchronized void recalculatePermissions() { // Paper - synchronized
clearPermissions();
Set<Permission> defaults = Bukkit.getServer().getPluginManager().getDefaultPermissions(isOp());
Bukkit.getServer().getPluginManager().subscribeToDefaultPerms(isOp(), parent);
@ -205,7 +211,7 @@ public class PermissibleBase implements Permissible {
@Override
@Nullable
public PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value, int ticks) {
public synchronized PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value, int ticks) { // Paper
if (name == null) {
throw new IllegalArgumentException("Permission name cannot be null");
} else if (plugin == null) {
@ -225,7 +231,7 @@ public class PermissibleBase implements Permissible {
@Override
@Nullable
public PermissionAttachment addAttachment(@NotNull Plugin plugin, int ticks) {
public synchronized PermissionAttachment addAttachment(@NotNull Plugin plugin, int ticks) { // Paper - synchronized
if (plugin == null) {
throw new IllegalArgumentException("Plugin cannot be null");
} else if (!plugin.isEnabled()) {
@ -245,7 +251,7 @@ public class PermissibleBase implements Permissible {
@Override
@NotNull
public Set<PermissionAttachmentInfo> getEffectivePermissions() {
public synchronized Set<PermissionAttachmentInfo> getEffectivePermissions() { // Paper - synchronized
return new HashSet<PermissionAttachmentInfo>(permissions.values());
}